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