From nobody Mon Dec 15 03:08:22 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 1523293569878346.80649772856805; Mon, 9 Apr 2018 10:06:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5DA7581E04; Mon, 9 Apr 2018 17:06:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FB5D60606; Mon, 9 Apr 2018 17:06:08 +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 CF2FD180BAD9; Mon, 9 Apr 2018 17:06:07 +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 w39H5rJR018593 for ; Mon, 9 Apr 2018 13:05:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5715AD7E06; Mon, 9 Apr 2018 17:05:53 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id F23747C51 for ; Mon, 9 Apr 2018 17:05:52 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Mon, 9 Apr 2018 19:05:41 +0200 Message-Id: <20180409170543.7840-10-kkoukiou@redhat.com> In-Reply-To: <20180409170543.7840-1-kkoukiou@redhat.com> References: <20180409170543.7840-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 v2 09/11] APIs should appear in alphabetical order: Move Undefine method 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]); Mon, 09 Apr 2018 17:06:08 +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 | 8 ++++---- src/domain.c | 40 ++++++++++++++++++++-------------------- test/test_domain.py | 26 +++++++++++++------------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 673260c..1be94ec 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -83,15 +83,15 @@ + + + - - - diff --git a/src/domain.c b/src/domain.c index a16e49f..4deef26 100644 --- a/src/domain.c +++ b/src/domain.c @@ -448,45 +448,45 @@ virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED, } =20 static void -virtDBusDomainUndefine(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainSuspend(GVariant *inArgs G_GNUC_UNUSED, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { 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 (virDomainUndefineFlags(domain, flags) < 0) + if (virDomainSuspend(domain) < 0) virtDBusUtilSetLastVirtError(error); } =20 static void -virtDBusDomainSuspend(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainUndefine(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { 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 (virDomainSuspend(domain) < 0) + if (virDomainUndefineFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } =20 @@ -512,8 +512,8 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTab= le[] =3D { { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, { "Resume", virtDBusDomainResume }, - { "Undefine", virtDBusDomainUndefine }, { "Suspend", virtDBusDomainSuspend }, + { "Undefine", virtDBusDomainUndefine }, { 0 } }; =20 diff --git a/test/test_domain.py b/test/test_domain.py index ceda19e..952bf59 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -68,19 +68,6 @@ class TestDomain(libvirttest.BaseTestClass): =20 self.main_loop() =20 - def test_undefine(self): - def domain_undefined(path, _event): - assert isinstance(path, dbus.ObjectPath) - self.loop.quit() - - self.connect.connect_to_signal('DomainEvent', domain_undefined, ar= g1=3D'Undefined') - - _, domain =3D self.domain() - domain.Shutdown(0) - domain.Undefine(0) - - self.main_loop() - def test_suspend(self): def domain_suspended(path, _event): assert isinstance(path, dbus.ObjectPath) @@ -96,5 +83,18 @@ class TestDomain(libvirttest.BaseTestClass): =20 self.main_loop() =20 + def test_undefine(self): + def domain_undefined(path, _event): + assert isinstance(path, dbus.ObjectPath) + self.loop.quit() + + self.connect.connect_to_signal('DomainEvent', domain_undefined, ar= g1=3D'Undefined') + + _, domain =3D self.domain() + domain.Shutdown(0) + domain.Undefine(0) + + self.main_loop() + if __name__ =3D=3D '__main__': libvirttest.run() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list