[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 16/24] blkverify: Allow command-line configuratio
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 16/24] blkverify: Allow command-line configuration |
Date: |
Fri, 20 Dec 2013 19:28:16 +0100 |
Introduce the "test" and "raw" options for specifying images.
Signed-off-by: Max Reitz <address@hidden>
---
block/blkverify.c | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/block/blkverify.c b/block/blkverify.c
index e15ac4c..dc14290 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -122,7 +122,6 @@ static int blkverify_open(BlockDriverState *bs, QDict
*options, int flags,
BDRVBlkverifyState *s = bs->opaque;
QemuOpts *opts;
Error *local_err = NULL;
- const char *filename, *raw;
int ret;
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
@@ -133,33 +132,19 @@ static int blkverify_open(BlockDriverState *bs, QDict
*options, int flags,
goto fail;
}
- /* Parse the raw image filename */
- raw = qemu_opt_get(opts, "x-raw");
- if (raw == NULL) {
- error_setg(errp, "Could not retrieve raw image filename");
- ret = -EINVAL;
- goto fail;
- }
-
- ret = bdrv_file_open(&bs->file, raw, NULL, NULL, flags, &local_err);
+ /* Open the raw file */
+ ret = bdrv_open_image(&bs->file, qemu_opt_get(opts, "x-raw"), options,
+ "raw", flags, true, false, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
goto fail;
}
/* Open the test file */
- filename = qemu_opt_get(opts, "x-image");
- if (filename == NULL) {
- error_setg(errp, "Could not retrieve test image filename");
- ret = -EINVAL;
- goto fail;
- }
-
- s->test_file = bdrv_new("");
- ret = bdrv_open(s->test_file, filename, NULL, flags, NULL, &local_err);
+ ret = bdrv_open_image(&s->test_file, qemu_opt_get(opts, "x-image"),
options,
+ "test", flags, false, false, &local_err);
if (ret < 0) {
error_propagate(errp, local_err);
- bdrv_unref(s->test_file);
s->test_file = NULL;
goto fail;
}
--
1.8.5.1
- [Qemu-devel] [PATCH v7 06/24] blkdebug: Always call read_config(), (continued)
- [Qemu-devel] [PATCH v7 06/24] blkdebug: Always call read_config(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 07/24] blkdebug: Use command-line in read_config(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 08/24] block: Allow reference for bdrv_file_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 09/24] block: Pass reference to bdrv_file_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 10/24] block: Allow block devices without files, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 11/24] block: Add bdrv_open_image(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 12/24] block: Use bdrv_open_image() in bdrv_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 13/24] block: Allow recursive "file"s, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 15/24] blkdebug: Allow command-line file configuration, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 14/24] blockdev: Move "file" to legacy_opts, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 16/24] blkverify: Allow command-line configuration,
Max Reitz <=
- [Qemu-devel] [PATCH v7 17/24] blkverify: Don't require protocol filename, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 18/24] qapi: Add "errno" to the list of polluted words, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 19/24] qapi: QMP interface for blkdebug and blkverify, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 20/24] qemu-io: Make filename optional, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 21/24] tests: Add test for qdict_array_split(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 22/24] tests: Add test for qdict_flatten(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 23/24] iotests: Test new blkdebug/blkverify interface, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 24/24] iotests: Test file format nesting, Max Reitz, 2013/12/20