From nobody Wed May 14 16:27:52 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 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