[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/8] colo: Remove ENABLE_COLO loadvm command functions
From: |
Lukas Straub |
Subject: |
[PATCH 4/8] colo: Remove ENABLE_COLO loadvm command functions |
Date: |
Thu, 22 Jun 2023 14:15:46 +0200 |
No need for it anymore now that x-colo capability is required
on incoming side. Still accept the command as noop, for
compatibility with older qemu.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
---
include/migration/colo.h | 2 --
migration/migration.c | 26 --------------------------
migration/savevm.c | 7 +------
3 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/include/migration/colo.h b/include/migration/colo.h
index 4a1955067b..addbc24fcf 100644
--- a/include/migration/colo.h
+++ b/include/migration/colo.h
@@ -25,8 +25,6 @@ void migrate_start_colo_process(MigrationState *s);
bool migration_in_colo_state(void);
/* loadvm */
-int migration_incoming_enable_colo(void);
-void migration_incoming_disable_colo(void);
bool migration_incoming_in_colo_state(void);
COLOMode get_colo_mode(void);
diff --git a/migration/migration.c b/migration/migration.c
index 2506fd63f7..1d347533f9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -378,31 +378,6 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis,
return migrate_send_rp_message_req_pages(mis, rb, start);
}
-static bool migration_colo_enabled;
-void migration_incoming_disable_colo(void)
-{
- ram_block_discard_disable(false);
- migration_colo_enabled = false;
-}
-
-int migration_incoming_enable_colo(void)
-{
-#ifndef CONFIG_REPLICATION
- error_report("ENABLE_COLO command come in migration stream, but COLO "
- "module is not built in");
- return -ENOTSUP;
-#endif
-
- if (!migrate_colo()) {
- error_report("ENABLE_COLO command come in migration stream, but c-colo
"
- "capability is not set");
- return -EINVAL;
- }
-
- migration_colo_enabled = true;
- return 0;
-}
-
void migrate_add_address(SocketAddress *address)
{
MigrationIncomingState *mis = migration_incoming_get_current();
@@ -480,7 +455,6 @@ static void process_incoming_migration_bh(void *opaque)
runstate_set(RUN_STATE_PAUSED);
}
} else if (migrate_colo()) {
- migration_incoming_disable_colo();
vm_start();
} else {
runstate_set(global_state_get_runstate());
diff --git a/migration/savevm.c b/migration/savevm.c
index 155abb0fda..3a1de15bd0 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2300,11 +2300,6 @@ static int
loadvm_handle_recv_bitmap(MigrationIncomingState *mis,
return 0;
}
-static int loadvm_process_enable_colo(MigrationIncomingState *mis)
-{
- return migration_incoming_enable_colo();
-}
-
/*
* Process an incoming 'QEMU_VM_COMMAND'
* 0 just a normal return
@@ -2387,7 +2382,7 @@ static int loadvm_process_command(QEMUFile *f)
return loadvm_handle_recv_bitmap(mis, len);
case MIG_CMD_ENABLE_COLO:
- return loadvm_process_enable_colo(mis);
+ return 0;
}
return 0;
--
2.39.2
pgpK9NdVeRe_v.pgp
Description: OpenPGP digital signature
- [PATCH 0/8] colo migration cleanups, Lukas Straub, 2023/06/22
- [PATCH 1/8] colo: Only support the same qemu version on source and destination, Lukas Straub, 2023/06/22
- [PATCH 2/8] colo: Setup ram cache in normal migration path, Lukas Straub, 2023/06/22
- [PATCH 3/8] colo: Replace migration_incoming_colo_enabled() with migrate_colo(), Lukas Straub, 2023/06/22
- [PATCH 5/8] colo: Don't send ENABLE_COLO command, Lukas Straub, 2023/06/22
- [PATCH 6/8] colo: Reject colo with postcopy capability enabled, Lukas Straub, 2023/06/22
- [PATCH 4/8] colo: Remove ENABLE_COLO loadvm command functions,
Lukas Straub <=
- [PATCH 7/8] colo: Reject colo with block migration capability enabled, Lukas Straub, 2023/06/22
- [PATCH 8/8] ram: Remove useless colo special-casing, Lukas Straub, 2023/06/22