From nobody Mon Dec 15 01:52:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 151576791333221.277001552677575; Fri, 12 Jan 2018 06:38:33 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 18F9D15447; Fri, 12 Jan 2018 14:38: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 E2DC117989; Fri, 12 Jan 2018 14:38:18 +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 D770818033DB; Fri, 12 Jan 2018 14:38:08 +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 w0CEc6NY025667 for ; Fri, 12 Jan 2018 09:38:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id D3AC85D6A6; Fri, 12 Jan 2018 14:38:06 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5716165624 for ; Fri, 12 Jan 2018 14:38:04 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 12 Jan 2018 15:37:40 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] virsh: Introduce virshNWFilterNameCompleter 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 12 Jan 2018 14:38:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The virConnectListAllNWFilters() has no extra flags yet, which simplifies things a bit. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- tools/virsh-completer.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-nwfilter.c | 9 ++++++--- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index c50143142..9e6f086c0 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -393,3 +393,48 @@ virshNodeDeviceNameCompleter(vshControl *ctl, VIR_FREE(ret); return NULL; } + + +char ** +virshNWFilterNameCompleter(vshControl *ctl, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv =3D ctl->privData; + virNWFilterPtr *nwfilters =3D NULL; + int nnwfilters =3D 0; + size_t i =3D 0; + char **ret =3D NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <=3D 0) + return NULL; + + if ((nnwfilters =3D virConnectListAllNWFilters(priv->conn, &nwfilters,= flags)) < 0) + return NULL; + + if (VIR_ALLOC_N(ret, nnwfilters + 1) < 0) + goto error; + + for (i =3D 0; i < nnwfilters; i++) { + const char *name =3D virNWFilterGetName(nwfilters[i]); + + if (VIR_STRDUP(ret[i], name) < 0) + goto error; + + virNWFilterFree(nwfilters[i]); + } + VIR_FREE(nwfilters); + + return ret; + + error: + for (; i < nnwfilters; i++) + virNWFilterFree(nwfilters[i]); + VIR_FREE(nwfilters); + for (i =3D 0; i < nnwfilters; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + return NULL; +} diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 19fa2113d..3c3b17f1e 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -58,4 +58,8 @@ char ** virshNodeDeviceNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); =20 +char ** virshNWFilterNameCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + #endif diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 40bc193ad..06a002dff 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -136,7 +136,8 @@ static const vshCmdOptDef opts_nwfilter_undefine[] =3D { {.name =3D "nwfilter", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("network filter name or uuid") + .help =3D N_("network filter name or uuid"), + .completer =3D virshNWFilterNameCompleter, }, {.name =3D NULL} }; @@ -179,7 +180,8 @@ static const vshCmdOptDef opts_nwfilter_dumpxml[] =3D { {.name =3D "nwfilter", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("network filter name or uuid") + .help =3D N_("network filter name or uuid"), + .completer =3D virshNWFilterNameCompleter, }, {.name =3D NULL} }; @@ -396,7 +398,8 @@ static const vshCmdOptDef opts_nwfilter_edit[] =3D { {.name =3D "nwfilter", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, - .help =3D N_("network filter name or uuid") + .help =3D N_("network filter name or uuid"), + .completer =3D virshNWFilterNameCompleter, }, {.name =3D NULL} }; --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list