From nobody Tue Feb 10 20:28:38 2026 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 1525899945402366.0314148453931; Wed, 9 May 2018 14:05:45 -0700 (PDT) Received: from localhost ([::1]:59032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGWHQ-0004Ej-M0 for importer@patchew.org; Wed, 09 May 2018 17:05:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGWCa-00008L-EZ for qemu-devel@nongnu.org; Wed, 09 May 2018 17:00:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGWCZ-0002FG-N8 for qemu-devel@nongnu.org; Wed, 09 May 2018 17:00:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45606 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fGWCU-0002B0-Gf; Wed, 09 May 2018 17:00:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9D6CA430A698; Wed, 9 May 2018 21:00:37 +0000 (UTC) Received: from localhost (unknown [10.40.205.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49A0A202322A; Wed, 9 May 2018 21:00:37 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 9 May 2018 23:00:21 +0200 Message-Id: <20180509210023.20283-6-mreitz@redhat.com> In-Reply-To: <20180509210023.20283-1-mreitz@redhat.com> References: <20180509210023.20283-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 09 May 2018 21:00:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Wed, 09 May 2018 21:00:37 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 5/7] qemu-img: Recognize no creation support in -o help 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 , John Snow , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The only users of print_block_option_help() are qemu-img create and qemu-img convert for the output image, so this function is always used for image creation (it used to be used for amendment also, but that is no longer the case). So if image creation is not supported by either the format or the protocol, there is no need to print any option description, because the user cannot create an image like this anyway. This also fixes an assertion failure: $ qemu-img create -f bochs -o help Supported options: qemu-img: util/qemu-option.c:219: qemu_opts_print_help: Assertion `list' failed. [1] 24831 abort (core dumped) qemu-img create -f bochs -o help Signed-off-by: Max Reitz Reviewed-by: John Snow Reviewed-by: Eric Blake --- qemu-img.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index a1ae718a52..81ad1e040c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -250,6 +250,11 @@ static int print_block_option_help(const char *filenam= e, const char *fmt) return 1; } =20 + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation",= fmt); + return 1; + } + create_opts =3D qemu_opts_append(create_opts, drv->create_opts); if (filename) { proto_drv =3D bdrv_find_protocol(filename, true, &local_err); @@ -258,6 +263,11 @@ static int print_block_option_help(const char *filenam= e, const char *fmt) qemu_opts_free(create_opts); return 1; } + if (!proto_drv->create_opts) { + error_report("Protocal driver '%s' does not support image crea= tion", + proto_drv->format_name); + return 1; + } create_opts =3D qemu_opts_append(create_opts, proto_drv->create_op= ts); } =20 --=20 2.14.3