[PATCH 5/8] qemu: monitor: Drop JSON versions of savevm/delvm/loadv

[Peter Krempa <pkrempa@xxxxxxxxxx>]

qemu did not QAPIfy these and the design and name will most probably
change. The replacements will not be compatible. Drop the JSON stubs and
annotate that there won't be a replacement.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/qemu/qemu_monitor.c      | 18 ++++++------------
 src/qemu/qemu_monitor_json.c | 21 ---------------------
 src/qemu/qemu_monitor_json.h |  4 ----
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 9d665928d6..e07d578fa8 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3213,10 +3213,8 @@ qemuMonitorCreateSnapshot(qemuMonitorPtr mon, const char *name)

     QEMU_CHECK_MONITOR(mon);

-    if (mon->json)
-        return qemuMonitorJSONCreateSnapshot(mon, name);
-    else
-        return qemuMonitorTextCreateSnapshot(mon, name);
+    /* there won't ever be a direct QMP replacement for this function */
+    return qemuMonitorTextCreateSnapshot(mon, name);
 }

 int
@@ -3226,10 +3224,8 @@ qemuMonitorLoadSnapshot(qemuMonitorPtr mon, const char *name)

     QEMU_CHECK_MONITOR(mon);

-    if (mon->json)
-        return qemuMonitorJSONLoadSnapshot(mon, name);
-    else
-        return qemuMonitorTextLoadSnapshot(mon, name);
+    /* there won't ever be a direct QMP replacement for this function */
+    return qemuMonitorTextLoadSnapshot(mon, name);
 }


@@ -3240,10 +3236,8 @@ qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const char *name)

     QEMU_CHECK_MONITOR(mon);

-    if (mon->json)
-        return qemuMonitorJSONDeleteSnapshot(mon, name);
-    else
-        return qemuMonitorTextDeleteSnapshot(mon, name);
+    /* there won't ever be a direct QMP replacement for this function */
+    return qemuMonitorTextDeleteSnapshot(mon, name);
 }


diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7ddecbc907..42afa6201f 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4062,27 +4062,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon,
     return ret;
 }

-int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name)
-{
-    /* XXX Update to use QMP, if QMP ever adds support for savevm */
-    VIR_DEBUG("savevm command not found, trying HMP");
-    return qemuMonitorTextCreateSnapshot(mon, name);
-}
-
-int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name)
-{
-    /* XXX Update to use QMP, if QMP ever adds support for loadvm */
-    VIR_DEBUG("loadvm command not found, trying HMP");
-    return qemuMonitorTextLoadSnapshot(mon, name);
-}
-
-int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name)
-{
-    /* XXX Update to use QMP, if QMP ever adds support for delvm */
-    VIR_DEBUG("delvm command not found, trying HMP");
-    return qemuMonitorTextDeleteSnapshot(mon, name);
-}
-
 int
 qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions,
                             const char *device, const char *file,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 8461932cac..8a9c214c82 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -241,10 +241,6 @@ int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon,
                                       const char *alias,
                                       const char *passphrase);

-int qemuMonitorJSONCreateSnapshot(qemuMonitorPtr mon, const char *name);
-int qemuMonitorJSONLoadSnapshot(qemuMonitorPtr mon, const char *name);
-int qemuMonitorJSONDeleteSnapshot(qemuMonitorPtr mon, const char *name);
-
 int qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon,
                                 virJSONValuePtr actions,
                                 const char *device,
-- 
2.16.2

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list