[libvirt] [dbus PATCH 10/10] Destroy API method: Renamed to DestroyFlags
Same for internal virtDBusDomainDestroy:
Renamed to virtDBusDomainDestroyFlags
Following naming from libvirt API.
Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com>
---
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 @@
<method name="ShutdownFlags">
<arg name="flags" type="u" direction="in"/>
</method>
- <method name="Destroy">
+ <method name="DestroyFlags">
<arg name="flags" type="u" direction="in"/>
</method>
<method name="Reboot">
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_UNUSED,
}
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 = userData;
g_autoptr(virDomain) domain = NULL;
@@ -466,7 +466,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
{ "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
--
2.15.0