aboutsummaryrefslogtreecommitdiff
path: root/migration/migration.c
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2024-10-24 17:30:53 -0400
committerPeter Xu <peterx@redhat.com>2024-10-31 15:48:18 -0400
commit34a8892decdcec13d641f57bcb2a9c35fbc4c07b (patch)
tree5a057942e618bc129cf61cc62d056ea615740289 /migration/migration.c
parentf018eb62b2bb7618b0cb8a796ac4b76fd786ecaf (diff)
downloadqemu-34a8892decdcec13d641f57bcb2a9c35fbc4c07b.zip
qemu-34a8892decdcec13d641f57bcb2a9c35fbc4c07b.tar.gz
qemu-34a8892decdcec13d641f57bcb2a9c35fbc4c07b.tar.bz2
migration: Drop migration_is_idle()
Now with the current migration_is_running(), it will report exactly the opposite of what will be reported by migration_is_idle(). Drop migration_is_idle(), instead use "!migration_is_running()" which should be identical on functionality. In reality, most of the idle check is inverted, so it's even easier to write with "migrate_is_running()" check. Reviewed-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Link: https://lore.kernel.org/r/20241024213056.1395400-6-peterx@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 65f77e3..aedf7f0 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1633,25 +1633,6 @@ bool migration_in_bg_snapshot(void)
return migrate_background_snapshot() && migration_is_running();
}
-bool migration_is_idle(void)
-{
- MigrationState *s = current_migration;
-
- if (!s) {
- return true;
- }
-
- switch (s->state) {
- case MIGRATION_STATUS_NONE:
- case MIGRATION_STATUS_CANCELLED:
- case MIGRATION_STATUS_COMPLETED:
- case MIGRATION_STATUS_FAILED:
- return true;
- default:
- return false;
- }
-}
-
bool migration_is_active(void)
{
MigrationState *s = current_migration;
@@ -1730,7 +1711,7 @@ static bool is_busy(Error **reasonp, Error **errp)
ERRP_GUARD();
/* Snapshots are similar to migrations, so check RUN_STATE_SAVE_VM too. */
- if (runstate_check(RUN_STATE_SAVE_VM) || !migration_is_idle()) {
+ if (runstate_check(RUN_STATE_SAVE_VM) || migration_is_running()) {
error_propagate_prepend(errp, *reasonp,
"disallowing migration blocker "
"(migration/snapshot in progress) for: ");