From nobody Mon Feb 9 12:24:07 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=WaKUZAUgd45sru+Z9+yp9VcuYjzVY2jGaSIAnzDujPG4Jev7x2R7bgHF9vgPaAmj2SCuW/eO+E96chUr/3xRIC3IUGk7a7SSr0AfW2diNqrU7oaCc667XHWivrB0SCewcKiK9UlRbQGb+YrKRyz6oj2whEkn+qq7PAbkd7LIhrk= 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=iSdvFGc+a48vrjTcWxA7D6jyCjUtJf7aLvaE1AyUd+I=; b=dnNNZAcsOfQGQPMFabzAa3RDAyCkmUJpW3iGNV+NVEmojaVx/fcE8aloRKnIh6GJGeVJ4q+reMaK2i2JNE1lpB4nuawwnWSb5CLepIjnFEfiql4sbMBIJG3PI36lECvuojb6LSzGXGLJEsYS0soNqqhu6BfeD3DIMNI2Hbpdc0I= 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 1604305653443774.1857701775577; 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-556-HeNuvnd7NUGC1vzBeEk2FQ-1; Mon, 02 Nov 2020 03:27:30 -0500 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 726E257085; Mon, 2 Nov 2020 08:27:22 +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 5038C73660; 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 1B7A8181A6DF; Mon, 2 Nov 2020 08:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A28RFX1031323 for ; Mon, 2 Nov 2020 03:27:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id 03D3C1111A51; Mon, 2 Nov 2020 08:27:15 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F32731111A41 for ; Mon, 2 Nov 2020 08:27:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 3BC2C185A790 for ; Mon, 2 Nov 2020 08:27:09 +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-206-WnHaH5vLPTS9immZR1Pn8w-1; Mon, 02 Nov 2020 03:27:07 -0500 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2051.outbound.protection.outlook.com [104.47.6.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-11-eu1vujCeNRe8QpjbyaiqeQ-1; Mon, 02 Nov 2020 09:27:03 +0100 Received: from AM6PR04MB5782.eurprd04.prod.outlook.com (2603:10a6:20b:aa::17) by AM6PR0402MB3845.eurprd04.prod.outlook.com (2603:10a6:209:1b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Mon, 2 Nov 2020 08:26:56 +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:56 +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:54 +0000 X-MC-Unique: HeNuvnd7NUGC1vzBeEk2FQ-1 X-MC-Unique: WnHaH5vLPTS9immZR1Pn8w-1 X-MC-Unique: eu1vujCeNRe8QpjbyaiqeQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/19] virsh: Add interface mac completion to iface-name command Date: Mon, 2 Nov 2020 16:26:10 +0800 Message-ID: <20201102082621.13228-9-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: c799b9e5-e7bb-40ed-fcea-08d87f090eef X-MS-TrafficTypeDiagnostic: AM6PR0402MB3845: 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:1013 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 6dIYiZnrTHck1mnfIUuk8fKDCBuq2fx4/q/HSe3vHwriHUbTZAQx4BLovrfSEo+BriKASMkMG6QYz/SeMeGVJNxH94qSq9Nu5gc5jho01eykpmK+H0cFJVgwXh7KuSPaEUFsQDRj/Ga+y4MKTAv/Tac62UFi/szan10VsJlJI7NFrrLN5yVCtK+a/9yOo9EFxY0UixlrkUZxB9rAleLSmJMJPqmqVdeZrHlgkz2XC+s5XLActsfDDSSaOTWwU3bhrbwyTFHECkoNnoz+XEgKDZqPFGJNAwOXyu8sqIqZXn25K4tXzdnjNrrQXZ8z3rbip81xvCJN2JnfUEWNATVpFQ== 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:(396003)(366004)(39860400002)(376002)(136003)(346002)(26005)(1076003)(6506007)(186003)(16526019)(956004)(52116002)(450100002)(83380400001)(4326008)(2906002)(5660300002)(2616005)(478600001)(55236004)(86362001)(6486002)(6916009)(8676002)(6512007)(8936002)(6666004)(316002)(66476007)(66946007)(107886003)(66556008)(36756003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: QEIQjsDGl+I0Lzs4PSQYF+7jEHaDeXW6SFiJ240FEAmXZDKPMr7YqKDhk1y5gcr0Z4aWn33NDtVWNWZQQgicQlQb4okwNqwF86h0s6oSNHZKCeHrhsi86fBysorketi5XY6oVNYTXO4S9GR9U01hVU0CzFcfnlSSJRd8/M5M7AV5rbGZkI6gqlwwaAYIO9fi5KyKnrDuP5qlIlWkM1iBW5VRTw0tDfkhJ46PDpCJ+1OWLX9ePAkAR1FKE4+ZnbBjvsFzI4jUJ3P8Fg/DmO8gRv3F9QdA49xv0/psjQ7Y5Eghxp99vpPsv+DN58dMhMSqg4766opAJXXUOyA7GE8pqS75unjiW5DvdJ/+39AVT0BG6omKcvgXlNIga3+sk2Btrm7e7ngNSkRy+ksmpQUkC4O2uMdvFIYAaL9iARBWtiSSCoxNJBMmA0usR8kLrYlo1kuzh22uNvwv0w1izIkzfk2rOb8N47HYsDBBNfqzy4+AT1pMDXsYJOs6uxjrdFFW7IwMiHUwSfUB6hTUacH0ZFZWQ8E7J0SV1dabo4ibUKVBmLBx/cipmW0xpBzpKVVzT9bHjLRJj0i/AESXbY5idcTsrQxlR4xsNLzY2zBnWOZY3LMdfNIbcvm5ds87jVD17LVnrn0ZKaq5S0himEV6wA== X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c799b9e5-e7bb-40ed-fcea-08d87f090eef 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:55.8845 (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: GHGpYXgqGcsWqkxkQbnKHyG0X4TPoNeSCJB+L2KIQ7pifNxLph4WX4J+AElC4ttN X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3845 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.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 0A28RFX1031323 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.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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma --- tools/virsh-completer-interface.c | 13 +++++++++---- tools/virsh-completer-interface.h | 4 ++++ tools/virsh-interface.c | 8 +++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-inte= rface.c index 777bb22b0b..c24a2cea6c 100644 --- a/tools/virsh-completer-interface.c +++ b/tools/virsh-completer-interface.c @@ -38,7 +38,8 @@ virshInterfaceCompleter(vshControl *ctl, VIR_AUTOSTRINGLIST tmp =3D NULL; =20 virCheckFlags(VIR_CONNECT_LIST_INTERFACES_ACTIVE | - VIR_CONNECT_LIST_INTERFACES_INACTIVE, + VIR_CONNECT_LIST_INTERFACES_INACTIVE | + VIRSH_INTERFACE_COMPLETER_MAC, NULL); =20 if (!priv->conn || virConnectIsAlive(priv->conn) <=3D 0) @@ -50,9 +51,13 @@ virshInterfaceCompleter(vshControl *ctl, tmp =3D g_new0(char *, nifaces + 1); =20 for (i =3D 0; i < nifaces; i++) { - const char *name =3D virInterfaceGetName(ifaces[i]); - - tmp[i] =3D g_strdup(name); + if (!(flags & VIRSH_INTERFACE_COMPLETER_MAC)) { + const char *name =3D virInterfaceGetName(ifaces[i]); + tmp[i] =3D g_strdup(name); + } else { + const char *mac =3D virInterfaceGetMACString(ifaces[i]); + tmp[i] =3D g_strdup(mac); + } } =20 ret =3D g_steal_pointer(&tmp); diff --git a/tools/virsh-completer-interface.h b/tools/virsh-completer-inte= rface.h index 2b382222d7..71bc44c4b9 100644 --- a/tools/virsh-completer-interface.h +++ b/tools/virsh-completer-interface.h @@ -22,6 +22,10 @@ =20 #include "vsh.h" =20 +enum { + VIRSH_INTERFACE_COMPLETER_MAC =3D 1 << 0, +}; + char ** virshInterfaceCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index df97b74c4c..1dabc6e406 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -404,11 +404,9 @@ static const vshCmdInfo info_interface_name[] =3D { }; =20 static const vshCmdOptDef opts_interface_name[] =3D { - {.name =3D "interface", - .type =3D VSH_OT_DATA, - .flags =3D VSH_OFLAG_REQ, - .help =3D N_("interface mac") - }, + VIRSH_COMMON_OPT_INTERFACE(N_("interface mac"), + VIR_CONNECT_LIST_INTERFACES_ACTIVE | + VIRSH_INTERFACE_COMPLETER_MAC), {.name =3D NULL} }; =20 --=20 2.26.0