vvfat: Fix qcow write target driver specification
diff mbox

Message ID 20160711135452.11304-1-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz July 11, 2016, 1:54 p.m. UTC
First, bdrv_open_child() expects all options for the child to be
prefixed by the child's name (and a separating dot). Second,
bdrv_open_child() does not take ownership of the QDict passed to it but
only extracts all options for the child, so if a QDict is created for
the sole purpose of passing it to bdrv_open_child(), it needs to be
freed afterwards.

This patch makes vvfat adhere to both of these rules.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/vvfat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Eric Blake July 11, 2016, 2:06 p.m. UTC | #1
On 07/11/2016 07:54 AM, Max Reitz wrote:
> First, bdrv_open_child() expects all options for the child to be
> prefixed by the child's name (and a separating dot). Second,
> bdrv_open_child() does not take ownership of the QDict passed to it but
> only extracts all options for the child, so if a QDict is created for
> the sole purpose of passing it to bdrv_open_child(), it needs to be
> freed afterwards.
> 
> This patch makes vvfat adhere to both of these rules.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/vvfat.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block/vvfat.c b/block/vvfat.c
> index c3f24c6..ba2620f 100644
> --- a/block/vvfat.c
> +++ b/block/vvfat.c
> @@ -3018,9 +3018,10 @@ static int enable_write_target(BlockDriverState *bs, Error **errp)
>      }
>  
>      options = qdict_new();
> -    qdict_put(options, "driver", qstring_from_str("qcow"));
> +    qdict_put(options, "write-target.driver", qstring_from_str("qcow"));
>      s->qcow = bdrv_open_child(s->qcow_filename, options, "write-target", bs,
>                                &child_vvfat_qcow, false, errp);
> +    QDECREF(options);
>      if (!s->qcow) {
>          ret = -EINVAL;
>          goto err;
>
Kevin Wolf July 11, 2016, 2:13 p.m. UTC | #2
Am 11.07.2016 um 15:54 hat Max Reitz geschrieben:
> First, bdrv_open_child() expects all options for the child to be
> prefixed by the child's name (and a separating dot). Second,
> bdrv_open_child() does not take ownership of the QDict passed to it but
> only extracts all options for the child, so if a QDict is created for
> the sole purpose of passing it to bdrv_open_child(), it needs to be
> freed afterwards.
> 
> This patch makes vvfat adhere to both of these rules.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Patch
diff mbox

diff --git a/block/vvfat.c b/block/vvfat.c
index c3f24c6..ba2620f 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3018,9 +3018,10 @@  static int enable_write_target(BlockDriverState *bs, Error **errp)
     }
 
     options = qdict_new();
-    qdict_put(options, "driver", qstring_from_str("qcow"));
+    qdict_put(options, "write-target.driver", qstring_from_str("qcow"));
     s->qcow = bdrv_open_child(s->qcow_filename, options, "write-target", bs,
                               &child_vvfat_qcow, false, errp);
+    QDECREF(options);
     if (!s->qcow) {
         ret = -EINVAL;
         goto err;