From nobody Sat Dec 21 14:05:28 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 1707513839299771.3803656863363; Fri, 9 Feb 2024 13:23:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYYLa-0007Ii-FT; Fri, 09 Feb 2024 16:23:46 -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 1rYYLY-0007FM-L2; Fri, 09 Feb 2024 16:23:44 -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 1rYYLJ-00009S-4S; Fri, 09 Feb 2024 16:23:44 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 070A04BF64; Sat, 10 Feb 2024 00:24:04 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E809C77EDE; Sat, 10 Feb 2024 00:22:47 +0300 (MSK) Received: (nullmailer pid 1123175 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 12/23] qemu-img: make -l (list) the default for "snapshot" subcommand Date: Sat, 10 Feb 2024 00:22:33 +0300 Message-Id: <71d69214d43897e5649fed00804a5969b0fd718b.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: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: 1707513841261100002 Content-Type: text/plain; charset="utf-8" also remove bdrv_oflags handling (only list can use RO mode) --- qemu-img.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 1e09b78d00..d9dfff2f07 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3541,7 +3541,7 @@ static int img_snapshot(const img_cmd_t *ccmd, int ar= gc, char **argv) BlockDriverState *bs; QEMUSnapshotInfo sn; char *filename, *fmt =3D NULL, *snapshot_name =3D NULL; - int c, ret =3D 0, bdrv_oflags; + int c, ret =3D 0; int action =3D 0; bool quiet =3D false; Error *err =3D NULL; @@ -3549,7 +3549,6 @@ static int img_snapshot(const img_cmd_t *ccmd, int ar= gc, char **argv) bool force_share =3D false; int64_t rt; =20 - bdrv_oflags =3D BDRV_O_RDWR; /* Parse commandline parameters */ for(;;) { static const struct option long_options[] =3D { @@ -3583,7 +3582,6 @@ static int img_snapshot(const img_cmd_t *ccmd, int ar= gc, char **argv) return 0; } action =3D SNAPSHOT_LIST; - bdrv_oflags &=3D ~BDRV_O_RDWR; /* no need for RW */ break; case 'a': if (action) { @@ -3629,9 +3627,14 @@ static int img_snapshot(const img_cmd_t *ccmd, int a= rgc, char **argv) } filename =3D argv[optind++]; =20 + if (!action) { + action =3D SNAPSHOT_LIST; + } + /* Open the image */ - blk =3D img_open(image_opts, filename, fmt, bdrv_oflags, false, quiet, - force_share); + blk =3D img_open(image_opts, filename, fmt, + action =3D=3D SNAPSHOT_LIST ? 0 : BDRV_O_RDWR, + false, quiet, force_share); if (!blk) { return 1; } --=20 2.39.2