[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c
From: |
Juan Quintela |
Subject: |
[PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c |
Date: |
Thu, 20 Apr 2023 15:39:24 +0200 |
Once that we are there, we rename the function to migrate_colo() to be
consistent with all other capabilities.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/migration.c | 16 +++++-----------
migration/migration.h | 1 -
migration/options.c | 6 ++++++
migration/options.h | 1 +
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 4bcccdd129..c1ffb3c180 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2412,7 +2412,7 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
}
if (blk || blk_inc) {
- if (migrate_colo_enabled()) {
+ if (migrate_colo()) {
error_setg(errp, "No disk migration is required in COLO mode");
return false;
}
@@ -3293,7 +3293,7 @@ static void migration_completion(MigrationState *s)
ret = global_state_store();
if (!ret) {
- bool inactivate = !migrate_colo_enabled();
+ bool inactivate = !migrate_colo();
ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
trace_migration_completion_vm_stop(ret);
if (ret >= 0) {
@@ -3354,7 +3354,7 @@ static void migration_completion(MigrationState *s)
goto fail_invalidate;
}
- if (migrate_colo_enabled() && s->state == MIGRATION_STATUS_ACTIVE) {
+ if (migrate_colo() && s->state == MIGRATION_STATUS_ACTIVE) {
/* COLO does not support postcopy */
migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_COLO);
@@ -3433,12 +3433,6 @@ fail:
MIGRATION_STATUS_FAILED);
}
-bool migrate_colo_enabled(void)
-{
- MigrationState *s = migrate_get_current();
- return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
-}
-
typedef enum MigThrError {
/* No error detected */
MIG_THR_ERR_NONE = 0,
@@ -3772,7 +3766,7 @@ static void migration_iteration_finish(MigrationState *s)
runstate_set(RUN_STATE_POSTMIGRATE);
break;
case MIGRATION_STATUS_COLO:
- if (!migrate_colo_enabled()) {
+ if (!migrate_colo()) {
error_report("%s: critical error: calling COLO code without "
"COLO enabled", __func__);
}
@@ -3968,7 +3962,7 @@ static void *migration_thread(void *opaque)
qemu_savevm_send_postcopy_advise(s->to_dst_file);
}
- if (migrate_colo_enabled()) {
+ if (migrate_colo()) {
/* Notify migration destination that we enable COLO */
qemu_savevm_send_colo_enable(s->to_dst_file);
}
diff --git a/migration/migration.h b/migration/migration.h
index a25fed6ef0..42f0c68b6f 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -463,7 +463,6 @@ bool migrate_use_zero_copy_send(void);
int migrate_use_tls(void);
int migrate_use_xbzrle(void);
uint64_t migrate_xbzrle_cache_size(void);
-bool migrate_colo_enabled(void);
bool migrate_use_block(void);
bool migrate_use_block_incremental(void);
diff --git a/migration/options.c b/migration/options.c
index 88a9a45913..bd33c5da0a 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -33,6 +33,12 @@ bool migrate_background_snapshot(void)
return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
}
+bool migrate_colo(void)
+{
+ MigrationState *s = migrate_get_current();
+ return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
+}
+
bool migrate_dirty_bitmaps(void)
{
MigrationState *s;
diff --git a/migration/options.h b/migration/options.h
index 0dfa0af245..2a0ee61ff8 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -18,6 +18,7 @@
bool migrate_auto_converge(void);
bool migrate_background_snapshot(void);
+bool migrate_colo(void);
bool migrate_dirty_bitmaps(void);
bool migrate_ignore_shared(void);
bool migrate_late_block_activate(void);
--
2.39.2
- [PATCH v2 00/43] Migration: Create options.c for capabilities/params/properties, Juan Quintela, 2023/04/20
- [PATCH v2 02/43] spice: move client_migrate_info command to ui/, Juan Quintela, 2023/04/20
- [PATCH v2 03/43] migration: Create migration_cap_set(), Juan Quintela, 2023/04/20
- [PATCH v2 01/43] migration: move migration_global_dump() to migration-hmp-cmds.c, Juan Quintela, 2023/04/20
- [PATCH v2 04/43] migration: Create options.c, Juan Quintela, 2023/04/20
- [PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c,
Juan Quintela <=
- [PATCH v2 06/43] migration: Move migrate_use_compression() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 07/43] migration: Move migrate_use_events() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 09/43] migration: Move migrate_use_zero_copy_send() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 10/43] migration: Move migrate_use_xbzrle() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 08/43] migration: Move migrate_use_multifd() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 11/43] migration: Move migrate_use_block() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 12/43] migration: Move migrate_use_return() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 13/43] migration: Create migrate_rdma_pin_all() function, Juan Quintela, 2023/04/20
- [PATCH v2 15/43] migration: Move qmp_query_migrate_capabilities() to options.c, Juan Quintela, 2023/04/20