qemu: monitor: Remove unused qemuMonitorDrivePivot

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 8d71f90a1b3f666e913e90c5f15048064c600990..39351a123446595de87f2dc1d2a90390a265eb13 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2879,19 +2879,6 @@ qemuMonitorBlockCommit(qemuMonitor *mon,
 }
 
 
-/* Use the block-job-complete monitor command to pivot a block copy job.  */
-int
-qemuMonitorDrivePivot(qemuMonitor *mon,
-                      const char *jobname)
-{
-    VIR_DEBUG("jobname=%s", jobname);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONDrivePivot(mon, jobname);
-}
-
-
 int
 qemuMonitorArbitraryCommand(qemuMonitor *mon,
                             const char *cmd,

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 502a02d1748f1aca3978a412de7bff26f9884d61..c5cfd8e5b982d7b5576304ec2fcab783ab32e76c 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -986,9 +986,6 @@ int qemuMonitorBlockdevMirror(qemuMonitor *mon,
                               bool shallow,
                               bool syncWrite)
     ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);
-int qemuMonitorDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-    ATTRIBUTE_NONNULL(2);
 
 int qemuMonitorBlockCommit(qemuMonitor *mon,
                            const char *device,

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index a39c707b5591cba4fab0411e2ef3551c8c2ab436..86390309ae45b7ae60652f9fea34d2179dd79336 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4504,29 +4504,6 @@ qemuMonitorJSONBlockJobSetSpeed(qemuMonitor *mon,
 }
 
 
-int
-qemuMonitorJSONDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("block-job-complete",
-                                     "s:device", jobname,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONBlockJobError(cmd, reply, jobname) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 int
 qemuMonitorJSONJobDismiss(qemuMonitor *mon,
                           const char *jobname)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 25de6d80108ff12187d4300e91d4c03df23c23c7..4a8f05368579ee65f1cefdc91bb5cef464359dc5 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -318,11 +318,6 @@ qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,
                               bool syncWrite)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);
 
-int
-qemuMonitorJSONDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 int
 qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            const char *device,

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 06a13864545b4ede7c045ee9cd1584b8c599d254..e642e17841c4ae5e27e7bc87eba5253da2cb3995 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1216,7 +1216,6 @@ GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
-GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
 GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false)
 GEN_TEST_FUNC(qemuMonitorJSONNBDServerAdd, "vda", "export", true, "bitmap")
@@ -2917,7 +2916,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONBlockdevMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockStream);
     DO_TEST_GEN(qemuMonitorJSONBlockCommit);
-    DO_TEST_GEN(qemuMonitorJSONDrivePivot);
     DO_TEST_GEN(qemuMonitorJSONScreendump);
     DO_TEST_GEN(qemuMonitorJSONOpenGraphics);
     DO_TEST_GEN_DEPRECATED(qemuMonitorJSONNBDServerAdd, true);