Skip to content

Commit

Permalink
migration: Move migrate_use_events() to options.c
Browse files Browse the repository at this point in the history
Once that we are there, we rename the function to migrate_events()
to be consistent with all other capabilities.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
  • Loading branch information
Juan Quintela committed Apr 24, 2023
1 parent a7a94d1 commit b890902
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
11 changes: 1 addition & 10 deletions migration/migration.c
Expand Up @@ -353,7 +353,7 @@ void migration_incoming_state_destroy(void)

static void migrate_generate_event(int new_state)
{
if (migrate_use_events()) {
if (migrate_events()) {
qapi_event_send_migration(new_state);
}
}
Expand Down Expand Up @@ -2558,15 +2558,6 @@ int migrate_decompress_threads(void)
return s->parameters.decompress_threads;
}

bool migrate_use_events(void)
{
MigrationState *s;

s = migrate_get_current();

return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
}

bool migrate_use_multifd(void)
{
MigrationState *s;
Expand Down
1 change: 0 additions & 1 deletion migration/migration.h
Expand Up @@ -475,7 +475,6 @@ int migrate_compress_level(void);
int migrate_compress_threads(void);
int migrate_compress_wait_thread(void);
int migrate_decompress_threads(void);
bool migrate_use_events(void);

/* Sending on the return path - generic and then for each message type */
void migrate_send_rp_shut(MigrationIncomingState *mis,
Expand Down
9 changes: 9 additions & 0 deletions migration/options.c
Expand Up @@ -57,6 +57,15 @@ bool migrate_dirty_bitmaps(void)
return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
}

bool migrate_events(void)
{
MigrationState *s;

s = migrate_get_current();

return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
}

bool migrate_ignore_shared(void)
{
MigrationState *s;
Expand Down
1 change: 1 addition & 0 deletions migration/options.h
Expand Up @@ -21,6 +21,7 @@ bool migrate_background_snapshot(void);
bool migrate_colo(void);
bool migrate_compress(void);
bool migrate_dirty_bitmaps(void);
bool migrate_events(void);
bool migrate_ignore_shared(void);
bool migrate_late_block_activate(void);
bool migrate_pause_before_switchover(void);
Expand Down
2 changes: 1 addition & 1 deletion migration/ram.c
Expand Up @@ -1246,7 +1246,7 @@ static void migration_bitmap_sync(RAMState *rs)
rs->num_dirty_pages_period = 0;
rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
}
if (migrate_use_events()) {
if (migrate_events()) {
uint64_t generation = stat64_get(&ram_counters.dirty_sync_count);
qapi_event_send_migration_pass(generation);
}
Expand Down

0 comments on commit b890902

Please sign in to comment.