From nobody Mon Feb 9 10:30:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605188613; cv=none; d=zohomail.com; s=zohoarc; b=aVHKgQ2bJ9BlGIG5zlOq/dBEQVL+xupXiRKdAWbJHan9kQZFii3TrukhGW4hdhGc2qEM53MDgLCcrpV/b5Tj9B0wGm1WUpmip4s7cCwUEgnkyvdWewWg0QLL8yrtpqmLePVGJ698d/VaYeNeB8aeOeJZwaqImCgF5EtdvPHt1hI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605188613; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xYU7pVLy/vEmEh4gHiGhwuhnsyyk0u2+SxBCx3pPRyM=; b=CK611Yql6pAhPPriG7iSHBqaG0skpZtNoSjVAt70hZsF+e3QMalVAshgaVVhqKjDLZpqdeqPKI+2tSl0C9Bp0d1sMcLqOXQ8EOlBWmLRIyNeuK4UCQ47yxAM1uRhuZb6G+5dw3bMBktEyiyXToU4/NlY16tofIoBM9lRoRz/7Lc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605188613281663.9750623417275; Thu, 12 Nov 2020 05:43:33 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-410-9-6v-xpnMyOEfmH6ApdXww-1; Thu, 12 Nov 2020 08:43:30 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0564218B6472; Thu, 12 Nov 2020 13:43:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D544575139; Thu, 12 Nov 2020 13:43:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 65EE9181A06B; Thu, 12 Nov 2020 13:43:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACDhLfF012352 for ; Thu, 12 Nov 2020 08:43:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7B37A75135; Thu, 12 Nov 2020 13:43:21 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id C27E255766 for ; Thu, 12 Nov 2020 13:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605188612; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xYU7pVLy/vEmEh4gHiGhwuhnsyyk0u2+SxBCx3pPRyM=; b=b0iEcNlbJAB8Qzb9m95ZbGw+rYwW8OZYtTARlnarndbOJcixyYDUVyTBWSgc/XdU8u6OCd Rx6P5RZOM+we7hTrL+L1aF2VteuNx3DsF3vsrQ/s2hq1c8Suk9ZXhjc5eUTli51ngDkzYn QhqZ0rdhkblOw4co+AtPj+MRtBcKHg0= X-MC-Unique: 9-6v-xpnMyOEfmH6ApdXww-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/8] tools: vshCmddefOptParse: Remove 'optional' command validation Date: Thu, 12 Nov 2020 14:43:02 +0100 Message-Id: <6766b37fcdbe52d03d295e30cf1d8e3a26b384ec.1605188395.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since vshCmddefCheckInternals now has this check we no longer need it in vshCmddefOptParse. Signed-off-by: Peter Krempa --- tools/vsh.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index cf4ddc1c2c..f92759f219 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -399,7 +399,6 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_= need_arg, uint64_t *opts_required) { size_t i; - bool optional =3D false; *opts_need_arg =3D 0; *opts_required =3D 0; @@ -410,30 +409,17 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opt= s_need_arg, for (i =3D 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt =3D &cmd->opts[i]; - if (opt->type =3D=3D VSH_OT_BOOL) { - optional =3D true; + if (opt->type =3D=3D VSH_OT_BOOL) continue; - } - - if (opt->flags & VSH_OFLAG_REQ_OPT) { - if (opt->flags & VSH_OFLAG_REQ) - *opts_required |=3D 1ULL << i; - else - optional =3D true; - continue; - } if (opt->type =3D=3D VSH_OT_ALIAS) continue; /* skip the alias option */ - *opts_need_arg |=3D 1ULL << i; - if (opt->flags & VSH_OFLAG_REQ) { - if (optional && opt->type !=3D VSH_OT_ARGV) - return -1; /* mandatory options must be listed first */ + if (!(opt->flags & VSH_OFLAG_REQ_OPT)) + *opts_need_arg |=3D 1ULL << i; + + if (opt->flags & VSH_OFLAG_REQ) *opts_required |=3D 1ULL << i; - } else { - optional =3D true; - } } return 0; --=20 2.28.0