qemu: monitor: Remove unused qemuMonitorDriveMirror

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 31f7253c3ca0a97fb6b2fcd469d3c5da9850c0e5..c24a1d3a5a6d0264247d187ed575145000739826 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2821,27 +2821,6 @@ qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name)
 }
 
 
-/* Start a drive-mirror block job.  bandwidth is in bytes/sec.  */
-int
-qemuMonitorDriveMirror(qemuMonitor *mon,
-                       const char *device, const char *file,
-                       const char *format, unsigned long long bandwidth,
-                       unsigned int granularity, unsigned long long buf_size,
-                       bool shallow,
-                       bool reuse)
-{
-    VIR_DEBUG("device=%s, file=%s, format=%s, bandwidth=%lld, "
-              "granularity=%#x, buf_size=%lld, shallow=%d, reuse=%d",
-              device, file, NULLSTR(format), bandwidth, granularity,
-              buf_size, shallow, reuse);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONDriveMirror(mon, device, file, format, bandwidth,
-                                      granularity, buf_size, shallow, reuse);
-}
-
-
 int
 qemuMonitorBlockdevMirror(qemuMonitor *mon,
                           const char *jobname,

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index a756b286e966293f9039aa3ba035b4027cbb5da9..cc0a884470c469f51ff3f3b73ca2d2716acf4ef4 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -975,16 +975,6 @@ int qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name);
 
 int qemuMonitorTransaction(qemuMonitor *mon, virJSONValue **actions)
     ATTRIBUTE_NONNULL(2);
-int qemuMonitorDriveMirror(qemuMonitor *mon,
-                           const char *device,
-                           const char *file,
-                           const char *format,
-                           unsigned long long bandwidth,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 int qemuMonitorBlockdevMirror(qemuMonitor *mon,
                               const char *jobname,
                               bool persistjob,

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 06a10c4ad452b622e9e653fb2b3ade9a1d2ccd63..71fb1d20e8a8a684d1a32099385906c6f35c2dbe 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4068,47 +4068,6 @@ qemuMonitorJSONDelObject(qemuMonitor *mon,
 }
 
 
-/* speed is in bytes/sec */
-int
-qemuMonitorJSONDriveMirror(qemuMonitor *mon,
-                           const char *device, const char *file,
-                           const char *format, unsigned long long speed,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-    const char *syncmode = "full";
-    const char *mode = "absolute-paths";
-
-    if (shallow)
-        syncmode = "top";
-
-    if (reuse)
-        mode = "existing";
-
-    cmd = qemuMonitorJSONMakeCommand("drive-mirror",
-                                     "s:device", device,
-                                     "s:target", file,
-                                     "Y:speed", speed,
-                                     "z:granularity", granularity,
-                                     "P:buf-size", buf_size,
-                                     "s:sync", syncmode,
-                                     "s:mode", mode,
-                                     "S:format", format,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    return qemuMonitorJSONCheckError(cmd, reply);
-}
-
-
 int
 qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,
                               const char *jobname,

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index dee1b93f8bf2e518d2dfb19bb6e14f46401b84d5..e380b1b6b78236ffca1262aeb224791712fd418f 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -304,17 +304,6 @@ int
 qemuMonitorJSONTransaction(qemuMonitor *mon,
                            virJSONValue **actions)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-int
-qemuMonitorJSONDriveMirror(qemuMonitor *mon,
-                           const char *device,
-                           const char *file,
-                           const char *format,
-                           unsigned long long speed,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 int
 qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 0dfa7d29ccce436c2193fa89cb2bee1b1a24d057..816fb2cd71e2c03ed4dc4941d56a517b2ba8eb2a 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1213,7 +1213,6 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
               "localhost", 12345, 12346, "certsubjectval")
 GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
 GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
-GEN_TEST_FUNC(qemuMonitorJSONDriveMirror, "vdb", "/foo/bar", "formatstr", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", true, "/foo/bar1", "topnode", "/foo/bar2", "basenode", "backingfilename", 1024)
@@ -2915,7 +2914,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONGraphicsRelocate);
     DO_TEST_GEN(qemuMonitorJSONRemoveNetdev);
     DO_TEST_GEN(qemuMonitorJSONDelDevice);
-    DO_TEST_GEN(qemuMonitorJSONDriveMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockdevMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockStream);
     DO_TEST_GEN(qemuMonitorJSONBlockCommit);