|
@@ -60,6 +60,7 @@
|
|
#include "qemu/yank.h"
|
|
#include "qemu/yank.h"
|
|
#include "sysemu/cpus.h"
|
|
#include "sysemu/cpus.h"
|
|
#include "yank_functions.h"
|
|
#include "yank_functions.h"
|
|
|
|
+#include "sysemu/qtest.h"
|
|
|
|
|
|
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */
|
|
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */
|
|
|
|
|
|
@@ -3766,7 +3767,8 @@ static void qemu_savevm_wait_unplug(MigrationState *s, int old_state,
|
|
while (timeout-- && qemu_savevm_state_guest_unplug_pending()) {
|
|
while (timeout-- && qemu_savevm_state_guest_unplug_pending()) {
|
|
qemu_sem_timedwait(&s->wait_unplug_sem, 250);
|
|
qemu_sem_timedwait(&s->wait_unplug_sem, 250);
|
|
}
|
|
}
|
|
- if (qemu_savevm_state_guest_unplug_pending()) {
|
|
|
|
|
|
+ if (qemu_savevm_state_guest_unplug_pending() &&
|
|
|
|
+ !qtest_enabled()) {
|
|
warn_report("migration: partially unplugged device on "
|
|
warn_report("migration: partially unplugged device on "
|
|
"failure");
|
|
"failure");
|
|
}
|
|
}
|