qemu-img create allows giving just a format and "-o help" to get a list
of the options supported by that format. Users may not realize that the
protocol level may offer even more options, which they only get to see
by specifying a filename.
This patch adds a note to hint at that fact.
Signed-off-by: Max Reitz <mre...@redhat.com>
---
qemu-img.c | 13 ++++++++++++-
tests/qemu-iotests/082.out | 20 ++++++++++++++++----
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index aa6f81f1ea..0016e24efe 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -269,9 +269,20 @@ static int print_block_option_help(const char *filename,
const char *fmt)
create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
}
- printf("Supported options:\n");
+ if (filename) {
+ printf("Supported options:\n");
+ } else {
+ printf("Supported %s options:\n", fmt);
+ }
qemu_opts_print_help(create_opts, false);
qemu_opts_free(create_opts);
+
+ if (!filename) {
+ printf("\n"
+ "The protocol level may support further options.\n"
+ "Specify the target filename to include those options.\n");
+ }
+
return 0;
}
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index 9a23b68511..7e25706813 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -242,7 +242,7 @@ Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2
-o ,, -o help TEST_DIR
qemu-img: Invalid option list: ,,
Testing: create -f qcow2 -o help
-Supported options:
+Supported qcow2 options:
backing_file=<str> - File name of a base image
backing_fmt=<str> - Image format of the base image
cluster_size=<size> - qcow2 cluster size
@@ -263,10 +263,16 @@ Supported options:
refcount_bits=<num> - Width of a reference count entry in bits
size=<size> - Virtual disk size
+The protocol level may support further options.
+Specify the target filename to include those options.
+
Testing: create -o help
-Supported options:
+Supported raw options:
size=<size> - Virtual disk size
+The protocol level may support further options.
+Specify the target filename to include those options.
+
Testing: create -f bochs -o help
qemu-img: Format driver 'bochs' does not support image creation
@@ -516,7 +522,7 @@ Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2
-o ,, -o help TEST_DI
qemu-img: Invalid option list: ,,
Testing: convert -O qcow2 -o help
-Supported options:
+Supported qcow2 options:
backing_file=<str> - File name of a base image
backing_fmt=<str> - Image format of the base image
cluster_size=<size> - qcow2 cluster size
@@ -537,10 +543,16 @@ Supported options:
refcount_bits=<num> - Width of a reference count entry in bits
size=<size> - Virtual disk size
+The protocol level may support further options.
+Specify the target filename to include those options.
+
Testing: convert -o help
-Supported options:
+Supported raw options:
size=<size> - Virtual disk size
+The protocol level may support further options.
+Specify the target filename to include those options.
+
Testing: convert -O bochs -o help
qemu-img: Format driver 'bochs' does not support image creation
--
2.20.1
