motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-01 14:31:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: Use MigrationStatus instead of int

Browse source 
QEMU uses "int" in most cases even if it stores MigrationStatus.  I don't
know why, so let's try to do that right and see what blows up..

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Peter Xu 2024-06-19 18:30:38 -04:00 • committed by Fabiano Rosas
parent 60ce47675d
commit a5c24e13e9
2 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
migration/migration.c
View file

@ -413,7 +413,7 @@ void migration_incoming_state_destroy(void)
yank_unregister_instance(MIGRATION_YANK_INSTANCE); yank_unregister_instance(MIGRATION_YANK_INSTANCE);
} }
static void migrate_generate_event(int new_state) static void migrate_generate_event(MigrationStatus new_state)
{ {
if (migrate_events()) { if (migrate_events()) {
qapi_event_send_migration(new_state); qapi_event_send_migration(new_state);
@ -1296,8 +1296,6 @@ static void fill_destination_migration_info(MigrationInfo *info)
} }
switch (mis->state) { switch (mis->state) {
case MIGRATION_STATUS_NONE:
return;
case MIGRATION_STATUS_SETUP: case MIGRATION_STATUS_SETUP:
case MIGRATION_STATUS_CANCELLING: case MIGRATION_STATUS_CANCELLING:
case MIGRATION_STATUS_CANCELLED: case MIGRATION_STATUS_CANCELLED:
@ -1313,6 +1311,8 @@ static void fill_destination_migration_info(MigrationInfo *info)
info->has_status = true; info->has_status = true;
fill_destination_postcopy_migration_info(info); fill_destination_postcopy_migration_info(info);
break; break;
default:
return;
} }
info->status = mis->state; info->status = mis->state;
@ -1360,7 +1360,8 @@ void qmp_migrate_start_postcopy(Error **errp)
/* shared migration helpers */ /* shared migration helpers */
void migrate_set_state(int *state, int old_state, int new_state) void migrate_set_state(MigrationStatus *state, MigrationStatus old_state,
MigrationStatus new_state)
{ {
assert(new_state < MIGRATION_STATUS__MAX); assert(new_state < MIGRATION_STATUS__MAX);
if (qatomic_cmpxchg(state, old_state, new_state) == old_state) { if (qatomic_cmpxchg(state, old_state, new_state) == old_state) {
@ -1567,7 +1568,7 @@ bool migration_in_postcopy(void)
} }
} }
bool migration_postcopy_is_alive(int state) bool migration_postcopy_is_alive(MigrationStatus state)
{ {
switch (state) { switch (state) {
case MIGRATION_STATUS_POSTCOPY_ACTIVE: case MIGRATION_STATUS_POSTCOPY_ACTIVE:
@ -1612,20 +1613,9 @@ bool migration_is_idle(void)
case MIGRATION_STATUS_COMPLETED: case MIGRATION_STATUS_COMPLETED:
case MIGRATION_STATUS_FAILED: case MIGRATION_STATUS_FAILED:
return true; return true;
case MIGRATION_STATUS_SETUP: default:
case MIGRATION_STATUS_CANCELLING:
case MIGRATION_STATUS_ACTIVE:
case MIGRATION_STATUS_POSTCOPY_ACTIVE:
case MIGRATION_STATUS_COLO:
case MIGRATION_STATUS_PRE_SWITCHOVER:
case MIGRATION_STATUS_DEVICE:
case MIGRATION_STATUS_WAIT_UNPLUG:
return false; return false;
case MIGRATION_STATUS__MAX:
g_assert_not_reached();
} }
return false;
} }
bool migration_is_active(void) bool migration_is_active(void)

9
migration/migration.h
View file

@ -160,7 +160,7 @@ struct MigrationIncomingState {
/* PostCopyFD's for external userfaultfds & handlers of shared memory */ /* PostCopyFD's for external userfaultfds & handlers of shared memory */
GArray *postcopy_remote_fds; GArray *postcopy_remote_fds;
int state; MigrationStatus state;
/* /*
* The incoming migration coroutine, non-NULL during qemu_loadvm_state(). * The incoming migration coroutine, non-NULL during qemu_loadvm_state().
@ -301,7 +301,7 @@ struct MigrationState {
/* params from 'migrate-set-parameters' */ /* params from 'migrate-set-parameters' */
MigrationParameters parameters; MigrationParameters parameters;
int state; MigrationStatus state;
/* State related to return path */ /* State related to return path */
struct { struct {
@ -459,7 +459,8 @@ struct MigrationState {
bool rdma_migration; bool rdma_migration;
}; };
void migrate_set_state(int *state, int old_state, int new_state); void migrate_set_state(MigrationStatus *state, MigrationStatus old_state,
MigrationStatus new_state);
void migration_fd_process_incoming(QEMUFile *f); void migration_fd_process_incoming(QEMUFile *f);
void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp); void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
@ -479,7 +480,7 @@ int migrate_init(MigrationState *s, Error **errp);
bool migration_is_blocked(Error **errp); bool migration_is_blocked(Error **errp);
/* True if outgoing migration has entered postcopy phase */ /* True if outgoing migration has entered postcopy phase */
bool migration_in_postcopy(void); bool migration_in_postcopy(void);
bool migration_postcopy_is_alive(int state); bool migration_postcopy_is_alive(MigrationStatus state);
MigrationState *migrate_get_current(void); MigrationState *migrate_get_current(void);
bool migration_has_failed(MigrationState *); bool migration_has_failed(MigrationState *);
bool migrate_mode_is_cpr(MigrationState *); bool migrate_mode_is_cpr(MigrationState *);