[libvirt] [PATCH v2 28/73] qemu: Drop unused qemuMonitorSetMigrationCapability

Jiri Denemark jdenemar at redhat.com
Wed Apr 11 14:41:18 UTC 2018


Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_monitor.c      | 14 ----------
 src/qemu/qemu_monitor.h      |  3 --
 src/qemu/qemu_monitor_json.c | 53 ------------------------------------
 src/qemu/qemu_monitor_json.h |  3 --
 4 files changed, 73 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 7ea72af788..09f21ba77d 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3977,20 +3977,6 @@ qemuMonitorGetMigrationCapabilities(qemuMonitorPtr mon,
 }
 
 
-int
-qemuMonitorSetMigrationCapability(qemuMonitorPtr mon,
-                                  qemuMonitorMigrationCaps capability,
-                                  bool state)
-{
-    VIR_DEBUG("capability=%s, state=%d",
-              qemuMonitorMigrationCapsTypeToString(capability), state);
-
-    QEMU_CHECK_MONITOR_JSON(mon);
-
-    return qemuMonitorJSONSetMigrationCapability(mon, capability, state);
-}
-
-
 int
 qemuMonitorSetMigrationCapabilities(qemuMonitorPtr mon,
                                     virBitmapPtr caps,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 870aae5cbd..c95b3a2ef4 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -760,9 +760,6 @@ VIR_ENUM_DECL(qemuMonitorMigrationCaps);
 
 int qemuMonitorGetMigrationCapabilities(qemuMonitorPtr mon,
                                         char ***capabilities);
-int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon,
-                                      qemuMonitorMigrationCaps capability,
-                                      bool state);
 int qemuMonitorSetMigrationCapabilities(qemuMonitorPtr mon,
                                         virBitmapPtr caps,
                                         virBitmapPtr states);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7ab73657a0..c6cb71addf 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6198,59 +6198,6 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon,
 }
 
 
-int
-qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
-                                      qemuMonitorMigrationCaps capability,
-                                      bool state)
-{
-    int ret = -1;
-
-    virJSONValuePtr cmd = NULL;
-    virJSONValuePtr reply = NULL;
-    virJSONValuePtr cap = NULL;
-    virJSONValuePtr caps;
-
-    if (!(caps = virJSONValueNewArray()))
-        goto cleanup;
-
-    if (!(cap = virJSONValueNewObject()))
-        goto cleanup;
-
-    if (virJSONValueObjectAppendString(
-                cap, "capability",
-                qemuMonitorMigrationCapsTypeToString(capability)) < 0)
-        goto cleanup;
-
-    if (virJSONValueObjectAppendBoolean(cap, "state", state) < 0)
-        goto cleanup;
-
-    if (virJSONValueArrayAppend(caps, cap) < 0)
-        goto cleanup;
-
-    cap = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("migrate-set-capabilities",
-                                     "a:capabilities", &caps,
-                                     NULL);
-    if (!cmd)
-        goto cleanup;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        goto cleanup;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        goto cleanup;
-
-    ret = 0;
- cleanup:
-    virJSONValueFree(caps);
-    virJSONValueFree(cap);
-    virJSONValueFree(cmd);
-    virJSONValueFree(reply);
-    return ret;
-}
-
-
 int
 qemuMonitorJSONSetMigrationCapabilities(qemuMonitorPtr mon,
                                         virBitmapPtr caps,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 76e6738f44..a73e98815c 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -145,9 +145,6 @@ int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon,
 
 int qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon,
                                             char ***capabilities);
-int qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
-                                          qemuMonitorMigrationCaps capability,
-                                          bool state);
 int qemuMonitorJSONSetMigrationCapabilities(qemuMonitorPtr mon,
                                             virBitmapPtr caps,
                                             virBitmapPtr states);
-- 
2.17.0




More information about the libvir-list mailing list