[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename |
Date: |
Wed, 15 Jan 2014 11:22:32 +0100 |
From: Max Reitz <address@hidden>
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>
Signed-off-by: Kevin Wolf <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.1.4
- [Qemu-devel] [PULL 15/42] osdep: add qemu_set_tty_echo(), (continued)
- [Qemu-devel] [PULL 15/42] osdep: add qemu_set_tty_echo(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 10/42] qtest: Fix the bug about disable vnc causes "make check" fail, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 17/42] qemu-io: add command completion, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 14/42] readline: move readline to a generic location, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 20/42] qdict: Add qdict_array_split(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 16/42] qemu-io: use readline.c, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 18/42] blkdebug: Use errp for read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 21/42] qapi: extend qdict_flatten() for QLists, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename,
Kevin Wolf <=
- [Qemu-devel] [PULL 22/42] qemu-option: Add qemu_config_parse_qdict(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 24/42] blkdebug: Use command-line in read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 23/42] blkdebug: Always call read_config(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 26/42] block: Pass reference to bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 25/42] block: Allow reference for bdrv_file_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 28/42] block: Add bdrv_open_image(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 29/42] block: Use bdrv_open_image() in bdrv_open(), Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 31/42] blockdev: Move "file" to legacy_opts, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 32/42] blkdebug: Allow command-line file configuration, Kevin Wolf, 2014/01/15
- [Qemu-devel] [PULL 30/42] block: Allow recursive "file"s, Kevin Wolf, 2014/01/15