| Message ID | 20190718083747.5859-1-richardw.yang@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration/postcopy: start_postcopy could be true only when migrate_postcopy() return true | expand |
* Wei Yang (richardw.yang@linux.intel.com) wrote: > There is only one place to set start_postcopy to true, > qmp_migrate_start_postcopy(), which make sure start_postcopy could be > set to true when migrate_postcopy() return true. > > So start_postcopy is true implies the other one. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/migration.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 719d125041..27ca10122f 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3101,8 +3101,7 @@ static MigIterateState migration_iteration_run(MigrationState *s) > > if (pending_size && pending_size >= s->threshold_size) { > /* Still a significant amount to transfer */ > - if (migrate_postcopy() && !in_postcopy && > - pend_pre <= s->threshold_size && > + if (!in_postcopy && pend_pre <= s->threshold_size && > atomic_read(&s->start_postcopy)) { > if (postcopy_start(s)) { > error_report("%s: postcopy failed to start", __func__); > -- > 2.17.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
* Wei Yang (richardw.yang@linux.intel.com) wrote: > There is only one place to set start_postcopy to true, > qmp_migrate_start_postcopy(), which make sure start_postcopy could be > set to true when migrate_postcopy() return true. > > So start_postcopy is true implies the other one. > > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> Queued > --- > migration/migration.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 719d125041..27ca10122f 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -3101,8 +3101,7 @@ static MigIterateState migration_iteration_run(MigrationState *s) > > if (pending_size && pending_size >= s->threshold_size) { > /* Still a significant amount to transfer */ > - if (migrate_postcopy() && !in_postcopy && > - pend_pre <= s->threshold_size && > + if (!in_postcopy && pend_pre <= s->threshold_size && > atomic_read(&s->start_postcopy)) { > if (postcopy_start(s)) { > error_report("%s: postcopy failed to start", __func__); > -- > 2.17.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/migration/migration.c b/migration/migration.c index 719d125041..27ca10122f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3101,8 +3101,7 @@ static MigIterateState migration_iteration_run(MigrationState *s) if (pending_size && pending_size >= s->threshold_size) { /* Still a significant amount to transfer */ - if (migrate_postcopy() && !in_postcopy && - pend_pre <= s->threshold_size && + if (!in_postcopy && pend_pre <= s->threshold_size && atomic_read(&s->start_postcopy)) { if (postcopy_start(s)) { error_report("%s: postcopy failed to start", __func__);
There is only one place to set start_postcopy to true, qmp_migrate_start_postcopy(), which make sure start_postcopy could be set to true when migrate_postcopy() return true. So start_postcopy is true implies the other one. Signed-off-by: Wei Yang <richardw.yang@linux.intel.com> --- migration/migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)