From nobody Mon Feb 9 01:16:32 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; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1604305653; cv=none; d=zohomail.com; s=zohoarc; b=J/CEUZo+0KbHYwh0Yl6m3Q8DMqgmu+W0d6Q4fV7Jb+M0mkC8hQW1p+al5xAFCjGFtVVgcKSmd3wF0u7/gDj8LDkkQfLPI2iysACYauwWVaS8A60+4kcShY468UPni3yyHqLJxs7cp4/eiilRN4xJ7imnXtWQ/v/RjxM14s/shIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604305653; h=Content-Type:Content-Transfer-Encoding:Cc: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=Sv75RcRRqL7Y/ELsvjEF32a/wpifvWYdVnISaGDWTmo=; b=S20lu2XEH6Tz5RdtlReWHN7GjiL+EWvyqAc2t+ZRE08YWdOlsbArZJwub8hrCT/3DiL8O+qKhVx914NWSRa8Twq267F1MiYpOP4BQYTYJaYqbZ2UTiFRM9+TmRX9RxNlcyTJAvOY71WJqDPUfQdEYEoCphUL6NvTNaTob1H9iVk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 16043056531081014.930372399767; Mon, 2 Nov 2020 00:27: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-284-9SMxZ7gfNZW7HA3f2iIkxw-1; Mon, 02 Nov 2020 03:27:29 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C965057087; Mon, 2 Nov 2020 08:27:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A953C5DA6B; Mon, 2 Nov 2020 08:27:22 +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 7534A8C7C1; Mon, 2 Nov 2020 08:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A28QxIb031238 for ; Mon, 2 Nov 2020 03:26:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 78E762157F26; Mon, 2 Nov 2020 08:26:59 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72E962157F23 for ; Mon, 2 Nov 2020 08:26:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C37F800183 for ; Mon, 2 Nov 2020 08:26:59 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [51.163.158.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-unFK5QSjNh2MUed_PM9JjQ-1; Mon, 02 Nov 2020 03:26:56 -0500 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2054.outbound.protection.outlook.com [104.47.1.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-23-BPsMvA5qPX6yqNTpF5aXUA-8; Mon, 02 Nov 2020 09:26:53 +0100 Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17) by AM6PR0402MB3624.eurprd04.prod.outlook.com (2603:10a6:209:4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.30; Mon, 2 Nov 2020 08:26:49 +0000 Received: from AM6PR04MB5782.eurprd04.prod.outlook.com ([fe80::b5ca:e454:9fad:8712]) by AM6PR04MB5782.eurprd04.prod.outlook.com ([fe80::b5ca:e454:9fad:8712%7]) with mapi id 15.20.3499.030; Mon, 2 Nov 2020 08:26:49 +0000 Received: from t440p.suse.asia (60.251.47.115) by AM9P191CA0007.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Mon, 2 Nov 2020 08:26:48 +0000 X-MC-Unique: 9SMxZ7gfNZW7HA3f2iIkxw-1 X-MC-Unique: unFK5QSjNh2MUed_PM9JjQ-1 X-MC-Unique: BPsMvA5qPX6yqNTpF5aXUA-8 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/19] virsh: create a macro with a _FULL suffix for common --interface option Date: Mon, 2 Nov 2020 16:26:07 +0800 Message-ID: <20201102082621.13228-6-lma@suse.com> In-Reply-To: <20201102082621.13228-1-lma@suse.com> References: <20201102082621.13228-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: AM9P191CA0007.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21c::12) To AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fe99070-41a9-4a2d-4670-08d87f090b44 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3624: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:25 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: kyHNZf1k3JFxtiXUd/TtrPinaZiJ/+pxEp8atBovqOoY6MKWkSZrXBfL5u2BRPNcXDAhaLWBpRD6JZWqYKrgbRLG3napx4fLz0HLzTv1L2Wm8VYRFWEulCcwlsuVjk+NzYJABkaVGUvYqFB0+aoKAwc/xzePsCoQWyqmz9VWddCyfXKopcMfLWtMc8jOV8kfEAImZF52eTRWsy0tQH02rZwiEfAeu8RkYY7GaCNZ4GMsotr4OEhXsECVRwWc7+Vq6t/nyBIVxNSQyzwgoqt1RezylUU9mxrXilQbOmUjepdQbdK+sirna706NlzMRd5b14+9ZESEJaFSViY9X11hOomIRb0OLpOTNWy5DCpzfjBUIxR98mtiZrM7UZH4G1t8rIzh+csEkqf7nhNdyqix9g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5782.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(346002)(39860400002)(396003)(376002)(136003)(366004)(107886003)(6666004)(5660300002)(16526019)(66556008)(66946007)(66476007)(2616005)(956004)(8676002)(6506007)(186003)(316002)(450100002)(4326008)(52116002)(26005)(478600001)(8936002)(2906002)(36756003)(55236004)(86362001)(1076003)(6916009)(6486002)(83380400001)(6512007); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: zqrzMOfp6yLRYOFwFZacI24QLiJZho6Xxh+ApqZWt86hldVjfECI0dbQiPXCghi+iZyr1mcsxqqctiKKXCm/ADMIC4IRd844ddnoKwEWpQOgh2JehfLBP53JW0w2ujqWRJFDgYUOoCeAdrm3ZXcYF7t0h2GL0Zp1ywEBgymr5G8LjSxkpPTrw/fON2tuPmSoKBT0WJlmbylFeOgUk6KEejx/Snt5pe8LUyndMXeVJ/GqvF4dRl51ln/LBBkdn0yv7so9XDVBkaaGKQY+Mf4sMKB4zdCmsgDdewbuGBk5QHfSDCfnwHkRXGXSVxhlQXIECSuXg9TCI9UKx3LWMFYTgLHKJhgX90tp0JbPfE+Rant3GbE6MQUQPDM0mmoJe+BTI1F/EdRYbr2oDy2pAcY/BCZilZuHj4zBnUnLCxEhhTHpbnl5Naumb3gN77QAOCvutFbOESiKWiIjjAaE5oruBaLEz/H6FjhMidyeibgSE9K+TncFSKfFCrkErzGh40AI9D2Fbi2b5+u8RperlPmcw8kii+sLbh5T9gF8jMiFFZ+ba7R0+H5eJgY0ZOrbBdlOM5gLVxir+xx8n0MJ6nm3/UKfOzIYrJuDqrcL78tZozP2xlynm9a/jaQPvsP/Z/hDWTaLi101vU4DZ5fEDM0Xlw== X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fe99070-41a9-4a2d-4670-08d87f090b44 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5782.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2020 08:26:49.7280 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: axU95ugyhx/0TBJecfwPWuV1pmv5VezSiLqGd/ykRF09ZSWKyE1gsoSTUhLbM8pR X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3624 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A28QxIb031238 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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.14 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma --- tools/virsh-interface.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index bd57648779..6c47767754 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -18,15 +18,18 @@ * . */ =20 -#define VIRSH_COMMON_OPT_INTERFACE(cflags) \ +#define VIRSH_COMMON_OPT_INTERFACE(_helpstr, cflags) \ {.name =3D "interface", \ .type =3D VSH_OT_DATA, \ .flags =3D VSH_OFLAG_REQ, \ - .help =3D N_("interface name or MAC address"), \ + .help =3D _helpstr, \ .completer =3D virshInterfaceCompleter, \ .completer_flags =3D cflags, \ } =20 +#define VIRSH_COMMON_OPT_INTERFACE_FULL(cflags) \ + VIRSH_COMMON_OPT_INTERFACE(N_("interface name or MAC address"), cflags) + #include #include "virsh-interface.h" =20 @@ -101,7 +104,7 @@ static const vshCmdInfo info_interface_edit[] =3D { }; =20 static const vshCmdOptDef opts_interface_edit[] =3D { - VIRSH_COMMON_OPT_INTERFACE(0), + VIRSH_COMMON_OPT_INTERFACE_FULL(0), {.name =3D NULL} }; =20 @@ -473,7 +476,7 @@ static const vshCmdInfo info_interface_dumpxml[] =3D { }; =20 static const vshCmdOptDef opts_interface_dumpxml[] =3D { - VIRSH_COMMON_OPT_INTERFACE(0), + VIRSH_COMMON_OPT_INTERFACE_FULL(0), {.name =3D "inactive", .type =3D VSH_OT_BOOL, .help =3D N_("show inactive defined XML") @@ -570,7 +573,7 @@ static const vshCmdInfo info_interface_undefine[] =3D { }; =20 static const vshCmdOptDef opts_interface_undefine[] =3D { - VIRSH_COMMON_OPT_INTERFACE(0), + VIRSH_COMMON_OPT_INTERFACE_FULL(0), {.name =3D NULL} }; =20 @@ -609,7 +612,7 @@ static const vshCmdInfo info_interface_start[] =3D { }; =20 static const vshCmdOptDef opts_interface_start[] =3D { - VIRSH_COMMON_OPT_INTERFACE(VIR_CONNECT_LIST_INTERFACES_INACTIVE), + VIRSH_COMMON_OPT_INTERFACE_FULL(VIR_CONNECT_LIST_INTERFACES_INACTIVE), {.name =3D NULL} }; =20 @@ -648,7 +651,7 @@ static const vshCmdInfo info_interface_destroy[] =3D { }; =20 static const vshCmdOptDef opts_interface_destroy[] =3D { - VIRSH_COMMON_OPT_INTERFACE(VIR_CONNECT_LIST_INTERFACES_ACTIVE), + VIRSH_COMMON_OPT_INTERFACE_FULL(VIR_CONNECT_LIST_INTERFACES_ACTIVE), {.name =3D NULL} }; =20 --=20 2.26.0