diff options
| author | Wei Yang <richardw.yang@linux.intel.com> | 2019-10-26 07:20:00 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2020-01-20 09:10:23 +0100 |
| commit | c6b3a2e0c4342d171b35970921bff709c007dd62 (patch) | |
| tree | d49ba9c4c3f95a74221f388edbfa02dbc777c2b7 | |
| parent | eab54aa78ffd9fb7895b20fc2761ee998479489b (diff) | |
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>
| -rw-r--r-- | migration/ram.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/migration/ram.c b/migration/ram.c index a05448c0c9..d4f33a4f2f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -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); } |