diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-07-11 15:54:52 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-07-13 13:41:39 +0200 |
| commit | c4b48bfdc59caf0a69b7e0a40c9ea6d3d7848bc3 (patch) | |
| tree | 7d222dc816a223c31edeae01ca8ff1bbfc64e360 | |
| parent | 0c204cc810af90ca2a449d08d9d39ec8b760d9b4 (diff) | |
| download | focaccia-qemu-c4b48bfdc59caf0a69b7e0a40c9ea6d3d7848bc3.tar.gz focaccia-qemu-c4b48bfdc59caf0a69b7e0a40c9ea6d3d7848bc3.zip | |
vvfat: Fix qcow write target driver specification
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> Message-id: 20160711135452.11304-1-mreitz@redhat.com Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | block/vvfat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index c3f24c6eb0..ba2620f3c2 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; |