| Message ID | 20180103054043.25719-4-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Peter Xu <peterx@redhat.com> wrote: > It's only used once, clean it up a bit. > > Signed-off-by: Peter Xu <peterx@redhat.com> See my previous comment on patch 1. We can remove the variable, but the move to ose assert is wrong IMHO. Later, Juan. > --- > migration/migration.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index edbda43246..20f7565527 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -2177,7 +2177,6 @@ static void *migration_thread(void *opaque) > bool entered_postcopy = false; > /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ > enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE; > - bool enable_colo = migrate_colo_enabled(); > > rcu_register_thread(); > > @@ -2305,7 +2304,7 @@ static void *migration_thread(void *opaque) > runstate_set(RUN_STATE_POSTMIGRATE); > } else { > if (s->state == MIGRATION_STATUS_ACTIVE) { > - assert(enable_colo); > + assert(migrate_colo_enabled()); > migrate_start_colo_process(s); > /* > * Fixme: we will run VM in COLO no matter its old running state.
diff --git a/migration/migration.c b/migration/migration.c index edbda43246..20f7565527 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2177,7 +2177,6 @@ static void *migration_thread(void *opaque) bool entered_postcopy = false; /* The active state we expect to be in; ACTIVE or POSTCOPY_ACTIVE */ enum MigrationStatus current_active_state = MIGRATION_STATUS_ACTIVE; - bool enable_colo = migrate_colo_enabled(); rcu_register_thread(); @@ -2305,7 +2304,7 @@ static void *migration_thread(void *opaque) runstate_set(RUN_STATE_POSTMIGRATE); } else { if (s->state == MIGRATION_STATUS_ACTIVE) { - assert(enable_colo); + assert(migrate_colo_enabled()); migrate_start_colo_process(s); /* * Fixme: we will run VM in COLO no matter its old running state.
It's only used once, clean it up a bit. Signed-off-by: Peter Xu <peterx@redhat.com> --- migration/migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)