|
@@ -555,7 +555,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- if (migrate_incoming_started()) {
|
|
|
+ if (!migrate_postcopy_preempt() && migrate_incoming_started()) {
|
|
|
error_setg(errp,
|
|
|
"Postcopy preempt must be set before incoming starts");
|
|
|
return false;
|
|
@@ -563,7 +563,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
|
|
|
}
|
|
|
|
|
|
if (new_caps[MIGRATION_CAPABILITY_MULTIFD]) {
|
|
|
- if (migrate_incoming_started()) {
|
|
|
+ if (!migrate_multifd() && migrate_incoming_started()) {
|
|
|
error_setg(errp, "Multifd must be set before incoming starts");
|
|
|
return false;
|
|
|
}
|