[PATCH 5/8] colo: Don't send ENABLE_COLO command

[Lukas Straub]

We should only migrate to qemu with newer version, and there it's
not needed anymore.

Signed-off-by: Lukas Straub <lukasstra...@web.de>
---
 migration/migration.c  | 5 -----
 migration/savevm.c     | 6 ------
 migration/savevm.h     | 1 -
 migration/trace-events | 1 -
 4 files changed, 13 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index 1d347533f9..a954ff4f7d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2929,11 +2929,6 @@ static void *migration_thread(void *opaque)
         qemu_savevm_send_postcopy_advise(s->to_dst_file);
     }
 
-    if (migrate_colo()) {
-        /* Notify migration destination that we enable COLO */
-        qemu_savevm_send_colo_enable(s->to_dst_file);
-    }
-
     qemu_savevm_state_setup(s->to_dst_file);
 
     qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP,
diff --git a/migration/savevm.c b/migration/savevm.c
index 3a1de15bd0..5986f852b2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1035,12 +1035,6 @@ static void qemu_savevm_command_send(QEMUFile *f,
     qemu_fflush(f);
 }
 
-void qemu_savevm_send_colo_enable(QEMUFile *f)
-{
-    trace_savevm_send_colo_enable();
-    qemu_savevm_command_send(f, MIG_CMD_ENABLE_COLO, 0, NULL);
-}
-
 void qemu_savevm_send_ping(QEMUFile *f, uint32_t value)
 {
     uint32_t buf;
diff --git a/migration/savevm.h b/migration/savevm.h
index fb636735f0..cb3318e9e2 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -57,7 +57,6 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const 
char *name,
                                            uint16_t len,
                                            uint64_t *start_list,
                                            uint64_t *length_list);
-void qemu_savevm_send_colo_enable(QEMUFile *f);
 void qemu_savevm_live_state(QEMUFile *f);
 int qemu_save_device_state(QEMUFile *f);
 
diff --git a/migration/trace-events b/migration/trace-events
index cdaef7a1ea..bd3ec40e31 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -36,7 +36,6 @@ savevm_send_ping(uint32_t val) "0x%x"
 savevm_send_postcopy_listen(void) ""
 savevm_send_postcopy_run(void) ""
 savevm_send_postcopy_resume(void) ""
-savevm_send_colo_enable(void) ""
 savevm_send_recv_bitmap(char *name) "%s"
 savevm_state_setup(void) ""
 savevm_state_resume_prepare(void) ""
-- 
2.39.2

pgpu0tet5w3yp.pgp
Description: OpenPGP digital signature