[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/30] migration: Minor control flow simplification
From: |
Juan Quintela |
Subject: |
[PULL 01/30] migration: Minor control flow simplification |
Date: |
Mon, 24 Apr 2023 15:27:01 +0200 |
From: Eric Blake <eblake@redhat.com>
No need to declare a temporary variable.
Suggested-by: Juan Quintela <quintela@redhat.com>
Fixes: 1df36e8c6289 ("migration: Handle block device inactivation failures
better")
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index d91fe9fd86..9ec6c1e204 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3431,7 +3431,6 @@ static void migration_completion(MigrationState *s)
ret = global_state_store();
if (!ret) {
- bool inactivate = !migrate_colo_enabled();
ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
trace_migration_completion_vm_stop(ret);
if (ret >= 0) {
@@ -3439,10 +3438,10 @@ static void migration_completion(MigrationState *s)
MIGRATION_STATUS_DEVICE);
}
if (ret >= 0) {
- s->block_inactive = inactivate;
+ s->block_inactive = !migrate_colo_enabled();
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
- inactivate);
+ s->block_inactive);
}
}
qemu_mutex_unlock_iothread();
--
2.39.2
- [PULL 00/30] Migration 20230424 patches, Juan Quintela, 2023/04/24
- [PULL 01/30] migration: Minor control flow simplification,
Juan Quintela <=
- [PULL 02/30] migration: move migration_global_dump() to migration-hmp-cmds.c, Juan Quintela, 2023/04/24
- [PULL 08/30] migration: Move migrate_use_events() to options.c, Juan Quintela, 2023/04/24
- [PULL 10/30] migration: Move migrate_use_zero_copy_send() to options.c, Juan Quintela, 2023/04/24
- [PULL 11/30] migration: Move migrate_use_xbzrle() to options.c, Juan Quintela, 2023/04/24
- [PULL 03/30] spice: move client_migrate_info command to ui/, Juan Quintela, 2023/04/24
- [PULL 04/30] migration: Create migrate_cap_set(), Juan Quintela, 2023/04/24
- [PULL 06/30] migration: Move migrate_colo_enabled() to options.c, Juan Quintela, 2023/04/24
- [PULL 07/30] migration: Move migrate_use_compression() to options.c, Juan Quintela, 2023/04/24
- [PULL 13/30] migration: Move migrate_use_return() to options.c, Juan Quintela, 2023/04/24
- [PULL 05/30] migration: Create options.c, Juan Quintela, 2023/04/24