OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Bugfix 'format' and 'snapshot' used in drive option

Browse Source 
When use -drive file='xxx',format=qcow2,snapshot=on the error
message "Can't use snapshot=on with driver-specific options"
can be show, and fail to start the qemu.

This should not be happened, and there is no file.driver option
in qemu command line.

It is because the commit 74fe54f2a1,
it puts 'driver' option if the command line use 'format' option.

This patch is to solve this bug.

Signed-off-by: Mike Qiu <qiudayu@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Mike Qiu 2013-08-08 10:45:16 -04:00 committed by Kevin Wolf
parent 2e985fe000
commit 6db5f5d68e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
blockdev.c
View File

@ -340,6 +340,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
QDict *bs_opts; QDict *bs_opts;
const char *id; const char *id;
bool has_driver_specific_opts; bool has_driver_specific_opts;
BlockDriver *drv = NULL;
translation = BIOS_ATA_TRANSLATION_AUTO; translation = BIOS_ATA_TRANSLATION_AUTO;
media = MEDIA_DISK; media = MEDIA_DISK;
@ -485,7 +486,11 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
return NULL; return NULL;
} }
qdict_put(bs_opts, "driver", qstring_from_str(buf)); drv = bdrv_find_whitelisted_format(buf, ro);
if (!drv) {
error_report("'%s' invalid format", buf);
return NULL;
}
} }
/* disk I/O throttling */ /* disk I/O throttling */
@ -700,12 +705,13 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
} }
QINCREF(bs_opts); QINCREF(bs_opts);
ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, NULL); ret = bdrv_open(dinfo->bdrv, file, bs_opts, bdrv_flags, drv);
if (ret < 0) { if (ret < 0) {
if (ret == -EMEDIUMTYPE) { if (ret == -EMEDIUMTYPE) {
error_report("could not open disk image %s: not in %s format", error_report("could not open disk image %s: not in %s format",
file ?: dinfo->id, qdict_get_str(bs_opts, "driver")); file ?: dinfo->id, drv ? drv->format_name :
qdict_get_str(bs_opts, "driver"));
} else { } else {
error_report("could not open disk image %s: %s", error_report("could not open disk image %s: %s",
file ?: dinfo->id, strerror(-ret)); file ?: dinfo->id, strerror(-ret));