diff options
author | Max Reitz | 2014-12-02 18:32:46 +0100 |
---|---|---|
committer | Kevin Wolf | 2014-12-10 10:31:20 +0100 |
commit | f75613cf2488a37fb8019bc32a06ddbcd477d0ce (patch) | |
tree | 123116d71350855ffba034f27d527cd3c6e9362d /qemu-img.c | |
parent | block: Check create_opts before image creation (diff) | |
download | qemu-f75613cf2488a37fb8019bc32a06ddbcd477d0ce.tar.gz qemu-f75613cf2488a37fb8019bc32a06ddbcd477d0ce.tar.xz qemu-f75613cf2488a37fb8019bc32a06ddbcd477d0ce.zip |
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>
Diffstat (limited to 'qemu-img.c')
-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 a42335c632..8c4edf37a9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1531,6 +1531,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); |