[libvirt] [dbus PATCH 04/10] Shutdown API method: Renamed to ShutdownFlags

Katerina Koukiou kkoukiou at redhat.com
Fri Mar 23 14:17:01 UTC 2018


Same for internal virtDBusDomainShutdown:
Renamed to virtDBusDomainShutdownFlags

Following naming from libvirt API.

Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
---
 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 @@
       <arg name="flags" type="u" direction="in"/>
       <arg name="records" type="a{sv}" direction="out"/>
     </method>
-    <method name="Shutdown">
+    <method name="ShutdownFlags">
       <arg name="flags" type="u" direction="in"/>
     </method>
     <method name="Destroy"/>
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,
 }
 
 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 = userData;
     g_autoptr(virDomain) domain = NULL;
@@ -456,7 +456,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
     { "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)
 
         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)
 
         obj, domain = self.domain()
-        domain.Shutdown(0)
+        domain.ShutdownFlags(0)
 
         state = obj.Get('org.libvirt.Domain', 'State', dbus_interface=dbus.PROPERTIES_IFACE)
         assert state == 'shutoff'
@@ -62,7 +62,7 @@ class TestDomain(libvirttest.BaseTestClass):
         self.connect.connect_to_signal('DomainUndefined', domain_undefined)
 
         _, domain = self.domain()
-        domain.Shutdown(0)
+        domain.ShutdownFlags(0)
         domain.Undefine()
 
         self.main_loop()
-- 
2.15.0




More information about the libvir-list mailing list