diff options
| author | Max Reitz <mreitz@redhat.com> | 2018-05-09 23:00:17 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2018-06-11 16:18:45 +0200 |
| commit | 1f996683ad908fd41c572221a63d9fc31ce04d07 (patch) | |
| tree | 889df5e306294308aa09c9a2a87e104ec7f737ac | |
| parent | f45b638f9f967cdbea4e24704bd16a858ddcde03 (diff) | |
qemu-img: Amendment support implies create_opts
Instead of checking whether a driver has a non-NULL create_opts we
should check whether it supports image amendment in the first place. If
it does, it must have create_opts.
On the other hand, if it does not have create_opts (so it does not
support amendment either), the error message "does not support any
options" is a bit useless. Stating clearly that the driver has no
amendment support whatsoever is probably better.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180509210023.20283-2-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | qemu-img.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qemu-img.c b/qemu-img.c index 75f1610aa0..0be11b3852 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3789,13 +3789,16 @@ static int img_amend(int argc, char **argv) goto out; } - if (!bs->drv->create_opts) { - error_report("Format driver '%s' does not support any options to amend", + if (!bs->drv->bdrv_amend_options) { + error_report("Format driver '%s' does not support option amendment", fmt); ret = -1; goto out; } + /* Every driver supporting amendment must have create_opts */ + assert(bs->drv->create_opts); + create_opts = qemu_opts_append(create_opts, bs->drv->create_opts); opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); qemu_opts_do_parse(opts, options, NULL, &err); |