From d5fb23bc6e3ffd5003f5c6558780c8be13cc9ae9 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 8 Sep 2022 12:54:57 +0200 Subject: [PATCH] qemu: monitor: Drop support for old-style non-shared storage migration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the support for enabling the 'blk' and 'inc' parameters of the 'migrate' command as there are no users any more. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 4 ---- tests/qemumonitorjsontest.c | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 63269e15bc..53ea26c58a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -826,8 +826,6 @@ int qemuMonitorGetSEVCapabilities(qemuMonitor *mon, typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, - QEMU_MONITOR_MIGRATE_NON_SHARED_DISK = 1 << 1, /* migration with non-shared storage with full disk copy */ - QEMU_MONITOR_MIGRATE_NON_SHARED_INC = 1 << 2, /* migration with non-shared storage with incremental copy */ QEMU_MONITOR_MIGRATE_RESUME = 1 << 3, /* resume failed post-copy migration */ QEMU_MONITOR_MIGRATION_FLAGS_LAST } QEMU_MONITOR_MIGRATE; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 70fba50e6c..bf22cc64f8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3110,13 +3110,9 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon, const char *uri) { bool detach = !!(flags & QEMU_MONITOR_MIGRATE_BACKGROUND); - bool blk = !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_DISK); - bool inc = !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC); bool resume = !!(flags & QEMU_MONITOR_MIGRATE_RESUME); g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate", "b:detach", detach, - "b:blk", blk, - "b:inc", inc, "b:resume", resume, "s:uri", uri, NULL); diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index b508f63aea..fa5455e513 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1201,9 +1201,7 @@ GEN_TEST_FUNC(qemuMonitorJSONExpirePassword, "spice", "123456") GEN_TEST_FUNC(qemuMonitorJSONSetBalloon, 1024) GEN_TEST_FUNC(qemuMonitorJSONSaveVirtualMemory, 0, 1024, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONSavePhysicalMemory, 0, 1024, "/foo/bar") -GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND | - QEMU_MONITOR_MIGRATE_NON_SHARED_DISK | - QEMU_MONITOR_MIGRATE_NON_SHARED_INC, "tcp:localhost:12345") +GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND, "tcp:localhost:12345") GEN_TEST_FUNC(qemuMonitorJSONMigrateRecover, "tcp://destination.host:54321"); GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "elf", true)