diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-12-02 18:32:46 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-01-07 15:08:20 -0600 |
| commit | 2fbad1f9445534fe9f920950bed510714d58e8c8 (patch) | |
| tree | 819eed3814f067c7c5b430d164d20c7e8e2c0fe5 | |
| parent | dee284885a3a3f3afe8fdc587197706d4eb52e01 (diff) | |
| download | qemu-2fbad1f9445534fe9f920950bed510714d58e8c8.tar.gz | |
qemu-img: Check create_opts before image creation
If a driver supports image creation, it needs to set the .create_opts
field. We can use that to make sure .create_opts for both drivers
involved is not NULL for the target image in qemu-img convert, which is
important so that the create_opts pointer in img_convert() is not NULL
after the qemu_opts_append() calls and when going into
qemu_opts_create().
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit f75613cf2488a37fb8019bc32a06ddbcd477d0ce)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | qemu-img.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/qemu-img.c b/qemu-img.c index d4518e724f..309c14bbae 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1378,6 +1378,20 @@ static int img_convert(int argc, char **argv) goto out; } + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation", + drv->format_name); + ret = -1; + goto out; + } + + if (!proto_drv->create_opts) { + error_report("Protocol driver '%s' does not support image creation", + proto_drv->format_name); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); |