From nobody Mon Feb 9 12:11:20 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 1710510432046615.3925814971609; Fri, 15 Mar 2024 06:47:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E53971DA7; Fri, 15 Mar 2024 09:47:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B756B17BF; Fri, 15 Mar 2024 09:44:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5E5681A4F; Fri, 15 Mar 2024 09:44:32 -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 7D6EE1901 for ; Fri, 15 Mar 2024 09:44:31 -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-76-AJPmJgfzMVqtpcPIf-vxWA-1; Fri, 15 Mar 2024 09:44:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 1597D101CF82 for ; Fri, 15 Mar 2024 13:44:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83F14C1576F for ; Fri, 15 Mar 2024 13:44:28 +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: AJPmJgfzMVqtpcPIf-vxWA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 04/28] virsh: Inline VIRSH_COMMON_OPT_DOMAIN_OT_STRING macro Date: Fri, 15 Mar 2024 14:43:59 +0100 Message-ID: <6b96511ba09724b3533693608071a723c20f1c7e.1710510136.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: X2D4AAGEBKRMCAQTVOKTFJLZJKZE5MPU X-Message-ID-Hash: X2D4AAGEBKRMCAQTVOKTFJLZJKZE5MPU 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: 1710510433752100001 Upcoming patches will need to tweak some of the properties of the command. Since the macro is used in just two places expand it inline. Signed-off-by: Peter Krempa --- tools/virsh-domain-event.c | 7 +++++-- tools/virsh-domain.c | 14 +++++++++++--- tools/virsh.h | 13 ------------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c index 2ff7f7b81c..73b00f3bb2 100644 --- a/tools/virsh-domain-event.c +++ b/tools/virsh-domain-event.c @@ -865,8 +865,11 @@ static const vshCmdInfo info_event =3D { }; static const vshCmdOptDef opts_event[] =3D { - VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uui= d"), - 0, 0), + {.name =3D "domain", + .type =3D VSH_OT_STRING, + .help =3D N_("filter by domain name, id or uuid"), + .completer =3D virshDomainNameCompleter, + }, {.name =3D "event", .type =3D VSH_OT_STRING, .completer =3D virshDomainEventNameCompleter, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cd37828660..0bf4d524b0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9826,8 +9826,11 @@ static const vshCmdInfo info_qemu_monitor_event =3D { }; static const vshCmdOptDef opts_qemu_monitor_event[] =3D { - VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uui= d"), - 0, 0), + {.name =3D "domain", + .type =3D VSH_OT_STRING, + .help =3D N_("filter by domain name, id or uuid"), + .completer =3D virshDomainNameCompleter, + }, {.name =3D "event", .type =3D VSH_OT_STRING, .help =3D N_("filter by event name") @@ -10322,7 +10325,12 @@ static const vshCmdOptDef opts_domxmltonative[] = =3D { .required =3D true, .help =3D N_("target config data type format") }, - VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(VSH_OFLAG_REQ_OPT, 0), + {.name =3D "domain", + .type =3D VSH_OT_STRING, + .flags =3D VSH_OFLAG_REQ_OPT, + .help =3D N_("domain name, id or uuid"), + .completer =3D virshDomainNameCompleter, + }, {.name =3D "xml", .type =3D VSH_OT_STRING, .completer =3D virshCompletePathLocalExisting, diff --git a/tools/virsh.h b/tools/virsh.h index 1114c1572b..ff0cf80911 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -109,19 +109,6 @@ .help =3D _helpstr \ } -#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, oflags, cflags) \ - {.name =3D "domain", \ - .type =3D VSH_OT_STRING, \ - .flags =3D oflags, \ - .help =3D _helpstr, \ - .completer =3D virshDomainNameCompleter, \ - .completer_flags =3D cflags, \ - } - -#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(oflags, cflags) \ - VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), \ - oflags, cflags) - typedef struct _virshControl virshControl; typedef struct _virshCtrlData virshCtrlData; --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org