migration/multifd: not use multifd during postcopy

We don't support multifd during postcopy, but user still could enable
both multifd and postcopy. This leads to migration failure.

Skip multifd during postcopy.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Wei Yang 2019-10-26 07:20:00 +08:00 committed by Juan Quintela
parent eab54aa78f
commit c6b3a2e0c4
1 changed files with 6 additions and 3 deletions

View File

@ -2587,10 +2587,13 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss,
}
/*
* do not use multifd for compression as the first page in the new
* block should be posted out before sending the compressed page
* Do not use multifd for:
* 1. Compression as the first page in the new block should be posted out
* before sending the compressed page
* 2. In postcopy as one whole host page should be placed
*/
if (!save_page_use_compression(rs) && migrate_use_multifd()) {
if (!save_page_use_compression(rs) && migrate_use_multifd()
&& !migration_in_postcopy()) {
return ram_save_multifd_page(rs, block, offset);
}