From: Wei Yang Date: Thu, 18 Jul 2019 08:37:47 +0000 (+0800) Subject: migration/postcopy: start_postcopy could be true only when migrate_postcopy() return... X-Git-Tag: v4.2.0-rc0~238^2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52aec70923a19e73f7ecf5da484a9fd1b07634f5;p=thirdparty%2Fqemu.git migration/postcopy: start_postcopy could be true only when migrate_postcopy() return true 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 Message-Id: <20190718083747.5859-1-richardw.yang@linux.intel.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- diff --git a/migration/migration.c b/migration/migration.c index 7c66da3a83c..8331e628315 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3103,8 +3103,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__);