From nobody Mon Sep 16 18:54:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707513816635892.8898304216879; Fri, 9 Feb 2024 13:23:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYYKy-0006j8-6t; Fri, 09 Feb 2024 16:23:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYYKv-0006ho-Qh; Fri, 09 Feb 2024 16:23:05 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYYKu-00008r-CC; Fri, 09 Feb 2024 16:23:05 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D35334BF61; Sat, 10 Feb 2024 00:24:03 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id BFE1277EDB; Sat, 10 Feb 2024 00:22:47 +0300 (MSK) Received: (nullmailer pid 1123166 invoked by uid 1000); Fri, 09 Feb 2024 21:22:47 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: Michael Tokarev Subject: [PATCH 09/23] qemu-img: refresh options/--help for "info" command Date: Sat, 10 Feb 2024 00:22:30 +0300 Message-Id: <34047bb7a1ebf37cb6cf41a4610f248ebccc5b13.1707513011.git.mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1707513819692100003 Content-Type: text/plain; charset="utf-8" Add missing long options and --help output. Signed-off-by: Michael Tokarev --- qemu-img.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index d4dafebff9..a1a0ba99f0 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -65,7 +65,6 @@ typedef struct img_cmd_t { =20 enum { OPTION_OUTPUT =3D 256, - OPTION_BACKING_CHAIN =3D 257, OPTION_OBJECT =3D 258, OPTION_IMAGE_OPTS =3D 259, OPTION_PATTERN =3D 260, @@ -3173,13 +3172,13 @@ static int img_info(const img_cmd_t *ccmd, int argc= , char **argv) {"help", no_argument, 0, 'h'}, {"format", required_argument, 0, 'f'}, {"output", required_argument, 0, OPTION_OUTPUT}, - {"backing-chain", no_argument, 0, OPTION_BACKING_CHAIN}, + {"backing-chain", no_argument, 0, 'b'}, {"object", required_argument, 0, OPTION_OBJECT}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, {"force-share", no_argument, 0, 'U'}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":f:hU", + c =3D getopt_long(argc, argv, ":f:hbU", long_options, &option_index); if (c =3D=3D -1) { break; @@ -3192,7 +3191,20 @@ static int img_info(const img_cmd_t *ccmd, int argc,= char **argv) unrecognized_option(ccmd, argv[optind - 1]); break; case 'h': - help(); + cmd_help(ccmd, +"[-f FMT | --image-opts] [-b] [-U] [--object OBJDEF]\n" +" [--output human|json] FILENAME\n" +, +" -f|--format FMT - specify FILENAME image format explicitly\n" +" --image-opts - indicates that FILENAME is a complete image specification= \n" +" instead of a file name (incompatible with --format)\n" +" -b|--backing-chain - display information about backing chaing\n" +" (in case the image is stacked\n" +" -U|--force-share - open image in shared mode for concurrent access\n" +" --object OBJDEF - QEMU user-creatable object (eg encryption key)\n" +" --output human|json - specify output format name (default human)\n" +" FILENAME - image file name (or specification with --image-opts)\n" +); break; case 'f': fmt =3D optarg; @@ -3203,7 +3215,7 @@ static int img_info(const img_cmd_t *ccmd, int argc, = char **argv) case OPTION_OUTPUT: output_format =3D parse_output_format(ccmd, optarg); break; - case OPTION_BACKING_CHAIN: + case 'b': chain =3D true; break; case OPTION_OBJECT: --=20 2.39.2