]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qemu-img: fix --image-opts usage with dd command
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 15 May 2017 16:47:10 +0000 (17:47 +0100)
committerMax Reitz <mreitz@redhat.com>
Mon, 29 May 2017 13:39:53 +0000 (15:39 +0200)
The --image-opts flag can only be used to affect the parsing
of the source image. The target image has to be specified in
the traditional style regardless, since it needs to be passed
to the bdrv_create() API which does not support the new style
opts.

Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170515164712.6643-3-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
qemu-img.c

index 181f49956b68ba19bb4100e30e726de927579980..4dc1d56cee339d969ed2c43ef65347032731b46c 100644 (file)
@@ -4316,8 +4316,13 @@ static int img_dd(int argc, char **argv)
         goto out;
     }
 
-    blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,
-                    false, false, false);
+    /* TODO, we can't honour --image-opts for the target,
+     * since it needs to be given in a format compatible
+     * with the bdrv_create() call above which does not
+     * support image-opts style.
+     */
+    blk2 = img_open_file(out.filename, out_fmt, BDRV_O_RDWR,
+                         false, false, false);
 
     if (!blk2) {
         ret = -1;