[libvirt] [dbus PATCH] Revert "Implement MigrateGetMaxDowntime method for Domain Interface"

Katerina Koukiou kkoukiou at redhat.com
Fri Apr 27 11:48:13 UTC 2018


This reverts commit d4a4fd4e9e0ab50f473c24192abc34644cd8213e.

This API was introduced in libvirt 3.7.0 and no APIs from
version > 3.0.0 should be included until next release.
---
 data/org.libvirt.Domain.xml |  6 ------
 src/domain.c                | 31 -------------------------------
 2 files changed, 37 deletions(-)

diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 1cd79f8..6f919da 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -332,12 +332,6 @@
       <arg name="flags" type="u" direction="in"/>
       <arg name="cacheSize" type="t" direction="out"/>
     </method>
-    <method name="MigrateGetMaxDowntime">
-      <annotation name="org.gtk.GDBus.DocString"
-        value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetMaxDowntime"/>
-      <arg name="flags" type="u" direction="in"/>
-      <arg name="downtime" type="t" direction="out"/>
-    </method>
     <method name="MigrateGetMaxSpeed">
       <annotation name="org.gtk.GDBus.DocString"
         value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMigrateGetMaxSpeed"/>
diff --git a/src/domain.c b/src/domain.c
index ec5b99c..06cad6f 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -1793,36 +1793,6 @@ virtDBusDomainMigrateGetCompressionCache(GVariant *inArgs,
     *outArgs = g_variant_new("(t)", cacheSize);
 }
 
-static void
-virtDBusDomainMigrateGetMaxDowntime(GVariant *inArgs,
-                                    GUnixFDList *inFDs G_GNUC_UNUSED,
-                                    const gchar *objectPath,
-                                    gpointer userData,
-                                    GVariant **outArgs,
-                                    GUnixFDList **outFDs G_GNUC_UNUSED,
-                                    GError **error)
-{
-    virtDBusConnect *connect = userData;
-    g_autoptr(virDomain) domain = NULL;
-    gulong downtime;
-    guint flags;
-    gint ret;
-
-    g_variant_get(inArgs, "(u)", &flags);
-
-    domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
-    if (!domain)
-        return;
-
-    ret = virDomainMigrateGetMaxDowntime(domain,
-                                         (unsigned long long *)&downtime,
-                                         flags);
-    if (ret < 0)
-        return virtDBusUtilSetLastVirtError(error);
-
-    *outArgs = g_variant_new("(t)", downtime);
-}
-
 static void
 virtDBusDomainMigrateGetMaxSpeed(GVariant *inArgs,
                                  GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -2669,7 +2639,6 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
     { "MemoryPeek", virtDBusDomainMemoryPeek },
     { "MemoryStats", virtDBusDomainMemoryStats },
     { "MigrateGetCompressionCache", virtDBusDomainMigrateGetCompressionCache },
-    { "MigrateGetMaxDowntime", virtDBusDomainMigrateGetMaxDowntime },
     { "MigrateGetMaxSpeed", virtDBusDomainMigrateGetMaxSpeed },
     { "MigrateSetCompressionCache", virtDBusDomainMigrateSetCompressionCache },
     { "MigrateSetMaxDowntime", virtDBusDomainMigrateSetMaxDowntime },
-- 
2.15.0




More information about the libvir-list mailing list