9:37 a.m.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 27 -----------------
src/qemu/qemu_monitor.h | 9 ------
src/qemu/qemu_monitor_json.c | 57 ------------------------------------
src/qemu/qemu_monitor_json.h | 10 -------
tests/qemumonitorjsontest.c | 4 ---
5 files changed, 107 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f1a9524f28..456c54aed3 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2155,33 +2155,6 @@ qemuMonitorSetBalloon(qemuMonitor *mon,
}
-int
-qemuMonitorEjectMedia(qemuMonitor *mon,
- const char *dev_name,
- bool force)
-{
- VIR_DEBUG("dev_name=%s force=%d", dev_name, force);
-
- QEMU_CHECK_MONITOR(mon);
-
- return qemuMonitorJSONEjectMedia(mon, dev_name, force);
-}
-
-
-int
-qemuMonitorChangeMedia(qemuMonitor *mon,
- const char *dev_name,
- const char *newmedia,
- const char *format)
-{
- VIR_DEBUG("dev_name=%s newmedia=%s format=%s", dev_name, newmedia,
format);
-
- QEMU_CHECK_MONITOR(mon);
-
- return qemuMonitorJSONChangeMedia(mon, dev_name, newmedia, format);
-}
-
-
int
qemuMonitorSaveVirtualMemory(qemuMonitor *mon,
unsigned long long offset,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 6e657576ae..163e12c0f6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -733,15 +733,6 @@ int qemuMonitorExpirePassword(qemuMonitor *mon,
int qemuMonitorSetBalloon(qemuMonitor *mon,
unsigned long long newmem);
-int qemuMonitorEjectMedia(qemuMonitor *mon,
- const char *dev_name,
- bool force);
-int qemuMonitorChangeMedia(qemuMonitor *mon,
- const char *dev_name,
- const char *newmedia,
- const char *format);
-
-
int qemuMonitorSaveVirtualMemory(qemuMonitor *mon,
unsigned long long offset,
unsigned long long length,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b4a33184bd..9c54d7cfa4 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2812,63 +2812,6 @@ qemuMonitorJSONSetBalloon(qemuMonitor *mon,
}
-/**
- * Run QMP command to eject a media from ejectable device.
- *
- * Returns:
- * -1 on error
- * 0 on success
- */
-int qemuMonitorJSONEjectMedia(qemuMonitor *mon,
- const char *dev_name,
- bool force)
-{
- g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("eject",
- "s:device",
dev_name,
- "b:force", force,
- NULL);
- g_autoptr(virJSONValue) reply = NULL;
-
- if (!cmd)
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- return -1;
-
- if (qemuMonitorJSONCheckError(cmd, reply) < 0)
- return -1;
-
- return 0;
-}
-
-
-int qemuMonitorJSONChangeMedia(qemuMonitor *mon,
- const char *dev_name,
- const char *newmedia,
- const char *format)
-{
- g_autoptr(virJSONValue) cmd = NULL;
- g_autoptr(virJSONValue) reply = NULL;
-
- cmd = qemuMonitorJSONMakeCommand("change",
- "s:device", dev_name,
- "s:target", newmedia,
- "S:arg", format,
- NULL);
-
- if (!cmd)
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- return -1;
-
- if (qemuMonitorJSONCheckError(cmd, reply) < 0)
- return -1;
-
- return 0;
-}
-
-
static int qemuMonitorJSONSaveMemory(qemuMonitor *mon,
const char *cmdtype,
unsigned long long offset,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9314baa5ba..44458f703d 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -128,16 +128,6 @@ int
qemuMonitorJSONSetBalloon(qemuMonitor *mon,
unsigned long long newmem);
-int
-qemuMonitorJSONEjectMedia(qemuMonitor *mon,
- const char *dev_name,
- bool force);
-int
-qemuMonitorJSONChangeMedia(qemuMonitor *mon,
- const char *dev_name,
- const char *newmedia,
- const char *format);
-
int
qemuMonitorJSONSaveVirtualMemory(qemuMonitor *mon,
unsigned long long offset,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index ced288cf5a..1368871cc8 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1199,8 +1199,6 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockResize, "vda",
"asdf", 123456)
GEN_TEST_FUNC(qemuMonitorJSONSetPassword, "spice", "secret_password",
"disconnect")
GEN_TEST_FUNC(qemuMonitorJSONExpirePassword, "spice", "123456")
GEN_TEST_FUNC(qemuMonitorJSONSetBalloon, 1024)
-GEN_TEST_FUNC(qemuMonitorJSONEjectMedia, "hdc", true)
-GEN_TEST_FUNC(qemuMonitorJSONChangeMedia, "hdc", "/foo/bar",
"formatstr")
GEN_TEST_FUNC(qemuMonitorJSONSaveVirtualMemory, 0, 1024, "/foo/bar")
GEN_TEST_FUNC(qemuMonitorJSONSavePhysicalMemory, 0, 1024, "/foo/bar")
GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND |
@@ -2988,8 +2986,6 @@ mymain(void)
DO_TEST_GEN(qemuMonitorJSONSetPassword);
DO_TEST_GEN(qemuMonitorJSONExpirePassword);
DO_TEST_GEN(qemuMonitorJSONSetBalloon);
- DO_TEST_GEN(qemuMonitorJSONEjectMedia);
- DO_TEST_GEN_DEPRECATED(qemuMonitorJSONChangeMedia, true);
DO_TEST_GEN(qemuMonitorJSONSaveVirtualMemory);
DO_TEST_GEN(qemuMonitorJSONSavePhysicalMemory);
DO_TEST_GEN(qemuMonitorJSONMigrate);
--
2.36.1