mirror of https://github.com/proxmox/mirror_qemu
migration: export migration_is_active
Delete the MigrationState parameter from migration_is_active so it can be exported and used without including migration.h. Signed-off-by: Steve Sistare <steven.sistare@oracle.com> Link: https://lore.kernel.org/r/1710179338-294359-4-git-send-email-steven.sistare@oracle.com Signed-off-by: Peter Xu <peterx@redhat.com>master
parent
7dcb3c87d8
commit
3a6813b68c
|
@ -182,7 +182,7 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainerBase *bcontainer)
|
||||||
VFIODevice *vbasedev;
|
VFIODevice *vbasedev;
|
||||||
MigrationState *ms = migrate_get_current();
|
MigrationState *ms = migrate_get_current();
|
||||||
|
|
||||||
if (ms->state != MIGRATION_STATUS_ACTIVE &&
|
if (!migration_is_active() &&
|
||||||
ms->state != MIGRATION_STATUS_DEVICE) {
|
ms->state != MIGRATION_STATUS_DEVICE) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -225,7 +225,7 @@ vfio_devices_all_running_and_mig_active(const VFIOContainerBase *bcontainer)
|
||||||
{
|
{
|
||||||
VFIODevice *vbasedev;
|
VFIODevice *vbasedev;
|
||||||
|
|
||||||
if (!migration_is_active(migrate_get_current())) {
|
if (!migration_is_active()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ void dump_vmstate_json_to_file(FILE *out_fp);
|
||||||
void migration_object_init(void);
|
void migration_object_init(void);
|
||||||
void migration_shutdown(void);
|
void migration_shutdown(void);
|
||||||
bool migration_is_idle(void);
|
bool migration_is_idle(void);
|
||||||
bool migration_is_active(MigrationState *);
|
bool migration_is_active(void);
|
||||||
bool migration_is_setup_or_active(void);
|
bool migration_is_setup_or_active(void);
|
||||||
bool migrate_mode_is_cpr(MigrationState *);
|
bool migrate_mode_is_cpr(MigrationState *);
|
||||||
|
|
||||||
|
|
|
@ -1406,7 +1406,7 @@ static void migrate_fd_cleanup(MigrationState *s)
|
||||||
qemu_fclose(tmp);
|
qemu_fclose(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(!migration_is_active(s));
|
assert(!migration_is_active());
|
||||||
|
|
||||||
if (s->state == MIGRATION_STATUS_CANCELLING) {
|
if (s->state == MIGRATION_STATUS_CANCELLING) {
|
||||||
migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
|
migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
|
||||||
|
@ -1637,8 +1637,10 @@ bool migration_is_idle(void)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool migration_is_active(MigrationState *s)
|
bool migration_is_active(void)
|
||||||
{
|
{
|
||||||
|
MigrationState *s = current_migration;
|
||||||
|
|
||||||
return (s->state == MIGRATION_STATUS_ACTIVE ||
|
return (s->state == MIGRATION_STATUS_ACTIVE ||
|
||||||
s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
|
s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
|
||||||
}
|
}
|
||||||
|
@ -3461,7 +3463,7 @@ static void *migration_thread(void *opaque)
|
||||||
|
|
||||||
trace_migration_thread_setup_complete();
|
trace_migration_thread_setup_complete();
|
||||||
|
|
||||||
while (migration_is_active(s)) {
|
while (migration_is_active()) {
|
||||||
if (urgent || !migration_rate_exceeded(s->to_dst_file)) {
|
if (urgent || !migration_rate_exceeded(s->to_dst_file)) {
|
||||||
MigIterateState iter_state = migration_iteration_run(s);
|
MigIterateState iter_state = migration_iteration_run(s);
|
||||||
if (iter_state == MIG_ITERATE_SKIP) {
|
if (iter_state == MIG_ITERATE_SKIP) {
|
||||||
|
@ -3607,7 +3609,7 @@ static void *bg_migration_thread(void *opaque)
|
||||||
migration_bh_schedule(bg_migration_vm_start_bh, s);
|
migration_bh_schedule(bg_migration_vm_start_bh, s);
|
||||||
bql_unlock();
|
bql_unlock();
|
||||||
|
|
||||||
while (migration_is_active(s)) {
|
while (migration_is_active()) {
|
||||||
MigIterateState iter_state = bg_migration_iteration_run(s);
|
MigIterateState iter_state = bg_migration_iteration_run(s);
|
||||||
if (iter_state == MIG_ITERATE_SKIP) {
|
if (iter_state == MIG_ITERATE_SKIP) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -83,7 +83,7 @@ static void vcpu_dirty_rate_stat_collect(void)
|
||||||
int64_t period = DIRTYLIMIT_CALC_TIME_MS;
|
int64_t period = DIRTYLIMIT_CALC_TIME_MS;
|
||||||
|
|
||||||
if (migrate_dirty_limit() &&
|
if (migrate_dirty_limit() &&
|
||||||
migration_is_active(s)) {
|
migration_is_active()) {
|
||||||
period = s->parameters.x_vcpu_dirty_limit_period;
|
period = s->parameters.x_vcpu_dirty_limit_period;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue