vmdk: false positive of compat6 with hwversion not set
diff mbox series

Message ID 20190221110805.28239-1-yuchenlin@synology.com
State New
Headers show
Series
  • vmdk: false positive of compat6 with hwversion not set
Related show

Commit Message

Cameron Esfahani via Feb. 21, 2019, 11:08 a.m. UTC
From: yuchenlin <yuchenlin@synology.com>

In vmdk_co_create_opts, when it finds hw_version is undefined, it will
set it to 4, which misleading the compat6 and hwversion in
vmdk_co_do_create. Simply set hw_version to NULL after free, let
the logic in vmdk_co_do_create to decide the value of hw_version.

This bug can be reproduced by:

$ qemu-img convert -O vmdk -o subformat=streamOptimized,compat6
/home/yuchenlin/syno.qcow2 /home/yuchenlin/syno.vmdk

qemu-img: /home/yuchenlin/syno.vmdk: error while converting vmdk:
compat6 cannot be enabled with hwversion set

Signed-off-by: yuchenlin <yuchenlin@synology.com>
---
 block/vmdk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Max Reitz Feb. 25, 2019, 1:30 p.m. UTC | #1
On 21.02.19 12:08, yuchenlin@synology.com wrote:
> From: yuchenlin <yuchenlin@synology.com>
> 
> In vmdk_co_create_opts, when it finds hw_version is undefined, it will
> set it to 4, which misleading the compat6 and hwversion in
> vmdk_co_do_create. Simply set hw_version to NULL after free, let
> the logic in vmdk_co_do_create to decide the value of hw_version.
> 
> This bug can be reproduced by:
> 
> $ qemu-img convert -O vmdk -o subformat=streamOptimized,compat6
> /home/yuchenlin/syno.qcow2 /home/yuchenlin/syno.vmdk
> 
> qemu-img: /home/yuchenlin/syno.vmdk: error while converting vmdk:
> compat6 cannot be enabled with hwversion set
> 
> Signed-off-by: yuchenlin <yuchenlin@synology.com>
> ---
>  block/vmdk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 096e8eb662..e3bbd18803 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -2260,7 +2260,7 @@ static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts
>      compat6 = qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false);
>      if (strcmp(hw_version, "undefined") == 0) {
>          g_free(hw_version);
> -        hw_version = g_strdup("4");
> +        hw_version = NULL;
>      }
>      fmt = qemu_opt_get_del(opts, BLOCK_OPT_SUBFMT);
>      zeroed_grain = qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false);

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max

Patch
diff mbox series

diff --git a/block/vmdk.c b/block/vmdk.c
index 096e8eb662..e3bbd18803 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2260,7 +2260,7 @@  static int coroutine_fn vmdk_co_create_opts(const char *filename, QemuOpts *opts
     compat6 = qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false);
     if (strcmp(hw_version, "undefined") == 0) {
         g_free(hw_version);
-        hw_version = g_strdup("4");
+        hw_version = NULL;
     }
     fmt = qemu_opt_get_del(opts, BLOCK_OPT_SUBFMT);
     zeroed_grain = qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false);