[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] qemu-img: Recognize no creation support in -o h
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 5/7] qemu-img: Recognize no creation support in -o help |
Date: |
Sat, 21 Apr 2018 18:54:21 +0200 |
The only users of print_block_option_help() are qemu-img create and
qemu-img convert for the output image, so this function is always used
for image creation (it used to be used for amendment also, but that is
no longer the case).
So if image creation is not supported by either the format or the
protocol, there is no need to print any option description, because the
user cannot create an image like this anyway.
This also fixes an assertion failure:
$ qemu-img create -f bochs -o help
Supported options:
qemu-img: util/qemu-option.c:219:
qemu_opts_print_help: Assertion `list' failed.
[1] 24831 abort (core dumped) qemu-img create -f bochs -o help
Signed-off-by: Max Reitz <address@hidden>
---
qemu-img.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/qemu-img.c b/qemu-img.c
index 45e243cc80..29efd80c35 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -250,6 +250,11 @@ static int print_block_option_help(const char *filename,
const char *fmt)
return 1;
}
+ if (!drv->create_opts) {
+ error_report("Format driver '%s' does not support image creation",
fmt);
+ return 1;
+ }
+
create_opts = qemu_opts_append(create_opts, drv->create_opts);
if (filename) {
proto_drv = bdrv_find_protocol(filename, true, &local_err);
@@ -258,6 +263,11 @@ static int print_block_option_help(const char *filename,
const char *fmt)
qemu_opts_free(create_opts);
return 1;
}
+ if (!proto_drv->create_opts) {
+ error_report("Protocal driver '%s' does not support image
creation",
+ proto_drv->format_name);
+ return 1;
+ }
create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
}
--
2.14.3
- [Qemu-devel] [PATCH 0/7] qemu-img: Improve option help for amend, Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 1/7] qemu-img: Amendment support implies create_opts, Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 3/7] qemu-option: Pull out "Supported options" print, Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 4/7] qemu-img: Add print_amend_option_help(), Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 2/7] block: Add Error parameter to bdrv_amend_options, Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 7/7] iotests: Rework 113, Max Reitz, 2018/04/21
- [Qemu-devel] [PATCH 5/7] qemu-img: Recognize no creation support in -o help,
Max Reitz <=
- [Qemu-devel] [PATCH 6/7] iotests: Test help option for unsupporting formats, Max Reitz, 2018/04/21