haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-img: Make create hint at protocol options 

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 <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
stable-4.1
Max Reitz 2019-04-13 17:20:37 +02:00 committed by Kevin Wolf
parent 0ef5a8e6ce
commit f4619af0c1
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu-img.c
View File

@ -267,9 +267,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;
}

20
tests/qemu-iotests/082.out
View File

@ -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