From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039884083476.45297106307964; Fri, 11 May 2018 04:58:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4989C300174D; Fri, 11 May 2018 11:58:02 +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 124F399344; Fri, 11 May 2018 11:58:02 +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 AC5891801248; Fri, 11 May 2018 11:58:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvt26025392 for ; Fri, 11 May 2018 07:57:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 364042026DFD; Fri, 11 May 2018 11:57:55 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44C89202660C for ; Fri, 11 May 2018 11:57:54 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:44 +0200 Message-Id: <20180511115751.9406-2-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/8] Introduce NWFilter Interface 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.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 11 May 2018 11:58:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/Makefile.am | 1 + data/org.libvirt.NWFilter.xml | 7 +++++ src/Makefile.am | 1 + src/connect.c | 6 ++++ src/connect.h | 1 + src/nwfilter.c | 65 +++++++++++++++++++++++++++++++++++++++= ++++ src/nwfilter.h | 9 ++++++ src/util.c | 32 +++++++++++++++++++++ src/util.h | 15 ++++++++++ 9 files changed, 137 insertions(+) create mode 100644 data/org.libvirt.NWFilter.xml create mode 100644 src/nwfilter.c create mode 100644 src/nwfilter.h diff --git a/data/Makefile.am b/data/Makefile.am index 5a085cd..fdec857 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,6 +22,7 @@ interfaces_files =3D \ org.libvirt.Connect.xml \ org.libvirt.Domain.xml \ org.libvirt.Network.xml \ + org.libvirt.NWFilter.xml \ org.libvirt.Secret.xml \ org.libvirt.StoragePool.xml interfacesdir =3D $(DBUS_INTERFACES_DIR) diff --git a/data/org.libvirt.NWFilter.xml b/data/org.libvirt.NWFilter.xml new file mode 100644 index 0000000..c025d30 --- /dev/null +++ b/data/org.libvirt.NWFilter.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/Makefile.am b/src/Makefile.am index 6b2887b..22128c2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ DAEMON_SOURCES =3D \ events.c events.h \ gdbus.c gdbus.h \ network.c network.h \ + nwfilter.c nwfilter.h \ secret.c secret.h \ storagepool.c storagepool.h =20 diff --git a/src/connect.c b/src/connect.c index 0b33bc5..136f7ae 100644 --- a/src/connect.c +++ b/src/connect.c @@ -2,6 +2,7 @@ #include "domain.h" #include "events.h" #include "network.h" +#include "nwfilter.h" #include "secret.h" #include "storagepool.h" #include "util.h" @@ -1394,6 +1395,7 @@ virtDBusConnectFree(virtDBusConnect *connect) =20 g_free(connect->domainPath); g_free(connect->networkPath); + g_free(connect->nwfilterPath); g_free(connect->secretPath); g_free(connect->storagePoolPath); g_free(connect); @@ -1451,6 +1453,10 @@ virtDBusConnectNew(virtDBusConnect **connectp, if (error && *error) return; =20 + virtDBusNWFilterRegister(connect, error); + if (error && *error) + return; + virtDBusSecretRegister(connect, error); if (error && *error) return; diff --git a/src/connect.h b/src/connect.h index 08e1b68..fe672ed 100644 --- a/src/connect.h +++ b/src/connect.h @@ -14,6 +14,7 @@ struct virtDBusConnect { const gchar *connectPath; gchar *domainPath; gchar *networkPath; + gchar *nwfilterPath; gchar *secretPath; gchar *storagePoolPath; virConnectPtr connection; diff --git a/src/nwfilter.c b/src/nwfilter.c new file mode 100644 index 0000000..4d20162 --- /dev/null +++ b/src/nwfilter.c @@ -0,0 +1,65 @@ +#include "nwfilter.h" +#include "util.h" + +#include + +static virtDBusGDBusPropertyTable virtDBusNWFilterPropertyTable[] =3D { + { 0 } +}; + +static virtDBusGDBusMethodTable virtDBusNWFilterMethodTable[] =3D { + { 0 } +}; + +static gchar ** +virtDBusNWFilterEnumerate(gpointer userData) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilterPtr) nwfilters =3D NULL; + gint num =3D 0; + gchar **ret =3D NULL; + + if (!virtDBusConnectOpen(connect, NULL)) + return NULL; + + num =3D virConnectListAllNWFilters(connect->connection, &nwfilters, 0); + if (num < 0) + return NULL; + + if (num =3D=3D 0) + return NULL; + + ret =3D g_new0(gchar *, num + 1); + + for (gint i =3D 0; i < num; i++) { + ret[i] =3D virtDBusUtilBusPathForVirNWFilter(nwfilters[i], + connect->nwfilterPath); + } + + return ret; +} + +static GDBusInterfaceInfo *interfaceInfo; + +void +virtDBusNWFilterRegister(virtDBusConnect *connect, + GError **error) +{ + connect->nwfilterPath =3D g_strdup_printf("%s/nwfilter", + connect->connectPath); + + if (!interfaceInfo) { + interfaceInfo =3D virtDBusGDBusLoadIntrospectData(VIRT_DBUS_NWFILT= ER_INTERFACE, + error); + if (!interfaceInfo) + return; + } + + virtDBusGDBusRegisterSubtree(connect->bus, + connect->nwfilterPath, + interfaceInfo, + virtDBusNWFilterEnumerate, + virtDBusNWFilterMethodTable, + virtDBusNWFilterPropertyTable, + connect); +} diff --git a/src/nwfilter.h b/src/nwfilter.h new file mode 100644 index 0000000..7afd27f --- /dev/null +++ b/src/nwfilter.h @@ -0,0 +1,9 @@ +#pragma once + +#include "connect.h" + +#define VIRT_DBUS_NWFILTER_INTERFACE "org.libvirt.NWFilter" + +void +virtDBusNWFilterRegister(virtDBusConnect *connect, + GError **error); diff --git a/src/util.c b/src/util.c index 9dd901c..f6aa210 100644 --- a/src/util.c +++ b/src/util.c @@ -247,6 +247,38 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks) g_free(networks); } =20 +virNWFilterPtr +virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *nwfilterPath) +{ + g_autofree gchar *name =3D NULL; + gsize prefixLen =3D strlen(nwfilterPath) + 1; + + name =3D virtDBusUtilDecodeUUID(path+prefixLen); + + return virNWFilterLookupByUUIDString(connection, name); +} + +gchar * +virtDBusUtilBusPathForVirNWFilter(virNWFilterPtr nwfilter, + const gchar *nwfilterPath) +{ + gchar uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + g_autofree gchar *newUuid =3D NULL; + virNWFilterGetUUIDString(nwfilter, uuid); + newUuid =3D virtDBusUtilEncodeUUID(uuid); + return g_strdup_printf("%s/%s", nwfilterPath, newUuid); +} + +void +virtDBusUtilVirNWFilterListFree(virNWFilterPtr *nwfilters) +{ + for (gint i =3D 0; nwfilters[i] !=3D NULL; i++) + virNWFilterFree(nwfilters[i]); + + g_free(nwfilters); +} void virtDBusUtilStringListFree(virtDBusCharArray *item) { diff --git a/src/util.h b/src/util.h index 2f37933..09546e3 100644 --- a/src/util.h +++ b/src/util.h @@ -72,6 +72,21 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetwork, virNetworkFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPtr, virtDBusUtilVirNetworkListFre= e); =20 +virNWFilterPtr +virtDBusUtilVirNWFilterFromBusPath(virConnectPtr connection, + const gchar *path, + const gchar *nwfilterPath); + +gchar * +virtDBusUtilBusPathForVirNWFilter(virNWFilterPtr nwfilter, + const gchar *nwfilterPath); + +void +virtDBusUtilVirNWFilterListFree(virNWFilterPtr *nwfilters); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilter, virNWFilterFree); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilterPtr, virtDBusUtilVirNWFilterListF= ree); + typedef gchar *virtDBusCharArray; =20 void --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039888758464.68736372303624; Fri, 11 May 2018 04:58:08 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 23C823003563; Fri, 11 May 2018 11:58:07 +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 DC18917ACE; Fri, 11 May 2018 11:58:06 +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 9E0404BB79; Fri, 11 May 2018 11:58:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvuhQ025402 for ; Fri, 11 May 2018 07:57:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id E98992026DFD; Fri, 11 May 2018 11:57:55 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 724352026E04 for ; Fri, 11 May 2018 11:57:55 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:45 +0200 Message-Id: <20180511115751.9406-3-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/8] Implement ListNWFilters method for Connect Interface 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 11 May 2018 11:58:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 243ef35..a78a87d 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -153,6 +153,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 136f7ae..ff1120e 100644 --- a/src/connect.c +++ b/src/connect.c @@ -770,6 +770,43 @@ virtDBusConnectListNetworks(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&gnetworks, 1); } =20 +static void +virtDBusConnectListNWFilters(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilterPtr) nwfilters =3D NULL; + guint flags; + GVariantBuilder builder; + GVariant *gnwfilters; + + g_variant_get(inArgs, "(u)", &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + if (virConnectListAllNWFilters(connect->connection, &nwfilters, flags)= < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("ao")); + + for (gint i =3D 0; nwfilters[i]; i++) { + g_autofree gchar *path =3D NULL; + path =3D virtDBusUtilBusPathForVirNWFilter(nwfilters[i], + connect->nwfilterPath); + + g_variant_builder_add(&builder, "o", path); + } + + gnwfilters =3D g_variant_builder_end(&builder); + *outArgs =3D g_variant_new_tuple(&gnwfilters, 1); +} + static void virtDBusConnectListSecrets(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1364,6 +1401,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethod= Table[] =3D { { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, + { "ListNWFilters", virtDBusConnectListNWFilters }, { "ListSecrets", virtDBusConnectListSecrets }, { "ListStoragePools", virtDBusConnectListStoragePools }, { "NetworkCreateXML", virtDBusConnectNetworkCreateXML }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152603989244875.26390301912238; Fri, 11 May 2018 04:58:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14E6A8762C; Fri, 11 May 2018 11:58:11 +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 D630530B7EA3; Fri, 11 May 2018 11:58:10 +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 86D874A467; Fri, 11 May 2018 11:58:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvwvu025417 for ; Fri, 11 May 2018 07:57:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0CE892026985; Fri, 11 May 2018 11:57:58 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A47082026E04 for ; Fri, 11 May 2018 11:57:56 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:46 +0200 Message-Id: <20180511115751.9406-4-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 3/8] Implement NWFilterDefineXML method for Connect Interface 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 11 May 2018 11:58:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index a78a87d..c228c6d 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -195,6 +195,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index ff1120e..8981f36 100644 --- a/src/connect.c +++ b/src/connect.c @@ -994,6 +994,34 @@ virtDBusConnectNetworkLookupByUUID(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusConnectNWFilterDefineXML(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + g_autofree gchar *path =3D NULL; + const gchar *xml; + + g_variant_get(inArgs, "(&s)", &xml); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nwfilter =3D virNWFilterDefineXML(connect->connection, xml); + if (!nwfilter) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirNWFilter(nwfilter, connect->nwfilter= Path); + + *outArgs =3D g_variant_new("(o)", path); +} + static void virtDBusConnectNodeGetCPUMap(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1408,6 +1436,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethod= Table[] =3D { { "NetworkDefineXML", virtDBusConnectNetworkDefineXML }, { "NetworkLookupByName", virtDBusConnectNetworkLookupByName }, { "NetworkLookupByUUID", virtDBusConnectNetworkLookupByUUID }, + { "NWFilterDefineXML", virtDBusConnectNWFilterDefineXML }, { "NodeGetCPUMap", virtDBusConnectNodeGetCPUMap }, { "NodeGetCPUStats", virtDBusConnectNodeGetCPUStats }, { "NodeGetFreeMemory", virtDBusConnectNodeGetFreeMemory }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039884357271.5054264220248; Fri, 11 May 2018 04:58:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C668800B0; Fri, 11 May 2018 11:58:02 +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 45D6E5FCA5; Fri, 11 May 2018 11:58:02 +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 E29974CA95; Fri, 11 May 2018 11:58:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvwsn025424 for ; Fri, 11 May 2018 07:57:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id A14732026DFD; Fri, 11 May 2018 11:57:58 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46BC52026E04 for ; Fri, 11 May 2018 11:57:58 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:47 +0200 Message-Id: <20180511115751.9406-5-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 4/8] Implement Name property for NWFilter Interface 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 May 2018 11:58:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.NWFilter.xml | 5 +++++ src/nwfilter.c | 43 +++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 48 insertions(+) diff --git a/data/org.libvirt.NWFilter.xml b/data/org.libvirt.NWFilter.xml index c025d30..9a1b44f 100644 --- a/data/org.libvirt.NWFilter.xml +++ b/data/org.libvirt.NWFilter.xml @@ -3,5 +3,10 @@ =20 + + + + diff --git a/src/nwfilter.c b/src/nwfilter.c index 4d20162..c72317e 100644 --- a/src/nwfilter.c +++ b/src/nwfilter.c @@ -3,7 +3,50 @@ =20 #include =20 +static virNWFilterPtr +virtDBusNWFilterGetVirNWFilter(virtDBusConnect *connect, + const gchar *objectPath, + GError **error) +{ + virNWFilterPtr nwfilter; + + if (virtDBusConnectOpen(connect, error) < 0) + return NULL; + + nwfilter =3D virtDBusUtilVirNWFilterFromBusPath(connect->connection, + objectPath, + connect->nwfilterPath); + if (!nwfilter) { + virtDBusUtilSetLastVirtError(error); + return NULL; + } + + return nwfilter; +} + +static void +virtDBusNWFilterGetName(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + const gchar *name; + + nwfilter =3D virtDBusNWFilterGetVirNWFilter(connect, objectPath, error= ); + if (!nwfilter) + return; + + name =3D virNWFilterGetName(nwfilter); + if (!name) + return virtDBusUtilSetLastVirtError(error); + + *value =3D g_variant_new("s", name); +} + static virtDBusGDBusPropertyTable virtDBusNWFilterPropertyTable[] =3D { + { "Name", virtDBusNWFilterGetName, NULL }, { 0 } }; =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15260398859211005.9019664289928; Fri, 11 May 2018 04:58:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5E4828049E; Fri, 11 May 2018 11:58:04 +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 2546E30B7EA3; Fri, 11 May 2018 11:58:04 +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 D26951801246; Fri, 11 May 2018 11:58:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvx86025429 for ; Fri, 11 May 2018 07:57:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 438E42026DFD; Fri, 11 May 2018 11:57:59 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD09E2026E04 for ; Fri, 11 May 2018 11:57:58 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:48 +0200 Message-Id: <20180511115751.9406-6-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 5/8] Implement UUID property for NWFilter Interface 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 May 2018 11:58:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.NWFilter.xml | 5 +++++ src/nwfilter.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/data/org.libvirt.NWFilter.xml b/data/org.libvirt.NWFilter.xml index 9a1b44f..fae61dc 100644 --- a/data/org.libvirt.NWFilter.xml +++ b/data/org.libvirt.NWFilter.xml @@ -8,5 +8,10 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-nwfilter.htm= l#virNWFilterGetName"/> + + + + diff --git a/src/nwfilter.c b/src/nwfilter.c index c72317e..90183a7 100644 --- a/src/nwfilter.c +++ b/src/nwfilter.c @@ -45,8 +45,29 @@ virtDBusNWFilterGetName(const gchar *objectPath, *value =3D g_variant_new("s", name); } =20 +static void +virtDBusNWFilterGetUUID(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + gchar uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + + nwfilter =3D virtDBusNWFilterGetVirNWFilter(connect, objectPath, error= ); + if (!nwfilter) + return; + + if (virNWFilterGetUUIDString(nwfilter, uuid) < 0) + return virtDBusUtilSetLastVirtError(error); + + *value =3D g_variant_new("s", uuid); +} + static virtDBusGDBusPropertyTable virtDBusNWFilterPropertyTable[] =3D { { "Name", virtDBusNWFilterGetName, NULL }, + { "UUID", virtDBusNWFilterGetUUID, NULL }, { 0 } }; =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039889300112.59349211900326; Fri, 11 May 2018 04:58:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79BBA3003569; Fri, 11 May 2018 11:58:07 +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 3DD7965E81; Fri, 11 May 2018 11:58:07 +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 E73724CAA8; Fri, 11 May 2018 11:58:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBvxxD025437 for ; Fri, 11 May 2018 07:58:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id D959B2026DFD; Fri, 11 May 2018 11:57:59 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F3E62026E04 for ; Fri, 11 May 2018 11:57:59 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:49 +0200 Message-Id: <20180511115751.9406-7-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 6/8] Implement GetXMLDesc method for NWFilter Interface 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 11 May 2018 11:58:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.NWFilter.xml | 6 ++++++ src/nwfilter.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/data/org.libvirt.NWFilter.xml b/data/org.libvirt.NWFilter.xml index fae61dc..69e3357 100644 --- a/data/org.libvirt.NWFilter.xml +++ b/data/org.libvirt.NWFilter.xml @@ -13,5 +13,11 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-nwfilter.htm= l#virNWFilterGetUUIDString"/> + + + + + diff --git a/src/nwfilter.c b/src/nwfilter.c index 90183a7..acfbdd5 100644 --- a/src/nwfilter.c +++ b/src/nwfilter.c @@ -65,6 +65,33 @@ virtDBusNWFilterGetUUID(const gchar *objectPath, *value =3D g_variant_new("s", uuid); } =20 +static void +virtDBusNWFilterGetXMLDesc(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + g_autofree gchar *xml =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); + + nwfilter =3D virtDBusNWFilterGetVirNWFilter(connect, objectPath, error= ); + if (!nwfilter) + return; + + xml =3D virNWFilterGetXMLDesc(nwfilter, flags); + if (!xml) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", xml); +} + static virtDBusGDBusPropertyTable virtDBusNWFilterPropertyTable[] =3D { { "Name", virtDBusNWFilterGetName, NULL }, { "UUID", virtDBusNWFilterGetUUID, NULL }, @@ -72,6 +99,7 @@ static virtDBusGDBusPropertyTable virtDBusNWFilterPropert= yTable[] =3D { }; =20 static virtDBusGDBusMethodTable virtDBusNWFilterMethodTable[] =3D { + { "GetXMLDesc", virtDBusNWFilterGetXMLDesc }, { 0 } }; =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039889721219.9179932649314; Fri, 11 May 2018 04:58:09 -0700 (PDT) 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 23E9B25784; Fri, 11 May 2018 11:58:08 +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 E0E3C6091D; Fri, 11 May 2018 11:58:07 +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 92DFC180B5B4; Fri, 11 May 2018 11:58:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBw0UL025447 for ; Fri, 11 May 2018 07:58:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7C23A2026DFD; Fri, 11 May 2018 11:58:00 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 210ED2026E04 for ; Fri, 11 May 2018 11:58:00 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:50 +0200 Message-Id: <20180511115751.9406-8-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 7/8] Implement NWFilterLookupByName method for Connect Interface 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.39]); Fri, 11 May 2018 11:58:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index c228c6d..6847aaf 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -201,6 +201,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 8981f36..d0fb791 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1022,6 +1022,34 @@ virtDBusConnectNWFilterDefineXML(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusConnectNWFilterLookupByName(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + g_autofree gchar *path =3D NULL; + const gchar *name; + + g_variant_get(inArgs, "(s)", &name); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nwfilter =3D virNWFilterLookupByName(connect->connection, name); + if (!nwfilter) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirNWFilter(nwfilter, connect->nwfilter= Path); + + *outArgs =3D g_variant_new("(o)", path); +} + static void virtDBusConnectNodeGetCPUMap(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1437,6 +1465,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethod= Table[] =3D { { "NetworkLookupByName", virtDBusConnectNetworkLookupByName }, { "NetworkLookupByUUID", virtDBusConnectNetworkLookupByUUID }, { "NWFilterDefineXML", virtDBusConnectNWFilterDefineXML }, + { "NWFilterLookupByName", virtDBusConnectNWFilterLookupByName }, { "NodeGetCPUMap", virtDBusConnectNodeGetCPUMap }, { "NodeGetCPUStats", virtDBusConnectNodeGetCPUStats }, { "NodeGetFreeMemory", virtDBusConnectNodeGetFreeMemory }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 07:41:37 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526039894449314.159932216131; Fri, 11 May 2018 04:58:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D3963187B89; Fri, 11 May 2018 11:58:12 +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 0C70D20D8800; Fri, 11 May 2018 11:58:12 +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 C0EE241F4E; Fri, 11 May 2018 11:58:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BBw1Mw025456 for ; Fri, 11 May 2018 07:58:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D1B22026DFD; Fri, 11 May 2018 11:58:01 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id B722D2026E04 for ; Fri, 11 May 2018 11:58:00 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 13:57:51 +0200 Message-Id: <20180511115751.9406-9-kkoukiou@redhat.com> In-Reply-To: <20180511115751.9406-1-kkoukiou@redhat.com> References: <20180511115751.9406-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 8/8] Implement NWFilterLookupByUUID method for Connect Interface 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 11 May 2018 11:58:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 6847aaf..9f42d8c 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -207,6 +207,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index d0fb791..861b0ed 100644 --- a/src/connect.c +++ b/src/connect.c @@ -1050,6 +1050,34 @@ virtDBusConnectNWFilterLookupByName(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusConnectNWFilterLookupByUUID(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virNWFilter) nwfilter =3D NULL; + g_autofree gchar *path =3D NULL; + const gchar *uuidstr; + + g_variant_get(inArgs, "(&s)", &uuidstr); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nwfilter =3D virNWFilterLookupByUUIDString(connect->connection, uuidst= r); + if (!nwfilter) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirNWFilter(nwfilter, connect->nwfilter= Path); + + *outArgs =3D g_variant_new("(o)", path); +} + static void virtDBusConnectNodeGetCPUMap(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -1466,6 +1494,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethod= Table[] =3D { { "NetworkLookupByUUID", virtDBusConnectNetworkLookupByUUID }, { "NWFilterDefineXML", virtDBusConnectNWFilterDefineXML }, { "NWFilterLookupByName", virtDBusConnectNWFilterLookupByName }, + { "NWFilterLookupByUUID", virtDBusConnectNWFilterLookupByUUID }, { "NodeGetCPUMap", virtDBusConnectNodeGetCPUMap }, { "NodeGetCPUStats", virtDBusConnectNodeGetCPUStats }, { "NodeGetFreeMemory", virtDBusConnectNodeGetFreeMemory }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list