From nobody Mon Feb 9 10:29:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1555168960; cv=none; d=zoho.com; s=zohoarc; b=k0zoIO6v90FY2RzMYH7g5MI/JblCFPsSgrmXCdtV7NgOQZCL/oJ+XZ2CxUBX1hZtCJGqKi5jsOfEXLY9LmofUhKZyHxaIljk45178TvvMpynlXcvJum3maMb2Gv6hRUJVuK+3oUvDsGs3dGLUWYqggLLdQfZzyYVgX0tEHu4y6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555168960; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UOZQ5ysGlfIIafhSoE+krDcZG0WHlG+y78f8exF00Zs=; b=XB9Cz4/KA0fx8PYQDJ81OrLXqdZtGhUBgZYYSf3j6us5VU7KejZ4VYWlPbFQq5M/9+HUkQiiDNCfGCJxQGtCgjJzf/OEZtUmir723n2XhebmS8RRvT25he7lQq8y6RNMMFYLOS1L4ou0VQFihX911GFQf//0lOkwJjbXyjSpX9s= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555168960931840.2230802231026; Sat, 13 Apr 2019 08:22:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:52716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFKUA-000899-9J for importer@patchew.org; Sat, 13 Apr 2019 11:22:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hFKSW-0006fb-H5 for qemu-devel@nongnu.org; Sat, 13 Apr 2019 11:20:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hFKSV-0000cY-G4 for qemu-devel@nongnu.org; Sat, 13 Apr 2019 11:20:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hFKSS-0000ZB-RY; Sat, 13 Apr 2019 11:20:45 -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 2BDD03082E70; Sat, 13 Apr 2019 15:20:44 +0000 (UTC) Received: from localhost (ovpn-204-66.brq.redhat.com [10.40.204.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB73460BFB; Sat, 13 Apr 2019 15:20:43 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Sat, 13 Apr 2019 17:20:37 +0200 Message-Id: <20190413152037.6817-3-mreitz@redhat.com> In-Reply-To: <20190413152037.6817-1-mreitz@redhat.com> References: <20190413152037.6817-1-mreitz@redhat.com> MIME-Version: 1.0 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]); Sat, 13 Apr 2019 15:20:44 +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 for-next 2/2] qemu-img: Make create hint at protocol options 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 , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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 *filenam= e, const char *fmt) create_opts =3D qemu_opts_append(create_opts, proto_drv->create_op= ts); } =20 - 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 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=3DTEST_DIR/t.q= cow2 -o ,, -o help TEST_DIR qemu-img: Invalid option list: ,, =20 Testing: create -f qcow2 -o help -Supported options: +Supported qcow2 options: backing_file=3D - File name of a base image backing_fmt=3D - Image format of the base image cluster_size=3D - qcow2 cluster size @@ -263,10 +263,16 @@ Supported options: refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size =20 +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=3D - Virtual disk size =20 +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 =20 @@ -516,7 +522,7 @@ Testing: convert -O qcow2 -o backing_file=3DTEST_DIR/t.= qcow2 -o ,, -o help TEST_DI qemu-img: Invalid option list: ,, =20 Testing: convert -O qcow2 -o help -Supported options: +Supported qcow2 options: backing_file=3D - File name of a base image backing_fmt=3D - Image format of the base image cluster_size=3D - qcow2 cluster size @@ -537,10 +543,16 @@ Supported options: refcount_bits=3D - Width of a reference count entry in bits size=3D - Virtual disk size =20 +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=3D - Virtual disk size =20 +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 =20 --=20 2.20.1