From nobody Tue Nov 26 14:51:53 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 1707328753015188.9081341907911; Wed, 7 Feb 2024 09:59:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXmC9-0003iR-4e; Wed, 07 Feb 2024 12:58:50 -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 1rXmBu-0003WY-3x; Wed, 07 Feb 2024 12:58:35 -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 1rXmBr-00041k-Vg; Wed, 07 Feb 2024 12:58:33 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7FF2A4B3D5; Wed, 7 Feb 2024 20:59:35 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id A8540763A5; Wed, 7 Feb 2024 20:58:23 +0300 (MSK) Received: (nullmailer pid 296934 invoked by uid 1000); Wed, 07 Feb 2024 17:58:19 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: Michael Tokarev Subject: [PATCH 6/8] qemu-img: refresh options/--help for "commit" command Date: Wed, 7 Feb 2024 20:58:15 +0300 Message-Id: <76c05bdf1bd337f75b11ea4e33d201a29aa57ecd.1707328606.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: 1707328755249100003 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, 21 insertions(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 31c1891b43..7ff63aeea2 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1015,8 +1015,15 @@ static int img_commit(const char *cmdname, int argc,= char **argv) for(;;) { static const struct option long_options[] =3D { {"help", no_argument, 0, 'h'}, + {"quiet", no_argument, 0, 'q'}, {"object", required_argument, 0, OPTION_OBJECT}, + {"format", required_argument, 0, 'f'}, {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS}, + {"cache", required_argument, 0, 't'}, + {"drop", no_argument, 0, 'd'}, + {"base", required_argument, 0, 'b'}, + {"progress", no_argument, 0, 'p'}, + {"rate", required_argument, 0, 'r'}, {0, 0, 0, 0} }; c =3D getopt_long(argc, argv, ":f:ht:b:dpqr:", @@ -1032,7 +1039,20 @@ static int img_commit(const char *cmdname, int argc,= char **argv) unrecognized_option(cmdname, argv[optind - 1]); break; case 'h': - help(); + cmd_help(cmdname, "[OPTIONS] FILENAME", + "Commit changes recorded in FILENAME to its base imag= e", +" -q|--quiet - quiet operations\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" +" -t|--cache CACHE_MODE cache mode when opening image (" BDRV_DEFAULT_CACH= E ")\n" +" -d|--drop - skip emptying FILENAME on completion\n" +" -b|--base BASE_IMG - image in the backing chain to which to commit\n" +" changes instead of the previous one (implies --drop)\n" +" -p|--progress - show operation progress\n" +" -r|--rate RATE - I/O rate limit\n" +" --object OBJDEF - QEMU user-creatable object (eg encryption key)\n" +" FILENAME - name of the image file to operate on\n"); break; case 'f': fmt =3D optarg; --=20 2.39.2