From nobody Mon Feb 9 05:46:02 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1710158639057963.218898869729; Mon, 11 Mar 2024 05:03:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 046BE1E7A; Mon, 11 Mar 2024 08:03:57 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C53461F0F; Mon, 11 Mar 2024 07:34:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 567881D4B; Mon, 11 Mar 2024 07:31:23 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F25A51D1E for ; Mon, 11 Mar 2024 07:31:19 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-BrMiBUKQMei4mqsmNcSFJQ-1; Mon, 11 Mar 2024 07:31:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C20A8007A4 for ; Mon, 11 Mar 2024 11:31:18 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98738112131D for ; Mon, 11 Mar 2024 11:31:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: BrMiBUKQMei4mqsmNcSFJQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 16/23] vsh: Fix broken assumption that required VSH_OT_INT must be positional Date: Mon, 11 Mar 2024 12:30:53 +0100 Message-ID: <4c572ef2c6c1843feee4a599688d3ac5f546de00.1710156504.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: LREQ4OKXSHFNOLVGICNLKGKMO34LWKYM X-Message-ID-Hash: LREQ4OKXSHFNOLVGICNLKGKMO34LWKYM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1710158641100100001 In at least one case we've wanted a mandatory argument which requires the explicit flag. Fix the assumption before converting everything over to the new flags. Signed-off-by: Peter Krempa --- tools/virt-admin.c | 1 - tools/vsh.c | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index d266d824cb..2e8895956d 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1011,7 +1011,6 @@ static const vshCmdInfo info_daemon_log_outputs =3D { static const vshCmdOptDef opts_daemon_timeout[] =3D { {.name =3D "timeout", .type =3D VSH_OT_INT, - .positional =3D true, .required =3D true, .help =3D N_("number of seconds the daemon will run without any activ= e connection"), .flags =3D VSH_OFLAG_REQ | VSH_OFLAG_REQ_OPT diff --git a/tools/vsh.c b/tools/vsh.c index 9745c122fe..7091cf093c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -426,9 +426,14 @@ vshCmddefCheckInternals(vshControl *ctl, opt->name, cmd->name); return -1; } - seenPositionalOption =3D true; - isPositional =3D true; + isRequired =3D true; + + /* allow INT arguments which are required and non-position= al */ + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) { + seenPositionalOption =3D true; + isPositional =3D true; + } } else { isPositional =3D false; isRequired =3D false; --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org