[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 02/24] blkdebug: Don't require sophisticated file
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 02/24] blkdebug: Don't require sophisticated filename |
Date: |
Fri, 20 Dec 2013 19:28:02 +0100 |
If the filename is not prefixed by "blkdebug:" in
blkdebug_parse_filename(), the blkdebug driver was not selected through
that protocol prefix, but by an explicit command line option
(file.driver=blkdebug or something similar). Contrary to the current
reaction, this is not a problem at all; we just need to store the
filename (in the x-image option) and can go on; the user just has to
manually specify the config option.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/blkdebug.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 2eb2e8b..fab76ce 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -313,7 +313,9 @@ static void blkdebug_parse_filename(const char *filename,
QDict *options,
/* Parse the blkdebug: prefix */
if (!strstart(filename, "blkdebug:", &filename)) {
- error_setg(errp, "File name string must start with 'blkdebug:'");
+ /* There was no prefix; therefore, all options have to be already
+ present in the QDict (except for the filename) */
+ qdict_put(options, "x-image", qstring_from_str(filename));
return;
}
--
1.8.5.1
- [Qemu-devel] [PATCH v7 00/24] blkdebug/blkverify: Allow QMP configuration, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 01/24] blkdebug: Use errp for read_config(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 02/24] blkdebug: Don't require sophisticated filename,
Max Reitz <=
- [Qemu-devel] [PATCH v7 03/24] qdict: Add qdict_array_split(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 04/24] qapi: extend qdict_flatten() for QLists, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 05/24] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/12/20
- [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