From nobody Sun Apr 28 23:43:20 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 1524146300242379.59125663051066; Thu, 19 Apr 2018 06:58:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3336285542; Thu, 19 Apr 2018 13:58:18 +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 ED94D832A3; Thu, 19 Apr 2018 13:58:17 +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 71D40180596F; Thu, 19 Apr 2018 13:58:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwCm8000660 for ; Thu, 19 Apr 2018 09:58:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id B19766F9E8; Thu, 19 Apr 2018 13:58:12 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55CAD42226 for ; Thu, 19 Apr 2018 13:58:12 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:00 +0200 Message-Id: <20180419135807.28636-2-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/8] Implement BaselineCPU 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 19 Apr 2018 13:58:18 +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 Reviewed-by: Pavel Hrdina --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index d84fc29..92f74c5 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -25,6 +25,13 @@ + + + + + + diff --git a/src/connect.c b/src/connect.c index 3a563bb..bd959c7 100644 --- a/src/connect.c +++ b/src/connect.c @@ -206,6 +206,43 @@ virtDBusConnectGetCapabilities(GVariant *inArgs G_GNUC= _UNUSED, *outArgs =3D g_variant_new("(s)", capabilities); } =20 +static void +virtDBusConnectBaselineCPU(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_autofree const gchar **xmlCPUs =3D NULL; + g_autoptr(GVariantIter) iter =3D NULL; + const gchar **tmp; + gsize ncpus; + g_autofree gchar *cpu =3D NULL; + guint flags; + + g_variant_get(inArgs, "(asu)", &iter, &flags); + + ncpus =3D g_variant_iter_n_children(iter); + if (ncpus > 0) { + xmlCPUs =3D g_new0(const gchar*, ncpus); + tmp =3D xmlCPUs; + while (g_variant_iter_next(iter, "&s", tmp)) + tmp++; + } + + if (!virtDBusConnectOpen(connect, error)) + return; + + cpu =3D virConnectBaselineCPU(connect->connection, xmlCPUs, ncpus, fla= gs); + if (!cpu) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", cpu); +} + static void virtDBusConnectDomainCreateXML(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -623,6 +660,7 @@ static virtDBusGDBusPropertyTable virtDBusConnectProper= tyTable[] =3D { }; =20 static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] =3D { + { "BaselineCPU", virtDBusConnectBaselineCPU }, { "DomainCreateXML", virtDBusConnectDomainCreateXML }, { "DomainDefineXML", virtDBusConnectDomainDefineXML }, { "DomainLookupByID", virtDBusConnectDomainLookupByID }, --=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 23:43:20 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 1524146302836280.32359407188574; Thu, 19 Apr 2018 06:58:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E516A5F7B2; Thu, 19 Apr 2018 13:58:20 +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 A87FF7E576; Thu, 19 Apr 2018 13:58:20 +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 660E84CA9D; Thu, 19 Apr 2018 13:58:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwD2k000668 for ; Thu, 19 Apr 2018 09:58:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 554236F9E6; Thu, 19 Apr 2018 13:58:13 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED52A42226 for ; Thu, 19 Apr 2018 13:58:12 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:01 +0200 Message-Id: <20180419135807.28636-3-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/8] Implement CompareCPU 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 19 Apr 2018 13:58:21 +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.Connect.xml | 7 +++++++ src/connect.c | 43 ++++++++++++++++++++++++++++++++++++++++= +++ 2 files changed, 50 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 92f74c5..0fc34e3 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -32,6 +32,13 @@ + + + + + + diff --git a/src/connect.c b/src/connect.c index bd959c7..86fea4f 100644 --- a/src/connect.c +++ b/src/connect.c @@ -6,6 +6,13 @@ =20 #include =20 +VIRT_DBUS_ENUM_DECL(virtDBusConnectCPUCompareResult) +VIRT_DBUS_ENUM_IMPL(virtDBusConnectCPUCompareResult, + VIR_CPU_COMPARE_LAST, + "incompatible", + "identical", + "superset") + static gint virtDBusConnectCredType[] =3D { VIR_CRED_AUTHNAME, VIR_CRED_ECHOPROMPT, @@ -243,6 +250,41 @@ virtDBusConnectBaselineCPU(GVariant *inArgs, *outArgs =3D g_variant_new("(s)", cpu); } =20 +static void +virtDBusConnectCompareCPU(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; + const gchar *xmlDesc; + guint flags; + gint compareResult; + g_autofree const gchar* compareResultStr =3D NULL; + + g_variant_get(inArgs, "(&su)", &xmlDesc, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + compareResult =3D virConnectCompareCPU(connect->connection, xmlDesc, f= lags); + if (compareResult < 0) + return virtDBusUtilSetLastVirtError(error); + + compareResultStr =3D virtDBusConnectCPUCompareResultTypeToString(compa= reResult); + if (!compareResultStr) { + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Can't format virCPUCompareResult '%d' to string.", + compareResult); + return; + } + + *outArgs =3D g_variant_new("(s)", compareResultStr); +} + static void virtDBusConnectDomainCreateXML(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -661,6 +703,7 @@ static virtDBusGDBusPropertyTable virtDBusConnectProper= tyTable[] =3D { =20 static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] =3D { { "BaselineCPU", virtDBusConnectBaselineCPU }, + { "CompareCPU", virtDBusConnectCompareCPU }, { "DomainCreateXML", virtDBusConnectDomainCreateXML }, { "DomainDefineXML", virtDBusConnectDomainDefineXML }, { "DomainLookupByID", virtDBusConnectDomainLookupByID }, --=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 23:43:20 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 1524146306275372.3284940593488; Thu, 19 Apr 2018 06:58:26 -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 CC3AF31327C8; Thu, 19 Apr 2018 13:58:24 +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 AD5CD89FB7; Thu, 19 Apr 2018 13:58:23 +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 31BC74CAA0; Thu, 19 Apr 2018 13:58:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwEWh000677 for ; Thu, 19 Apr 2018 09:58:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC61C6F9E6; Thu, 19 Apr 2018 13:58:13 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90ECD6F9E8 for ; Thu, 19 Apr 2018 13:58:13 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:02 +0200 Message-Id: <20180419135807.28636-4-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 3/8] Implement FindStoragePoolSources for Domain 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.47]); Thu, 19 Apr 2018 13:58:25 +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 Reviewed-by: Pavel Hrdina --- data/org.libvirt.Connect.xml | 9 +++++++++ src/connect.c | 30 ++++++++++++++++++++++++++++++ tests/test_connect.py | 5 +++++ 3 files changed, 44 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 0fc34e3..e5504f7 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -85,6 +85,15 @@ + + + + + + + diff --git a/src/connect.c b/src/connect.c index 86fea4f..4e64238 100644 --- a/src/connect.c +++ b/src/connect.c @@ -474,6 +474,35 @@ virtDBusConnectDomainSaveImageDefineXML(GVariant *inAr= gs, virtDBusUtilSetLastVirtError(error); } =20 +static void +virtDBusConnectFindStoragePoolSources(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSE= D, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + const gchar *type; + const gchar *srcSpec; + guint flags; + g_autofree gchar *ret =3D NULL; + + g_variant_get(inArgs, "(&s&su)", &type, &srcSpec, &flags); + if (g_str_equal(srcSpec, "")) + srcSpec =3D NULL; + + if (!virtDBusConnectOpen(connect, error)) + return; + + ret =3D virConnectFindStoragePoolSources(connect->connection, type, sr= cSpec, flags); + if (!ret) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", ret); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -711,6 +740,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID }, { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML = }, + { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, diff --git a/tests/test_connect.py b/tests/test_connect.py index a7b7ad6..d7ec704 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -68,6 +68,11 @@ class TestConnect(libvirttest.BaseTestClass): path =3D getattr(self.connect, lookup_method_name)(props[lookup_it= em]) assert original_path =3D=3D path =20 + def test_connect_find_storage_pool_sources(self): + storageType =3D "logical" + sources =3D self.connect.FindStoragePoolSources(storageType, "", 0) + assert isinstance(sources, dbus.String) + def test_connect_list_domains(self): domains =3D self.connect.ListDomains(0) assert isinstance(domains, dbus.Array) --=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 23:43:20 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 1524146310661894.346176997642; Thu, 19 Apr 2018 06:58:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0EBB7B122; Thu, 19 Apr 2018 13:58:28 +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 A4CF67E641; Thu, 19 Apr 2018 13:58: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 55755180BADA; Thu, 19 Apr 2018 13:58:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwESs000682 for ; Thu, 19 Apr 2018 09:58:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90D3B42226; Thu, 19 Apr 2018 13:58:14 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33D4484423 for ; Thu, 19 Apr 2018 13:58:14 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:03 +0200 Message-Id: <20180419135807.28636-5-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 4/8] Move definition for g_autoptr virDomainStatsRecordPtr to util.h 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 19 Apr 2018 13:58:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We be reused in connect.c Signed-off-by: Katerina Koukiou Reviewed-by: J=EF=BF=BDn Tomko Reviewed-by: Pavel Hrdina --- src/domain.c | 2 -- src/util.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/domain.c b/src/domain.c index 6c44377..010758b 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1017,8 +1017,6 @@ virtDBusDomainGetSchedulerParameters(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&grecords, 1); } =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecor= dListFree); - static void virtDBusDomainGetStats(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, diff --git a/src/util.h b/src/util.h index 7bb4ad6..5141172 100644 --- a/src/util.h +++ b/src/util.h @@ -38,6 +38,8 @@ virtDBusUtilVirDomainListFree(virDomainPtr *domains); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomain, virDomainFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainPtr, virtDBusUtilVirDomainListFree); =20 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecor= dListFree); + gint virtDBusUtilEnumFromString(const gchar *const *types, guint ntypes, --=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 23:43:20 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 1524146315414296.22059555629073; Thu, 19 Apr 2018 06:58:35 -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 06EC230001EA; Thu, 19 Apr 2018 13:58:34 +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 CFE1189E74; Thu, 19 Apr 2018 13:58:33 +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 8CD324CAA0; Thu, 19 Apr 2018 13:58:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwFFP000689 for ; Thu, 19 Apr 2018 09:58:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 322506F9E6; Thu, 19 Apr 2018 13:58:15 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA7936F9E8 for ; Thu, 19 Apr 2018 13:58:14 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:04 +0200 Message-Id: <20180419135807.28636-6-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 5/8] Implement GetAllDomainStats 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.43]); Thu, 19 Apr 2018 13:58:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index e5504f7..3ef965d 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -94,6 +94,13 @@ + + + + + + diff --git a/src/connect.c b/src/connect.c index 4e64238..e774fa4 100644 --- a/src/connect.c +++ b/src/connect.c @@ -503,6 +503,45 @@ virtDBusConnectFindStoragePoolSources(GVariant *inArgs, *outArgs =3D g_variant_new("(s)", ret); } =20 +static void +virtDBusConnectGetAllDomainStats(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(virDomainStatsRecordPtr) records =3D NULL; + guint stats; + gint nstats; + guint flags; + GVariant *grecords; + GVariant *gret; + GVariantBuilder builder; + + g_variant_get(inArgs, "(uu)", &stats, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nstats =3D virConnectGetAllDomainStats(connect->connection, + stats, &records, flags); + if (nstats < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("av")); + for (gint i =3D 0; i < nstats; i++) { + grecords =3D virtDBusUtilTypedParamsToGVariant(records[i]->params, + records[i]->nparams); + g_variant_builder_add(&builder, "v", grecords); + } + gret =3D g_variant_builder_end(&builder); + + *outArgs =3D g_variant_new_tuple(&gret, 1); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -741,6 +780,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML = }, { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, + { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, --=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 23:43:20 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 1524146305489313.2213775169686; Thu, 19 Apr 2018 06:58:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 093965D687; Thu, 19 Apr 2018 13:58:24 +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 CD61F84AFF; Thu, 19 Apr 2018 13:58:23 +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 72160180BAD6; Thu, 19 Apr 2018 13:58:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwFGl000696 for ; Thu, 19 Apr 2018 09:58:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id C9C766F9E6; Thu, 19 Apr 2018 13:58:15 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6DA4742226 for ; Thu, 19 Apr 2018 13:58:15 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:05 +0200 Message-Id: <20180419135807.28636-7-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 6/8] Introduce virtDBusUtilStringListFree 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 19 Apr 2018 13:58:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virtDBusUtilStringListFree is an autoptr cleanup function for gchar ** type. Signed-off-by: Katerina Koukiou --- src/util.c | 9 +++++++++ src/util.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/src/util.c b/src/util.c index b21f2c5..75f77e3 100644 --- a/src/util.c +++ b/src/util.c @@ -184,3 +184,12 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks) =20 g_free(networks); } + +void +virtDBusUtilStringListFree(GCharArray *item) +{ + for (gint i =3D 0; item[i] !=3D NULL; i +=3D 1) + g_free(item[i]); + + g_free(item); +} diff --git a/src/util.h b/src/util.h index 5141172..7ae4705 100644 --- a/src/util.h +++ b/src/util.h @@ -82,3 +82,10 @@ virtDBusUtilVirNetworkListFree(virNetworkPtr *networks); =20 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetwork, virNetworkFree); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPtr, virtDBusUtilVirNetworkListFre= e); + +typedef gchar *GCharArray; + +void +virtDBusUtilStringListFree(GCharArray *item); + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GCharArray, virtDBusUtilStringListFree); --=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 23:43:20 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 1524146310740748.1277849988386; Thu, 19 Apr 2018 06:58:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6070F23E6CE; Thu, 19 Apr 2018 13:58:29 +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 2840C85F8B; Thu, 19 Apr 2018 13:58: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 87180180BADB; Thu, 19 Apr 2018 13:58:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwG9j000704 for ; Thu, 19 Apr 2018 09:58:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D2B642226; Thu, 19 Apr 2018 13:58:16 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 110BE6F9E8 for ; Thu, 19 Apr 2018 13:58:15 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:06 +0200 Message-Id: <20180419135807.28636-8-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 7/8] Implement GetCPUModelNames 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 19 Apr 2018 13:58: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: J=EF=BF=BDn Tomko --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 35 +++++++++++++++++++++++++++++++++++ tests/test_connect.py | 4 ++++ 3 files changed, 46 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 3ef965d..43a6241 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -106,6 +106,13 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-host.html#vi= rConnectGetCapabilities"/> + + + + + + diff --git a/src/connect.c b/src/connect.c index e774fa4..169a070 100644 --- a/src/connect.c +++ b/src/connect.c @@ -542,6 +542,40 @@ virtDBusConnectGetAllDomainStats(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&gret, 1); } =20 +static void +virtDBusConnectGetCPUModelNames(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; + const gchar *arch; + guint flags; + g_autoptr(GCharArray) models =3D NULL; + gint nmodels; + GVariant *gret; + GVariantBuilder builder; + + g_variant_get(inArgs, "(&su)", &arch, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nmodels =3D virConnectGetCPUModelNames(connect->connection, arch, &mod= els, flags); + if (nmodels < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("as")); + for (gint i =3D 0; i < nmodels; i++) + g_variant_builder_add(&builder, "s", models[i]); + gret =3D g_variant_builder_end(&builder); + + *outArgs =3D g_variant_new_tuple(&gret, 1); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -782,6 +816,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, + { "GetCPUModelNames", virtDBusConnectGetCPUModelNames }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, diff --git a/tests/test_connect.py b/tests/test_connect.py index d7ec704..57f0658 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -116,6 +116,10 @@ class TestConnect(libvirttest.BaseTestClass): def test_connect_get_capabilities(self): assert isinstance(self.connect.GetCapabilities(), dbus.String) =20 + def test_connect_get_cpu_model_names(self): + arch =3D "x86_64" + assert isinstance(self.connect.GetCPUModelNames(arch, 0), dbus.Arr= ay) + def test_connect_network_create_xml(self): def network_started(path, _event): assert isinstance(path, dbus.ObjectPath) --=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 23:43:20 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 1524146307260188.28134351940366; Thu, 19 Apr 2018 06:58:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F04443133E81; Thu, 19 Apr 2018 13:58:25 +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 BBAA884AC9; Thu, 19 Apr 2018 13:58:25 +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 772184CAA0; Thu, 19 Apr 2018 13:58:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3JDwHbd000709 for ; Thu, 19 Apr 2018 09:58:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1031442226; Thu, 19 Apr 2018 13:58:17 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A882A84423 for ; Thu, 19 Apr 2018 13:58:16 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 15:58:07 +0200 Message-Id: <20180419135807.28636-9-kkoukiou@redhat.com> In-Reply-To: <20180419135807.28636-1-kkoukiou@redhat.com> References: <20180419135807.28636-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 8/8] Implement GetDomainCapabilties 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 19 Apr 2018 13:58:26 +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 | 10 ++++++++++ src/connect.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 43a6241..6f90822 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -113,6 +113,16 @@ + + + + + + + + + diff --git a/src/connect.c b/src/connect.c index 169a070..1ce6b86 100644 --- a/src/connect.c +++ b/src/connect.c @@ -576,6 +576,39 @@ virtDBusConnectGetCPUModelNames(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&gret, 1); } =20 +static void +virtDBusConnectGetDomainCapabilities(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; + const gchar *emulatorbin; + const gchar *arch; + const gchar *machine; + const gchar *virttype; + guint flags; + g_autofree gchar* domCapabilities =3D NULL; + + g_variant_get(inArgs, "(&s&s&s&su)", &emulatorbin, &arch, &machine, + &virttype, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + domCapabilities =3D virConnectGetDomainCapabilities(connect->connectio= n, + emulatorbin, arch, + machine, virttype, + flags); + if (!domCapabilities) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(s)", domCapabilities); +} + static void virtDBusConnectGetSysinfo(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -817,6 +850,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetCPUModelNames", virtDBusConnectGetCPUModelNames }, + { "GetDomainCapabilities", virtDBusConnectGetDomainCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list