From d2831cd521eb71d3dcae246f0aade85e1ea14d19 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 21 Jul 2022 13:10:56 +0200 Subject: [PATCH] qemu: monitor: Remove unused qemuMonitor(Eject|Change)Media MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- 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 a3f1d5f117..0ccaad472b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2105,33 +2105,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 881aa71c7f..2750395efe 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -729,15 +729,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 78dc6d9b66..d664e827dd 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2784,63 +2784,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 3070d29580..5154c195c9 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -127,16 +127,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 e642e17841..b508f63aea 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 | @@ -2902,8 +2900,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);