[Qemu-devel] [PULL] Block fix for 1.6

[Qemu-devel] [PULL] Block fix for 1.6

[Kevin Wolf]

The following changes since commit 2e985fe000e73097e325e18b943e8babfa96c35c:

  mips: revert commit b332d24a8e1290954029814d09156b06ede358e2 (2013-08-08 23:06:15 +0200)

are available in the git repository at:

  git://repo.or.cz/qemu/kevin.git for-anthony

for you to fetch changes up to 6db5f5d68e2ffc430ba0511e23fc36c7363510f1:

  block: Bugfix 'format' and 'snapshot' used in drive option (2013-08-09 19:33:23 +0200)

----------------------------------------------------------------
Mike Qiu (1):
      block: Bugfix 'format' and 'snapshot' used in drive option

 blockdev.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL] block: Bugfix 'format' and 'snapshot' used in drive option

[Kevin Wolf]

From: Mike Qiu <qiudayu@linux.vnet.ibm.com>

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 74fe54f2a1b5c4f4498a8fe521e1dfc936656cd4,
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>
---
 blockdev.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 41b0a49..e174b7d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -340,6 +340,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
     QDict *bs_opts;
     const char *id;
     bool has_driver_specific_opts;
+    BlockDriver *drv = NULL;
 
     translation = BIOS_ATA_TRANSLATION_AUTO;
     media = MEDIA_DISK;
@@ -485,7 +486,11 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts,
             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 */
@@ -700,12 +705,13 @@ static DriveInfo *blockdev_init(QemuOpts *all_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 == -EMEDIUMTYPE) {
             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 {
             error_report("could not open disk image %s: %s",
                          file ?: dinfo->id, strerror(-ret));
-- 
1.8.1.4

Re: [Qemu-devel] [PULL] Block fix for 1.6

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori