Signed-off-by: Peter Krempa
---
src/qemu/qemu_monitor.c | 13 -
src/qemu/qemu_monitor.h | 3 ---
src/qemu/qemu_monitor_json.c | 23 ---
src/qemu/qemu_monitor_json.h | 5 -
tests/qemumonitorjsontest.c | 2 --
5 files changed, 46 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f7dade5d79..5e71945831 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2929,19 +2929,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 7374192da2..24a33b9b29 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -990,9 +990,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 7b6be69aa7..85a36ff68b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4532,29 +4532,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 9a0bed0355..c5716dfe3e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -319,11 +319,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 f1c403d5b3..ced288cf5a 100644
--- 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")
@@ -3003,7 +3002,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);
--
2.36.1
