From nobody Mon Feb 9 13:59:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1628773841; cv=none; d=zohomail.com; s=zohoarc; b=bUhV/O3qIwiNfX485np+ozssp4K8K4Kt5Sdb9br33KJD0u787SU4OEH+ZHPJ0O8Su6HgH5t8ePJ+L7MC6jRlOlTQ/PZ+Oukvhq4dEJdkMSc1QTQqdJncXA0ar9Xgu0O7hmRfVsDJak6JZVBRZXy4iP+Q/f7HU2O5eUFMT/7rAPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628773841; 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=6aApM9NcFfUJhUSLGpWN17KQKOlCPXRUb6Z39VskkXY=; b=bHNT4Y0X8wRIoWa0ywSPh7NIGgenufT4YHawbCBxxyfwYvGYpRlAUYwsObdUxWHdvGc/5QLDmV0fnWVfl/oHh+RfgtZFrinIbMn9UGusVoPB2SXmSL876fuP1/ot/BtK3ziyBs/5MfSgneeDKLYwTDsLtXCupXlfpk7OsqJHJSM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1628773841375362.42252917089377; Thu, 12 Aug 2021 06:10:41 -0700 (PDT) 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-58-q4vUs_3oNQiEdLUATsiwZw-1; Thu, 12 Aug 2021 09:10:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39152106B397; Thu, 12 Aug 2021 13:10:21 +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 03F018462C; Thu, 12 Aug 2021 13:10:21 +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 A847C181A100; Thu, 12 Aug 2021 13:10:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17CD1j1X029735 for ; Thu, 12 Aug 2021 09:01:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 467025DA61; Thu, 12 Aug 2021 13:01:45 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id A620F5D9C6 for ; Thu, 12 Aug 2021 13:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628773840; 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=6aApM9NcFfUJhUSLGpWN17KQKOlCPXRUb6Z39VskkXY=; b=PIm+ToYcrd0s5rAe6cJXgpuQbNpicugcPkcBj4U6Qgaizu2C5E69A60dYHnf93FQ56Wvr4 Lyzds1W2h2HqWK9VIhbtVahfYGXu7rKY8P3AuQYopuar5kQl6FTqbmdrJnSWVOc5LY3TO2 VgzXyDdYKtcbh4Aq3AstzXZMNmQuC8w= X-MC-Unique: q4vUs_3oNQiEdLUATsiwZw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] virsh: cmdEcho: Make '--xml' and '--shell' mutually exclusive Date: Thu, 12 Aug 2021 15:01:33 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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) X-ZM-MESSAGEID: 1628773841780100001 Content-Type: text/plain; charset="utf-8" Initialize the flags earlier and use VSH_EXCLUSIVE_OPTIONS_VAR to declare the conflicting options as exclusive. Signed-off-by: Peter Krempa --- tools/vsh.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index f44db5d56d..009c93254c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3153,20 +3153,15 @@ const vshCmdInfo info_echo[] =3D { bool cmdEcho(vshControl *ctl, const vshCmd *cmd) { - bool shell =3D false; - bool xml =3D false; - bool err =3D false; + bool shell =3D vshCommandOptBool(cmd, "shell"); + bool xml =3D vshCommandOptBool(cmd, "xml"); + bool err =3D vshCommandOptBool(cmd, "err"); int count =3D 0; const vshCmdOpt *opt =3D NULL; g_autofree char *arg =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - if (vshCommandOptBool(cmd, "shell")) - shell =3D true; - if (vshCommandOptBool(cmd, "xml")) - xml =3D true; - if (vshCommandOptBool(cmd, "err")) - err =3D true; + VSH_EXCLUSIVE_OPTIONS_VAR(shell, xml); while ((opt =3D vshCommandOptArgv(ctl, cmd, opt))) { g_autofree char *str =3D NULL; --=20 2.31.1