This series of patches expands the syntax of the qemu-img, qemu-nbd and qemu-io commands to make them more flexible.
v0: https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg04365.html v1: https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg04014.html v2: https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg04354.html v3: https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg03381.html First all three gain a --object parameter, which allows instantiation of user creatable object types. The immediate use case is to allow for creation of the 'secret' object type to pass passwords for curl, iscsi and rbd drivers. For qemu-nbd this will also be needed to create TLS certificates for encryption support. Then all three gain a '--image-opts' parameter which causes the positional filenames to be interepreted as option strings rather tha nplain filenames. This avoids the need to use the JSON syntax, or to add custom CLI args for each block backend option that exists. The immediate use case is to allow the user to specify the ID of the 'secret' object they just created. Finally, there are a few small cleanup patches The first 4 patches in this series are a pre-requisite for 3 other series - Support for TLS in NBD - Support for secrets for passwd auth in curl, rbd, iscsi (fixes a CVE issue in libvirt) - Support for LUKS encryption passwords Hopefully the --object patches are fairly uncontroversial and can be merged soon. The latter patches for --image-opts are very nice to have, but not a hard blocker right now since the 'json:{....}' syntax can be used until they are merged. Changed in v4: - Fix error reporting when object_create fails Changed in v3: - Rebase to resolve with conflicts against recently merged code - Remove use of errx() Changed in v2: - Share more common code in qom/object_interfaces.c to avoid duplicating so much of 'object_create' in each command - Remove previously added '--source optstring' parameter which replaced the positional filenames, in favour of keeping the positional filenames but using a --image-opts boolean arg to change their interpretation - Added docs for --image-opts to qemu-img man page - Use printf instead of echo -n in examples - Line wrap help string based on user terminal width not source code width - Update qemu-nbd/qemu-io to use constants for options - Update qemu-nbd to avoid overlapping option values Daniel P. Berrange (10): qom: add helpers for UserCreatable object types qemu-img: add support for --object command line arg qemu-nbd: add support for --object command line arg qemu-io: add support for --object command line arg qemu-io: allow specifying image as a set of options args qemu-nbd: allow specifying image as a set of options args qemu-img: allow specifying image as a set of options args qemu-nbd: don't overlap long option values with short options qemu-nbd: use no_argument/required_argument constants qemu-io: use no_argument/required_argument constants hmp.c | 52 +--- include/monitor/monitor.h | 3 - include/qom/object_interfaces.h | 48 ++++ qemu-img-cmds.hx | 44 +-- qemu-img.c | 588 +++++++++++++++++++++++++++++++++++++--- qemu-img.texi | 14 + qemu-io.c | 114 +++++++- qemu-nbd.c | 150 ++++++++-- qemu-nbd.texi | 6 + qmp.c | 76 +----- qom/object_interfaces.c | 139 ++++++++++ vl.c | 48 +--- 12 files changed, 1029 insertions(+), 253 deletions(-) -- 2.5.0
