cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From c9e3d13d70a24bf606ce351886b27bdca25ef4dc Mon Sep 17 00:00:00 2001
902636
From: Juan Quintela <quintela@redhat.com>
902636
Date: Tue, 3 Mar 2020 14:51:41 +0000
902636
Subject: [PATCH 09/18] migration: Create migration_is_running()
902636
902636
RH-Author: Juan Quintela <quintela@redhat.com>
902636
Message-id: <20200303145143.149290-9-quintela@redhat.com>
902636
Patchwork-id: 94115
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 08/10] migration: Create migration_is_running()
902636
Bugzilla: 1738451
902636
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
902636
RH-Acked-by: Peter Xu <peterx@redhat.com>
902636
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
902636
This function returns true if we are in the middle of a migration.
902636
It is like migration_is_setup_or_active() with CANCELLING and COLO.
902636
Adapt all callers that are needed.
902636
902636
Signed-off-by: Juan Quintela <quintela@redhat.com>
902636
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit 392d87e21325fdb01210176faa07472b4985ccf0)
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 migration/migration.c | 29 ++++++++++++++++++++++++-----
902636
 migration/migration.h |  1 +
902636
 migration/savevm.c    |  4 +---
902636
 3 files changed, 26 insertions(+), 8 deletions(-)
902636
902636
diff --git a/migration/migration.c b/migration/migration.c
902636
index 30c53c6..eb50d77 100644
902636
--- a/migration/migration.c
902636
+++ b/migration/migration.c
902636
@@ -831,6 +831,27 @@ bool migration_is_setup_or_active(int state)
902636
     }
902636
 }
902636
 
902636
+bool migration_is_running(int state)
902636
+{
902636
+    switch (state) {
902636
+    case MIGRATION_STATUS_ACTIVE:
902636
+    case MIGRATION_STATUS_POSTCOPY_ACTIVE:
902636
+    case MIGRATION_STATUS_POSTCOPY_PAUSED:
902636
+    case MIGRATION_STATUS_POSTCOPY_RECOVER:
902636
+    case MIGRATION_STATUS_SETUP:
902636
+    case MIGRATION_STATUS_PRE_SWITCHOVER:
902636
+    case MIGRATION_STATUS_DEVICE:
902636
+    case MIGRATION_STATUS_WAIT_UNPLUG:
902636
+    case MIGRATION_STATUS_CANCELLING:
902636
+    case MIGRATION_STATUS_COLO:
902636
+        return true;
902636
+
902636
+    default:
902636
+        return false;
902636
+
902636
+    }
902636
+}
902636
+
902636
 static void populate_time_info(MigrationInfo *info, MigrationState *s)
902636
 {
902636
     info->has_status = true;
902636
@@ -1090,7 +1111,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
902636
     MigrationCapabilityStatusList *cap;
902636
     bool cap_list[MIGRATION_CAPABILITY__MAX];
902636
 
902636
-    if (migration_is_setup_or_active(s->state)) {
902636
+    if (migration_is_running(s->state)) {
902636
         error_setg(errp, QERR_MIGRATION_ACTIVE);
902636
         return;
902636
     }
902636
@@ -1603,7 +1624,7 @@ static void migrate_fd_cancel(MigrationState *s)
902636
 
902636
     do {
902636
         old_state = s->state;
902636
-        if (!migration_is_setup_or_active(old_state)) {
902636
+        if (!migration_is_running(old_state)) {
902636
             break;
902636
         }
902636
         /* If the migration is paused, kick it out of the pause */
902636
@@ -1900,9 +1921,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
902636
         return true;
902636
     }
902636
 
902636
-    if (migration_is_setup_or_active(s->state) ||
902636
-        s->state == MIGRATION_STATUS_CANCELLING ||
902636
-        s->state == MIGRATION_STATUS_COLO) {
902636
+    if (migration_is_running(s->state)) {
902636
         error_setg(errp, QERR_MIGRATION_ACTIVE);
902636
         return false;
902636
     }
902636
diff --git a/migration/migration.h b/migration/migration.h
902636
index 0b1b0d4..a2b2336 100644
902636
--- a/migration/migration.h
902636
+++ b/migration/migration.h
902636
@@ -279,6 +279,7 @@ void migrate_fd_error(MigrationState *s, const Error *error);
902636
 void migrate_fd_connect(MigrationState *s, Error *error_in);
902636
 
902636
 bool migration_is_setup_or_active(int state);
902636
+bool migration_is_running(int state);
902636
 
902636
 void migrate_init(MigrationState *s);
902636
 bool migration_is_blocked(Error **errp);
902636
diff --git a/migration/savevm.c b/migration/savevm.c
902636
index a80bb52..144ecf0 100644
902636
--- a/migration/savevm.c
902636
+++ b/migration/savevm.c
902636
@@ -1506,9 +1506,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
902636
     MigrationState *ms = migrate_get_current();
902636
     MigrationStatus status;
902636
 
902636
-    if (migration_is_setup_or_active(ms->state) ||
902636
-        ms->state == MIGRATION_STATUS_CANCELLING ||
902636
-        ms->state == MIGRATION_STATUS_COLO) {
902636
+    if (migration_is_running(ms->state)) {
902636
         error_setg(errp, QERR_MIGRATION_ACTIVE);
902636
         return -EINVAL;
902636
     }
902636
-- 
902636
1.8.3.1
902636