From nobody Thu May 2 05:36:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539968044731754.8729135560427; Fri, 19 Oct 2018 09:54:04 -0700 (PDT) Received: from localhost ([::1]:51644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDY27-0005ny-7S for importer@patchew.org; Fri, 19 Oct 2018 12:53:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDXyQ-0003Ge-JZ for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDXyK-00054i-JD for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58268) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDXy4-0004K3-Oi; Fri, 19 Oct 2018 12:49:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C95F23003197; Fri, 19 Oct 2018 16:49:39 +0000 (UTC) Received: from localhost (unknown [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5779B58900; Fri, 19 Oct 2018 16:49:36 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 19 Oct 2018 18:49:25 +0200 Message-Id: <20181019164929.18404-2-mreitz@redhat.com> In-Reply-To: <20181019164929.18404-1-mreitz@redhat.com> References: <20181019164929.18404-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 19 Oct 2018 16:49:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/5] option: Make option help nicer to read X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds some whitespace into the option help (including indentation) and puts angle brackets around the type names. Furthermore, the list name is no longer printed as part of every line, but only once in advance, and only if the caller did not print a caption already. This patch also restores the description alignment we had before commit 9cbef9d68ee1d8d0, just at 24 instead of 16 characters like we used to. This increase is because now we have the type and two spaces of indentation before the description, and with a usual type name length of three chracters, this sums up to eight additional characters -- which means that we now need 24 characters to get the same amount of padding for most options. Also, 24 is a third of 80, which makes it kind of a round number in terminal terms. Finally, this patch amends the reference output of iotest 082 to match the changes (and thus makes it pass again). Signed-off-by: Max Reitz Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/qemu/option.h | 2 +- qemu-img.c | 4 +- util/qemu-option.c | 32 +- tests/qemu-iotests/082.out | 956 ++++++++++++++++++------------------- 4 files changed, 507 insertions(+), 487 deletions(-) diff --git a/include/qemu/option.h b/include/qemu/option.h index 3dfb4493cc..844587cab3 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -132,7 +132,7 @@ typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpt= s *opts, Error **errp); int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, Error **errp); void qemu_opts_print(QemuOpts *opts, const char *sep); -void qemu_opts_print_help(QemuOptsList *list); +void qemu_opts_print_help(QemuOptsList *list, bool print_caption); void qemu_opts_free(QemuOptsList *list); QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list); =20 diff --git a/qemu-img.c b/qemu-img.c index b12f4cd19b..4c96db7ba4 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -269,7 +269,7 @@ static int print_block_option_help(const char *filename= , const char *fmt) } =20 printf("Supported options:\n"); - qemu_opts_print_help(create_opts); + qemu_opts_print_help(create_opts, false); qemu_opts_free(create_opts); return 0; } @@ -3773,7 +3773,7 @@ static int print_amend_option_help(const char *format) assert(drv->create_opts); =20 printf("Creation options for '%s':\n", format); - qemu_opts_print_help(drv->create_opts); + qemu_opts_print_help(drv->create_opts, false); printf("\nNote that not all of these options may be amendable.\n"); return 0; } diff --git a/util/qemu-option.c b/util/qemu-option.c index 9a5f263294..de42e2a406 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -224,7 +224,14 @@ static const char *opt_type_to_string(enum QemuOptType= type) g_assert_not_reached(); } =20 -void qemu_opts_print_help(QemuOptsList *list) +/** + * Print the list of options available in the given list. If + * @print_caption is true, a caption (including the list name, if it + * exists) is printed. The options itself will be indented, so + * @print_caption should only be set to false if the caller prints its + * own custom caption (so that the indentation makes sense). + */ +void qemu_opts_print_help(QemuOptsList *list, bool print_caption) { QemuOptDesc *desc; int i; @@ -234,12 +241,12 @@ void qemu_opts_print_help(QemuOptsList *list) desc =3D list->desc; while (desc && desc->name) { GString *str =3D g_string_new(NULL); - if (list->name) { - g_string_append_printf(str, "%s.", list->name); - } - g_string_append_printf(str, "%s=3D%s", desc->name, + g_string_append_printf(str, " %s=3D<%s>", desc->name, opt_type_to_string(desc->type)); if (desc->help) { + if (str->len < 24) { + g_string_append_printf(str, "%*s", 24 - (int)str->len, ""); + } g_string_append_printf(str, " - %s", desc->help); } g_ptr_array_add(array, g_string_free(str, false)); @@ -247,6 +254,19 @@ void qemu_opts_print_help(QemuOptsList *list) } =20 g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); + if (print_caption && array->len > 0) { + if (list->name) { + printf("%s options:\n", list->name); + } else { + printf("Options:\n"); + } + } else if (array->len =3D=3D 0) { + if (list->name) { + printf("There are no options for %s.\n", list->name); + } else { + printf("No options available.\n"); + } + } for (i =3D 0; i < array->len; i++) { printf("%s\n", (char *)array->pdata[i]); } @@ -930,7 +950,7 @@ QemuOpts *qemu_opts_parse_noisily(QemuOptsList *list, c= onst char *params, opts =3D opts_parse(list, params, permit_abbrev, false, &invalidp, &er= r); if (err) { if (invalidp && has_help_option(params)) { - qemu_opts_print_help(list); + qemu_opts_print_help(list, true); error_free(err); } else { error_report_err(err); diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index 19e9fb13ff..0ce18c075b 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -44,171 +44,171 @@ cluster_size: 8192 =20 Testing: create -f qcow2 -o help TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o ? TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o cluster_size=3D4k,help TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o cluster_size=3D4k,? TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o help,cluster_size=3D4k TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o ?,cluster_size=3D4k TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o cluster_size=3D4k -o help TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -o cluster_size=3D4k -o ? TEST_DIR/t.qcow2 128M Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -f qcow2 -u -o backing_file=3DTEST_DIR/t.qcow2,,help TEST_= DIR/t.qcow2 128M Formatting 'TEST_DIR/t.qcow2', fmt=3Dqcow2 size=3D134217728 backing_file= =3DTEST_DIR/t.qcow2,,help cluster_size=3D65536 lazy_refcounts=3Doff refcoun= t_bits=3D16 @@ -227,27 +227,27 @@ qemu-img: Invalid option list: ,, =20 Testing: create -f qcow2 -o help Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: create -o help Supported options: -size Virtual disk size + size=3D - Virtual disk size =20 Testing: create -f bochs -o help qemu-img: Format driver 'bochs' does not support image creation @@ -300,171 +300,171 @@ cluster_size: 8192 =20 Testing: convert -O qcow2 -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o ? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o cluster_size=3D4k,help TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o cluster_size=3D4k,? TEST_DIR/t.qcow2 TEST_DIR= /t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o help,cluster_size=3D4k TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o ?,cluster_size=3D4k TEST_DIR/t.qcow2 TEST_DIR= /t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o cluster_size=3D4k -o help TEST_DIR/t.qcow2 TE= ST_DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o cluster_size=3D4k -o ? TEST_DIR/t.qcow2 TEST_= DIR/t.qcow2.base Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits -nocow Turn off copy-on-write (valid only on btrfs) + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + nocow=3D - Turn off copy-on-write (valid only on btrfs) + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -O qcow2 -o backing_file=3DTEST_DIR/t.qcow2,,help TEST_DI= R/t.qcow2 TEST_DIR/t.qcow2.base qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing f= ile: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory @@ -483,27 +483,27 @@ qemu-img: Invalid option list: ,, =20 Testing: convert -O qcow2 -o help Supported options: -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Testing: convert -o help Supported options: -size Virtual disk size + size=3D - Virtual disk size =20 Testing: convert -O bochs -o help qemu-img: Format driver 'bochs' does not support image creation @@ -564,177 +564,177 @@ cluster_size: 65536 =20 Testing: amend -f qcow2 -o help TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o ? TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o cluster_size=3D4k,help TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o cluster_size=3D4k,? TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o help,cluster_size=3D4k TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o ?,cluster_size=3D4k TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o cluster_size=3D4k -o help TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: amend -f qcow2 -o cluster_size=3D4k -o ? TEST_DIR/t.qcow2 Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 @@ -757,29 +757,29 @@ qemu-img: Invalid option list: ,, =20 Testing: amend -f qcow2 -o help Creation options for 'qcow2': -size Virtual disk size -compat Compatibility level (0.10 or 1.1) -backing_file File name of a base image -backing_fmt Image format of the base image -encryption Encrypt the image with format 'aes'. (Deprecated in favor= of encrypt.format=3Daes) -encrypt.format Encrypt the image, format choices: 'aes', 'luks' -encrypt.key-secret ID of secret providing qcow AES key or LUKS passphrase -encrypt.cipher-alg Name of encryption cipher algorithm -encrypt.cipher-mode Name of encryption cipher mode -encrypt.ivgen-alg Name of IV generator algorithm -encrypt.ivgen-hash-alg Name of IV generator hash algorithm -encrypt.hash-alg Name of encryption hash algorithm -encrypt.iter-time Time to spend in PBKDF in milliseconds -cluster_size qcow2 cluster size -preallocation Preallocation mode (allowed values: off, metadata, falloc= , full) -lazy_refcounts Postpone refcount updates -refcount_bits Width of a reference count entry in bits + backing_file=3D - File name of a base image + backing_fmt=3D - Image format of the base image + cluster_size=3D - qcow2 cluster size + compat=3D - Compatibility level (0.10 or 1.1) + encrypt.cipher-alg=3D - Name of encryption cipher algorithm + encrypt.cipher-mode=3D - Name of encryption cipher mode + encrypt.format=3D - Encrypt the image, format choices: 'aes', 'lu= ks' + encrypt.hash-alg=3D - Name of encryption hash algorithm + encrypt.iter-time=3D - Time to spend in PBKDF in milliseconds + encrypt.ivgen-alg=3D - Name of IV generator algorithm + encrypt.ivgen-hash-alg=3D - Name of IV generator hash algorithm + encrypt.key-secret=3D - ID of secret providing qcow AES key or LUKS= passphrase + encryption=3D - Encrypt the image with format 'aes'. (Dep= recated in favor of encrypt.format=3Daes) + lazy_refcounts=3D - Postpone refcount updates + preallocation=3D - Preallocation mode (allowed values: off, meta= data, falloc, full) + refcount_bits=3D - Width of a reference count entry in bits + size=3D - Virtual disk size =20 Note that not all of these options may be amendable. =20 Testing: convert -o help Supported options: -size Virtual disk size + size=3D - Virtual disk size =20 Testing: amend -f bochs -o help qemu-img: Format driver 'bochs' does not support option amendment --=20 2.17.1 From nobody Thu May 2 05:36:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539968262834326.19305360537214; Fri, 19 Oct 2018 09:57:42 -0700 (PDT) Received: from localhost ([::1]:51673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDY5Y-0000ex-TH for importer@patchew.org; Fri, 19 Oct 2018 12:57:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDXyB-00033g-Iq for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDXyA-0004kO-Mn for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:49:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45238) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDXy7-0004V6-7C; Fri, 19 Oct 2018 12:49:48 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF00530F8C07; Fri, 19 Oct 2018 16:49:44 +0000 (UTC) Received: from localhost (unknown [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ACD3D65F41; Fri, 19 Oct 2018 16:49:41 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 19 Oct 2018 18:49:26 +0200 Message-Id: <20181019164929.18404-3-mreitz@redhat.com> In-Reply-To: <20181019164929.18404-1-mreitz@redhat.com> References: <20181019164929.18404-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 19 Oct 2018 16:49:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/5] chardev: Indent list of chardevs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Following the example of qemu_opts_print_help(), indent all entries in the list of character devices. Signed-off-by: Max Reitz Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chardev/char.c b/chardev/char.c index e115166995..10d44aaefc 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -569,7 +569,7 @@ help_string_append(const char *name, void *opaque) { GString *str =3D opaque; =20 - g_string_append_printf(str, "\n%s", name); + g_string_append_printf(str, "\n %s", name); } =20 static const char *chardev_alias_translate(const char *name) --=20 2.17.1 From nobody Thu May 2 05:36:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539969979913408.97867204030945; Fri, 19 Oct 2018 10:26:19 -0700 (PDT) Received: from localhost ([::1]:51851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDYXS-00034P-QK for importer@patchew.org; Fri, 19 Oct 2018 13:26:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDXyD-00035d-5i for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:49:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDXyB-0004mj-Uv for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDXyA-0004j0-0Q; Fri, 19 Oct 2018 12:49:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 498BD653C3; Fri, 19 Oct 2018 16:49:49 +0000 (UTC) Received: from localhost (unknown [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDD195D785; Fri, 19 Oct 2018 16:49:46 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 19 Oct 2018 18:49:27 +0200 Message-Id: <20181019164929.18404-4-mreitz@redhat.com> In-Reply-To: <20181019164929.18404-1-mreitz@redhat.com> References: <20181019164929.18404-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 19 Oct 2018 16:49:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/5] qdev-monitor: Make device options help nicer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Just like in qemu_opts_print_help(), print the device name as a caption instead of on every single line, indent all options, add angle brackets around types, and align the descriptions after 24 characters. Also, separate the descriptions with " - " instead of putting them in parentheses, because that is what we do everywhere else. This does look a bit funny here because basically all bits have the description "on/off", but funny does not mean it is less readable. Signed-off-by: Max Reitz Reviewed-by: Marc-Andr=C3=A9 Lureau --- qdev-monitor.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 802c18a74e..07147c63bf 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -285,10 +285,19 @@ int qdev_device_help(QemuOpts *opts) goto error; } =20 + if (prop_list) { + out_printf("%s options:\n", driver); + } else { + out_printf("There are no options for %s.\n", driver); + } for (prop =3D prop_list; prop; prop =3D prop->next) { - out_printf("%s.%s=3D%s", driver, prop->value->name, prop->value->t= ype); + int len; + out_printf(" %s=3D<%s>%n", prop->value->name, prop->value->type, = &len); if (prop->value->has_description) { - out_printf(" (%s)\n", prop->value->description); + if (len < 24) { + out_printf("%*s", 24 - len, ""); + } + out_printf(" - %s\n", prop->value->description); } else { out_printf("\n"); } --=20 2.17.1 From nobody Thu May 2 05:36:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539968105485605.3560650681924; Fri, 19 Oct 2018 09:55:05 -0700 (PDT) Received: from localhost ([::1]:51648 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDY3E-0006wK-6B for importer@patchew.org; Fri, 19 Oct 2018 12:55:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDXyM-0003CF-Gx for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDXyL-00056w-Ks for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDXyF-0004vQ-7y; Fri, 19 Oct 2018 12:49:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A1AD81DF3; Fri, 19 Oct 2018 16:49:54 +0000 (UTC) Received: from localhost (unknown [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2DD836B64D; Fri, 19 Oct 2018 16:49:50 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 19 Oct 2018 18:49:28 +0200 Message-Id: <20181019164929.18404-5-mreitz@redhat.com> In-Reply-To: <20181019164929.18404-1-mreitz@redhat.com> References: <20181019164929.18404-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 19 Oct 2018 16:49:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 4/5] object: Make option help nicer to read X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Just like in qemu_opts_print_help(), print the object name as a caption instead of on every single line, indent all options, add angle brackets around types, and align the descriptions after 24 characters. Also, indent every object name in the list of available objects. Signed-off-by: Max Reitz Reviewed-by: Marc-Andr=C3=A9 Lureau --- vl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/vl.c b/vl.c index ac3ed17de4..ecddbb6b8e 100644 --- a/vl.c +++ b/vl.c @@ -2707,7 +2707,7 @@ static bool object_create_initial(const char *type, Q= emuOpts *opts) list =3D object_class_get_list_sorted(TYPE_USER_CREATABLE, false); for (l =3D list; l !=3D NULL; l =3D l->next) { ObjectClass *oc =3D OBJECT_CLASS(l->data); - printf("%s\n", object_class_get_name(oc)); + printf(" %s\n", object_class_get_name(oc)); } g_slist_free(list); exit(0); @@ -2729,14 +2729,21 @@ static bool object_create_initial(const char *type,= QemuOpts *opts) } =20 str =3D g_string_new(NULL); - g_string_append_printf(str, "%s.%s=3D%s", type, - prop->name, prop->type); + g_string_append_printf(str, " %s=3D<%s>", prop->name, prop->t= ype); if (prop->description) { + if (str->len < 24) { + g_string_append_printf(str, "%*s", 24 - (int)str->len,= ""); + } g_string_append_printf(str, " - %s", prop->description); } g_ptr_array_add(array, g_string_free(str, false)); } g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); + if (array->len > 0) { + printf("%s options:\n", type); + } else { + printf("There are no options for %s.\n", type); + } for (i =3D 0; i < array->len; i++) { printf("%s\n", (char *)array->pdata[i]); } --=20 2.17.1 From nobody Thu May 2 05:36:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539968264408432.3080500375552; Fri, 19 Oct 2018 09:57:44 -0700 (PDT) Received: from localhost ([::1]:51674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDY5e-0000iO-Nn for importer@patchew.org; Fri, 19 Oct 2018 12:57:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDXyN-0003Cn-33 for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDXyM-00057m-3d for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:50:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40092) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gDXyK-00053r-2w; Fri, 19 Oct 2018 12:50:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 674E03164994; Fri, 19 Oct 2018 16:49:59 +0000 (UTC) Received: from localhost (unknown [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 691F257C80; Fri, 19 Oct 2018 16:49:56 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 19 Oct 2018 18:49:29 +0200 Message-Id: <20181019164929.18404-6-mreitz@redhat.com> In-Reply-To: <20181019164929.18404-1-mreitz@redhat.com> References: <20181019164929.18404-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 19 Oct 2018 16:49:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 5/5] fw_cfg: Drop newline in @file description X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org, Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There is no good reason why there should be a newline in this description, so remove it. Signed-off-by: Max Reitz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index ecddbb6b8e..6604648570 100644 --- a/vl.c +++ b/vl.c @@ -529,7 +529,7 @@ static QemuOptsList qemu_fw_cfg_opts =3D { }, { .name =3D "file", .type =3D QEMU_OPT_STRING, - .help =3D "Sets the name of the file from which\n" + .help =3D "Sets the name of the file from which " "the fw_cfg blob will be loaded", }, { .name =3D "string", --=20 2.17.1