diff options
| author | Steve Sistare <steven.sistare@oracle.com> | 2024-03-11 10:48:49 -0700 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-03-11 16:28:59 -0400 |
| commit | 7dcb3c87d87cbf3359c9bbef8066e5195ee92f4d (patch) | |
| tree | 8891b6bc6c9f2332160fd5e6d900544ccae56a31 /migration/migration.c | |
| parent | f853fa0714061989b14d7f85667a353b69e2d9b6 (diff) | |
| download | focaccia-qemu-7dcb3c87d87cbf3359c9bbef8066e5195ee92f4d.tar.gz focaccia-qemu-7dcb3c87d87cbf3359c9bbef8066e5195ee92f4d.zip | |
migration: export migration_is_setup_or_active
Delete the MigrationState parameter from migration_is_setup_or_active and move it to the public API in misc.h. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Link: https://lore.kernel.org/r/1710179338-294359-3-git-send-email-steven.sistare@oracle.com Signed-off-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration/migration.c')
| -rw-r--r-- | migration/migration.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/migration/migration.c b/migration/migration.c index a49fcd53ee..af21403bad 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1081,9 +1081,11 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value) * Return true if we're already in the middle of a migration * (i.e. any of the active or setup states) */ -bool migration_is_setup_or_active(int state) +bool migration_is_setup_or_active(void) { - switch (state) { + MigrationState *s = current_migration; + + switch (s->state) { case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_POSTCOPY_ACTIVE: case MIGRATION_STATUS_POSTCOPY_PAUSED: @@ -1601,10 +1603,8 @@ bool migration_incoming_postcopy_advised(void) bool migration_in_bg_snapshot(void) { - MigrationState *s = migrate_get_current(); - return migrate_background_snapshot() && - migration_is_setup_or_active(s->state); + migration_is_setup_or_active(); } bool migration_is_idle(void) @@ -2297,7 +2297,7 @@ static void *source_return_path_thread(void *opaque) trace_source_return_path_thread_entry(); rcu_register_thread(); - while (migration_is_setup_or_active(ms->state)) { + while (migration_is_setup_or_active()) { trace_source_return_path_thread_loop_top(); header_type = qemu_get_be16(rp); |