From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814645652888.8272199211756; Fri, 23 Mar 2018 07:17:25 -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 398284903B; Fri, 23 Mar 2018 14:17: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 1347317580; Fri, 23 Mar 2018 14:17:24 +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 D06774CAA3; Fri, 23 Mar 2018 14:17:23 +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 w2NEHBUw031746 for ; Fri, 23 Mar 2018 10:17:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id B0CA62023234; Fri, 23 Mar 2018 14:17:11 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 246C22023233 for ; Fri, 23 Mar 2018 14:17:10 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:16:58 +0100 Message-Id: <20180323141707.6107-2-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 01/10] virtDBusDomainGetVcpus: Should be implemented as method and not as property 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.38]); Fri, 23 Mar 2018 14:17:24 +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.Domain.xml | 5 ++++- src/domain.c | 51 ++++++++++++++++++++++++++---------------= ---- test/test_domain.py | 3 ++- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 48bf40f..1ecf826 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -6,12 +6,15 @@ - + + + + diff --git a/src/domain.c b/src/domain.c index e4404c1..09b3440 100644 --- a/src/domain.c +++ b/src/domain.c @@ -86,27 +86,6 @@ virtDBusDomainGetId(const gchar *objectPath, *value =3D g_variant_new("u", id); } =20 -static void -virtDBusDomainGetVcpus(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) -{ - virtDBusConnect *connect =3D userData; - g_autoptr(virDomain) domain =3D NULL; - gint vcpus; - - domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); - if (!domain) - return; - - vcpus =3D virDomainGetVcpusFlags(domain, VIR_DOMAIN_VCPU_CURRENT); - if (vcpus < 0) - return virtDBusUtilSetLastVirtError(error); - - *value =3D g_variant_new("u", vcpus); -} - static void virtDBusDomainGetOsType(const gchar *objectPath, gpointer userData, @@ -239,6 +218,34 @@ virtDBusDomainGetAutostart(const gchar *objectPath, *value =3D g_variant_new("b", !!autostart); } =20 +static void +virtDBusDomainGetVcpus(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(virDomain) domain =3D NULL; + gint vcpus; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + vcpus =3D virDomainGetVcpusFlags(domain, flags); + if (vcpus < 0) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("(u)", vcpus); +} + static void virtDBusDomainGetXMLDesc(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -435,7 +442,6 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropert= yTable[] =3D { { "Name", virtDBusDomainGetName, NULL }, { "UUID", virtDBusDomainGetUUID, NULL }, { "Id", virtDBusDomainGetId, NULL }, - { "Vcpus", virtDBusDomainGetVcpus, NULL }, { "OSType", virtDBusDomainGetOsType, NULL }, { "Active", virtDBusDomainGetActive, NULL }, { "Persistent", virtDBusDomainGetPersistent, NULL }, @@ -445,6 +451,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropert= yTable[] =3D { }; =20 static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] =3D { + { "GetVcpus", virtDBusDomainGetVcpus }, { "GetXMLDesc", virtDBusDomainGetXMLDesc }, { "GetStats", virtDBusDomainGetStats }, { "Shutdown", virtDBusDomainShutdown }, diff --git a/test/test_domain.py b/test/test_domain.py index 1bf9c1b..22039dc 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -17,7 +17,6 @@ class TestDomain(libvirttest.BaseTestClass): assert isinstance(props['Name'], dbus.String) assert isinstance(props['UUID'], dbus.String) assert isinstance(props['Id'], dbus.UInt32) - assert isinstance(props['Vcpus'], dbus.UInt32) assert isinstance(props['OSType'], dbus.String) assert isinstance(props['Active'], dbus.Boolean) assert isinstance(props['Persistent'], dbus.Boolean) @@ -29,6 +28,8 @@ class TestDomain(libvirttest.BaseTestClass): =20 xml =3D domain.GetXMLDesc(0) assert isinstance(xml, dbus.String) + vcpus =3D domain.GetVcpus(0) + assert isinstance(vcpus, dbus.UInt32) =20 domain.Reboot(0) domain.Shutdown() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814638775247.77241760199445; Fri, 23 Mar 2018 07:17:18 -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 45346C206AC2; Fri, 23 Mar 2018 14:17:17 +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 08F1D6090A; Fri, 23 Mar 2018 14:17: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 B59214CA9B; Fri, 23 Mar 2018 14:17:16 +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 w2NEHDrb031764 for ; Fri, 23 Mar 2018 10:17:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3AD942023234; Fri, 23 Mar 2018 14:17:13 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48A3E2023233 for ; Fri, 23 Mar 2018 14:17:11 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:16:59 +0100 Message-Id: <20180323141707.6107-3-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 02/10] GetVcpus API method: Renamed to GetVcpusFlags 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.31]); Fri, 23 Mar 2018 14:17:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same for internal virtDBusDomainGetVcpus: Renamed to virtDBusDomainGetVcpusFlags Following naming from libvirt API. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 17 ++++++++--------- test/test_domain.py | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 1ecf826..46cc8a7 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -11,7 +11,7 @@ - + diff --git a/src/domain.c b/src/domain.c index 09b3440..333b5e8 100644 --- a/src/domain.c +++ b/src/domain.c @@ -219,14 +219,13 @@ virtDBusDomainGetAutostart(const gchar *objectPath, } =20 static void -virtDBusDomainGetVcpus(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) - +virtDBusDomainGetVcpusFlags(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(virDomain) domain =3D NULL; @@ -451,7 +450,7 @@ static virtDBusGDBusPropertyTable virtDBusDomainPropert= yTable[] =3D { }; =20 static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] =3D { - { "GetVcpus", virtDBusDomainGetVcpus }, + { "GetVcpusFlags", virtDBusDomainGetVcpusFlags }, { "GetXMLDesc", virtDBusDomainGetXMLDesc }, { "GetStats", virtDBusDomainGetStats }, { "Shutdown", virtDBusDomainShutdown }, diff --git a/test/test_domain.py b/test/test_domain.py index 22039dc..c7f9ca2 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -28,7 +28,7 @@ class TestDomain(libvirttest.BaseTestClass): =20 xml =3D domain.GetXMLDesc(0) assert isinstance(xml, dbus.String) - vcpus =3D domain.GetVcpus(0) + vcpus =3D domain.GetVcpusFlags(0) assert isinstance(vcpus, dbus.UInt32) =20 domain.Reboot(0) --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814646184550.5974069063344; Fri, 23 Mar 2018 07:17:26 -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 85BF480503; Fri, 23 Mar 2018 14:17: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 43A4116923; Fri, 23 Mar 2018 14:17:24 +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 10A29181B9FF; Fri, 23 Mar 2018 14:17:24 +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 w2NEHFDU031777 for ; Fri, 23 Mar 2018 10:17:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id DF1222023234; Fri, 23 Mar 2018 14:17:14 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED1A92023233 for ; Fri, 23 Mar 2018 14:17:13 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:00 +0100 Message-Id: <20180323141707.6107-4-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 03/10] virtDBusDomainShutdown: Use virDomainShutdownFlags instead of virDomainShutdown 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.27]); Fri, 23 Mar 2018 14:17:25 +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.Domain.xml | 4 +++- src/domain.c | 5 ++++- test/test_domain.py | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 46cc8a7..28f5609 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -24,7 +24,9 @@ - + + + diff --git a/src/domain.c b/src/domain.c index 333b5e8..b6e72db 100644 --- a/src/domain.c +++ b/src/domain.c @@ -320,12 +320,15 @@ virtDBusDomainShutdown(GVariant *inArgs G_GNUC_UNUSED, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; =20 - if (virDomainShutdown(domain) < 0) + if (virDomainShutdownFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } =20 diff --git a/test/test_domain.py b/test/test_domain.py index c7f9ca2..0c5ee45 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -32,7 +32,7 @@ class TestDomain(libvirttest.BaseTestClass): assert isinstance(vcpus, dbus.UInt32) =20 domain.Reboot(0) - domain.Shutdown() + domain.Shutdown(0) domain.Create() domain.Destroy() domain.Undefine() @@ -46,7 +46,7 @@ class TestDomain(libvirttest.BaseTestClass): self.connect.connect_to_signal('DomainStopped', domain_stopped) =20 obj, domain =3D self.domain() - domain.Shutdown() + domain.Shutdown(0) =20 state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) assert state =3D=3D 'shutoff' @@ -62,7 +62,7 @@ class TestDomain(libvirttest.BaseTestClass): self.connect.connect_to_signal('DomainUndefined', domain_undefined) =20 _, domain =3D self.domain() - domain.Shutdown() + domain.Shutdown(0) domain.Undefine() =20 self.main_loop() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15218146498431019.3686815004555; Fri, 23 Mar 2018 07:17:29 -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 171F023E6E8; Fri, 23 Mar 2018 14:17: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 D31C717584; Fri, 23 Mar 2018 14:17:27 +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 9919F4CA9D; Fri, 23 Mar 2018 14:17: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 w2NEHGbK031789 for ; Fri, 23 Mar 2018 10:17:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 76ED22023234; Fri, 23 Mar 2018 14:17:16 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 830712023233 for ; Fri, 23 Mar 2018 14:17:15 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:01 +0100 Message-Id: <20180323141707.6107-5-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 04/10] Shutdown API method: Renamed to ShutdownFlags 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]); Fri, 23 Mar 2018 14:17:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same for internal virtDBusDomainShutdown: Renamed to virtDBusDomainShutdownFlags Following naming from libvirt API. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 16 ++++++++-------- test/test_domain.py | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 28f5609..94a0e40 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -24,7 +24,7 @@ - + diff --git a/src/domain.c b/src/domain.c index b6e72db..d6da98d 100644 --- a/src/domain.c +++ b/src/domain.c @@ -310,13 +310,13 @@ virtDBusDomainGetStats(GVariant *inArgs, } =20 static void -virtDBusDomainShutdown(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainShutdownFlags(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; @@ -456,7 +456,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTab= le[] =3D { { "GetVcpusFlags", virtDBusDomainGetVcpusFlags }, { "GetXMLDesc", virtDBusDomainGetXMLDesc }, { "GetStats", virtDBusDomainGetStats }, - { "Shutdown", virtDBusDomainShutdown }, + { "ShutdownFlags", virtDBusDomainShutdownFlags }, { "Destroy", virtDBusDomainDestroy }, { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, diff --git a/test/test_domain.py b/test/test_domain.py index 0c5ee45..c0ffc3f 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -32,7 +32,7 @@ class TestDomain(libvirttest.BaseTestClass): assert isinstance(vcpus, dbus.UInt32) =20 domain.Reboot(0) - domain.Shutdown(0) + domain.ShutdownFlags(0) domain.Create() domain.Destroy() domain.Undefine() @@ -46,7 +46,7 @@ class TestDomain(libvirttest.BaseTestClass): self.connect.connect_to_signal('DomainStopped', domain_stopped) =20 obj, domain =3D self.domain() - domain.Shutdown(0) + domain.ShutdownFlags(0) =20 state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) assert state =3D=3D 'shutoff' @@ -62,7 +62,7 @@ class TestDomain(libvirttest.BaseTestClass): self.connect.connect_to_signal('DomainUndefined', domain_undefined) =20 _, domain =3D self.domain() - domain.Shutdown(0) + domain.ShutdownFlags(0) domain.Undefine() =20 self.main_loop() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814652991909.3952280036511; Fri, 23 Mar 2018 07:17:32 -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 74D6F62E86; Fri, 23 Mar 2018 14:17:31 +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 49F1982601; Fri, 23 Mar 2018 14:17:31 +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 0D9D7181BA05; Fri, 23 Mar 2018 14:17:31 +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 w2NEHIoR031805 for ; Fri, 23 Mar 2018 10:17:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0B4242023234; Fri, 23 Mar 2018 14:17:18 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18C6C2023233 for ; Fri, 23 Mar 2018 14:17:16 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:02 +0100 Message-Id: <20180323141707.6107-6-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 05/10] virtDBusDomainCreate: Use virDomainCreateWithFlags instead of virDomainCreate 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]); Fri, 23 Mar 2018 14:17:32 +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.Domain.xml | 4 +++- src/domain.c | 5 ++++- test/test_domain.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 94a0e40..0f6743d 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -34,7 +34,9 @@ - + + + diff --git a/src/domain.c b/src/domain.c index d6da98d..fee7f47 100644 --- a/src/domain.c +++ b/src/domain.c @@ -411,12 +411,15 @@ virtDBusDomainCreate(GVariant *inArgs G_GNUC_UNUSED, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; =20 - if (virDomainCreate(domain) < 0) + if (virDomainCreateWithFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } =20 diff --git a/test/test_domain.py b/test/test_domain.py index c0ffc3f..ae722fd 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -33,7 +33,7 @@ class TestDomain(libvirttest.BaseTestClass): =20 domain.Reboot(0) domain.ShutdownFlags(0) - domain.Create() + domain.Create(0) domain.Destroy() domain.Undefine() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814649421727.7852287282025; Fri, 23 Mar 2018 07:17:29 -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 7E77AC0467DD; Fri, 23 Mar 2018 14:17:27 +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 592B1825F9; Fri, 23 Mar 2018 14:17:27 +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 217B24CAA6; Fri, 23 Mar 2018 14:17: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 w2NEHJ0C031813 for ; Fri, 23 Mar 2018 10:17:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98E5A2023234; Fri, 23 Mar 2018 14:17:19 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id D655C2023233 for ; Fri, 23 Mar 2018 14:17:18 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:03 +0100 Message-Id: <20180323141707.6107-7-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 06/10] Create API method: Renamed to CreateWithFlags 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.31]); Fri, 23 Mar 2018 14:17:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same for internal virtDBusDomainCreate: Renamed to virtDBusDomainCreatewithFlags Following naming from libvirt API. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 16 ++++++++-------- test/test_domain.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 0f6743d..3afee78 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -34,7 +34,7 @@ - + diff --git a/src/domain.c b/src/domain.c index fee7f47..6b1779a 100644 --- a/src/domain.c +++ b/src/domain.c @@ -401,13 +401,13 @@ virtDBusDomainReset(GVariant *inArgs, } =20 static void -virtDBusDomainCreate(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainCreateWithFlags(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; @@ -463,7 +463,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTab= le[] =3D { { "Destroy", virtDBusDomainDestroy }, { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, - { "Create", virtDBusDomainCreate }, + { "CreateWithFlags", virtDBusDomainCreateWithFlags }, { "Undefine", virtDBusDomainUndefine }, { NULL, NULL } }; diff --git a/test/test_domain.py b/test/test_domain.py index ae722fd..bf0f149 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -33,7 +33,7 @@ class TestDomain(libvirttest.BaseTestClass): =20 domain.Reboot(0) domain.ShutdownFlags(0) - domain.Create(0) + domain.CreateWithFlags(0) domain.Destroy() domain.Undefine() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814645344827.9049826296151; Fri, 23 Mar 2018 07:17:25 -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 AD37480C27; Fri, 23 Mar 2018 14:17:23 +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 853F41757B; Fri, 23 Mar 2018 14:17: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 496F74CA9F; Fri, 23 Mar 2018 14:17:23 +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 w2NEHLwW031827 for ; Fri, 23 Mar 2018 10:17:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 14DE02023234; Fri, 23 Mar 2018 14:17:21 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 535CB2023233 for ; Fri, 23 Mar 2018 14:17:20 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:04 +0100 Message-Id: <20180323141707.6107-8-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 07/10] virtDBusDomainUndefine: Use virDomainUndefineFlags instead of virDomainUndefine 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.26]); Fri, 23 Mar 2018 14:17:24 +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.Domain.xml | 4 +++- src/domain.c | 5 ++++- test/test_domain.py | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 3afee78..05d0c9c 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -37,7 +37,9 @@ - + + + diff --git a/src/domain.c b/src/domain.c index 6b1779a..635af6a 100644 --- a/src/domain.c +++ b/src/domain.c @@ -434,12 +434,15 @@ virtDBusDomainUndefine(GVariant *inArgs G_GNUC_UNUSED, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; =20 - if (virDomainUndefine(domain) < 0) + if (virDomainUndefineFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } =20 diff --git a/test/test_domain.py b/test/test_domain.py index bf0f149..cad1da5 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -35,7 +35,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.ShutdownFlags(0) domain.CreateWithFlags(0) domain.Destroy() - domain.Undefine() + domain.Undefine(0) =20 def test_shutdown(self): def domain_stopped(name, path): @@ -63,7 +63,7 @@ class TestDomain(libvirttest.BaseTestClass): =20 _, domain =3D self.domain() domain.ShutdownFlags(0) - domain.Undefine() + domain.Undefine(0) =20 self.main_loop() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814656814634.8999056323075; Fri, 23 Mar 2018 07:17:36 -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 77C3C7FEBF; Fri, 23 Mar 2018 14:17:35 +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 45CA4611A5; Fri, 23 Mar 2018 14:17:35 +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 0E1A4180BAD9; Fri, 23 Mar 2018 14:17:35 +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 w2NEHMGm031838 for ; Fri, 23 Mar 2018 10:17:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9C8A42023234; Fri, 23 Mar 2018 14:17:22 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3C8D2023233 for ; Fri, 23 Mar 2018 14:17:21 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:05 +0100 Message-Id: <20180323141707.6107-9-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 08/10] Undefine API method: Renamed to UndefineFlags 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.25]); Fri, 23 Mar 2018 14:17:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same for internal virtDBusDomainUndefine: Renamed to virtDBusDomainUndefineFlags Following naming from libvirt API Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 16 ++++++++-------- test/test_domain.py | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 05d0c9c..4b1a650 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -37,7 +37,7 @@ - + diff --git a/src/domain.c b/src/domain.c index 635af6a..cc4e692 100644 --- a/src/domain.c +++ b/src/domain.c @@ -424,13 +424,13 @@ virtDBusDomainCreateWithFlags(GVariant *inArgs G_GNUC= _UNUSED, } =20 static void -virtDBusDomainUndefine(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainUndefineFlags(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; @@ -467,7 +467,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTab= le[] =3D { { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, { "CreateWithFlags", virtDBusDomainCreateWithFlags }, - { "Undefine", virtDBusDomainUndefine }, + { "UndefineFlags", virtDBusDomainUndefineFlags }, { NULL, NULL } }; =20 diff --git a/test/test_domain.py b/test/test_domain.py index cad1da5..e3f32ca 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -35,7 +35,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.ShutdownFlags(0) domain.CreateWithFlags(0) domain.Destroy() - domain.Undefine(0) + domain.UndefineFlags(0) =20 def test_shutdown(self): def domain_stopped(name, path): @@ -63,7 +63,7 @@ class TestDomain(libvirttest.BaseTestClass): =20 _, domain =3D self.domain() domain.ShutdownFlags(0) - domain.Undefine(0) + domain.UndefineFlags(0) =20 self.main_loop() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814648825840.4490796271112; Fri, 23 Mar 2018 07:17:28 -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 7C95380C36; Fri, 23 Mar 2018 14:17:27 +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 5269917CC2; Fri, 23 Mar 2018 14:17:27 +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 18FF9180BAD3; Fri, 23 Mar 2018 14:17: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 w2NEHOYl031857 for ; Fri, 23 Mar 2018 10:17:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 19B1B2023234; Fri, 23 Mar 2018 14:17:24 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20DD62023233 for ; Fri, 23 Mar 2018 14:17:22 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:06 +0100 Message-Id: <20180323141707.6107-10-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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 09/10] virtDBusDomainDestroy: Use virDomainDestroyFlags instead of virDomainDestroy 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.26]); Fri, 23 Mar 2018 14:17:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We need to catch Exceptions when testing this API call, since virDomainDest= royFlags will be supported in test-driver in 4.2.0 libvirt release. Better version checks for unsupported API calls need to be done in all test= s, but it's not relevant to this commit. When virConnectGetVersion will be supported we can move to better implement= ation, and python logging should be used to provide proper warnings for skipped te= sts. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 4 +++- src/domain.c | 5 ++++- test/test_domain.py | 7 ++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 4b1a650..dcaca5e 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -27,7 +27,9 @@ - + + + diff --git a/src/domain.c b/src/domain.c index cc4e692..9e13862 100644 --- a/src/domain.c +++ b/src/domain.c @@ -343,12 +343,15 @@ virtDBusDomainDestroy(GVariant *inArgs G_GNUC_UNUSED, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; =20 - if (virDomainDestroy(domain) < 0) + if (virDomainDestroyFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } =20 diff --git a/test/test_domain.py b/test/test_domain.py index e3f32ca..409633a 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -3,6 +3,7 @@ import dbus import libvirttest =20 +DBUS_EXCEPTION_MISSING_FUNCTION =3D 'this function is not supported by the= connection driver' =20 class TestDomain(libvirttest.BaseTestClass): def domain(self): @@ -34,7 +35,11 @@ class TestDomain(libvirttest.BaseTestClass): domain.Reboot(0) domain.ShutdownFlags(0) domain.CreateWithFlags(0) - domain.Destroy() + try: + domain.Destroy(0) + except dbus.exceptions.DBusException as e: + if not any(DBUS_EXCEPTION_MISSING_FUNCTION in arg for arg in e= .args): + raise e domain.UndefineFlags(0) =20 def test_shutdown(self): --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 14:10:02 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521814652804680.8364091428957; Fri, 23 Mar 2018 07:17:32 -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 5A8C6C058EC8; Fri, 23 Mar 2018 14:17:31 +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 D86E982607; Fri, 23 Mar 2018 14:17:30 +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 873644CAAC; Fri, 23 Mar 2018 14:17:30 +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 w2NEHPP1031866 for ; Fri, 23 Mar 2018 10:17:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A7B02023234; Fri, 23 Mar 2018 14:17:25 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.40.205.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97FF62023233 for ; Fri, 23 Mar 2018 14:17:24 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 23 Mar 2018 15:17:07 +0100 Message-Id: <20180323141707.6107-11-kkoukiou@redhat.com> In-Reply-To: <20180323141707.6107-1-kkoukiou@redhat.com> References: <20180323141707.6107-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/10] Destroy API method: Renamed to DestroyFlags 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.32]); Fri, 23 Mar 2018 14:17:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Same for internal virtDBusDomainDestroy: Renamed to virtDBusDomainDestroyFlags Following naming from libvirt API. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 16 ++++++++-------- test/test_domain.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index dcaca5e..3278133 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -27,7 +27,7 @@ - + diff --git a/src/domain.c b/src/domain.c index 9e13862..aa2e081 100644 --- a/src/domain.c +++ b/src/domain.c @@ -333,13 +333,13 @@ virtDBusDomainShutdownFlags(GVariant *inArgs G_GNUC_U= NUSED, } =20 static void -virtDBusDomainDestroy(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainDestroyFlags(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; @@ -466,7 +466,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTab= le[] =3D { { "GetXMLDesc", virtDBusDomainGetXMLDesc }, { "GetStats", virtDBusDomainGetStats }, { "ShutdownFlags", virtDBusDomainShutdownFlags }, - { "Destroy", virtDBusDomainDestroy }, + { "DestroyFlags", virtDBusDomainDestroyFlags }, { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, { "CreateWithFlags", virtDBusDomainCreateWithFlags }, diff --git a/test/test_domain.py b/test/test_domain.py index 409633a..410f82f 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -36,7 +36,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.ShutdownFlags(0) domain.CreateWithFlags(0) try: - domain.Destroy(0) + domain.DestroyFlags(0) except dbus.exceptions.DBusException as e: if not any(DBUS_EXCEPTION_MISSING_FUNCTION in arg for arg in e= .args): raise e --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list