From nobody Thu Jul 3 23:35:28 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; 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 152908226992212.07802067566422; Fri, 15 Jun 2018 10:04:29 -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 4687261D05; Fri, 15 Jun 2018 17:04:28 +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 13792125339; Fri, 15 Jun 2018 17:04:28 +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 481324CA85; Fri, 15 Jun 2018 17:04:27 +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 w5FH3wHR029852 for ; Fri, 15 Jun 2018 13:03:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF8452026990; Fri, 15 Jun 2018 17:03:58 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 539652026DEF for ; Fri, 15 Jun 2018 17:03:58 +0000 (UTC) From: Katerina Koukiou To: libvirt-list@redhat.com Date: Fri, 15 Jun 2018 19:03:46 +0200 Message-Id: <20180615170350.20851-11-kkoukiou@redhat.com> In-Reply-To: <20180615170350.20851-1-kkoukiou@redhat.com> References: <20180615170350.20851-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 10/14] Implement ListCaps method for NodeDevicesInterface 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.39]); Fri, 15 Jun 2018 17:04:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- data/org.libvirt.NodeDevice.xml | 5 +++++ src/nodedev.c | 37 +++++++++++++++++++++++++++++++++++++ tests/test_nodedev.py | 6 ++++++ 3 files changed, 48 insertions(+) diff --git a/data/org.libvirt.NodeDevice.xml b/data/org.libvirt.NodeDevice.= xml index 1185bca..bf85958 100644 --- a/data/org.libvirt.NodeDevice.xml +++ b/data/org.libvirt.NodeDevice.xml @@ -28,5 +28,10 @@ + + + + diff --git a/src/nodedev.c b/src/nodedev.c index e61242d..01fcd35 100644 --- a/src/nodedev.c +++ b/src/nodedev.c @@ -137,6 +137,42 @@ virtDBusNodeDeviceGetXMLDesc(GVariant *inArgs, *outArgs =3D g_variant_new("(s)", xml); } =20 +static void +virtDBusNodeDeviceListCaps(GVariant *inArgs G_GNUC_UNUSED, + 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(virNodeDevice) dev =3D NULL; + g_autoptr(virtDBusCharArray) caps =3D NULL; + gint ncaps; + GVariant *gret; + GVariantBuilder builder; + + dev =3D virtDBusNodeDeviceGetVirNodeDevice(connect, objectPath, error); + if (!dev) + return; + + if ((ncaps =3D virNodeDeviceNumOfCaps(dev)) < 0) + return virtDBusUtilSetLastVirtError(error); + + caps =3D g_new0(char *, ncaps + 1); + + if ((ncaps =3D virNodeDeviceListCaps(dev, caps, ncaps)) < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("as")); + for (gint i =3D 0; i < ncaps; i++) + g_variant_builder_add(&builder, "s", caps[i]); + gret =3D g_variant_builder_end(&builder); + + *outArgs =3D g_variant_new_tuple(&gret, 1); +} + static virtDBusGDBusPropertyTable virtDBusNodeDevicePropertyTable[] =3D { { "Name", virtDBusNodeDeviceGetName, NULL }, { "Parent", virtDBusNodeDeviceGetParent, NULL }, @@ -147,6 +183,7 @@ static virtDBusGDBusMethodTable virtDBusNodeDeviceMetho= dTable[] =3D { { "Destroy", virtDBusNodeDeviceDestroy }, { "Detach", virtDBusNodeDeviceDetach }, { "GetXMLDesc", virtDBusNodeDeviceGetXMLDesc }, + { "ListCaps", virtDBusNodeDeviceListCaps }, { 0 } }; =20 diff --git a/tests/test_nodedev.py b/tests/test_nodedev.py index 64c97b2..6aa6211 100755 --- a/tests/test_nodedev.py +++ b/tests/test_nodedev.py @@ -32,6 +32,12 @@ class TestNodeDevice(libvirttest.BaseTestClass): interface_obj =3D dbus.Interface(obj, 'org.libvirt.NodeDevice') assert isinstance(interface_obj.GetXMLDesc(0), dbus.String) =20 + def test_node_device_list_caps(self): + test_node_device_path =3D self.node_device_create() + obj =3D self.bus.get_object('org.libvirt', test_node_device_path) + interface_obj =3D dbus.Interface(obj, 'org.libvirt.NodeDevice') + assert isinstance(interface_obj.ListCaps(), dbus.Array) + def test_node_device_properties_type(self): """ Ensure correct return type for NodeDevice properties """ --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list