xhci: handle USB_RET_IOERROR

[qemu.git] / vl.c

diff --git a/vl.c b/vl.c
index be0a93c53dab043efa2b03c8d38945ac8bb9d107..efb073ff4a8406042d2786ba192cc5a539e4f14f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -609,6 +609,7 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED },
+    { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_MAX, RUN_STATE_MAX },
 };
@@ -2021,7 +2022,7 @@ static void main_loop(void)
     int64_t ti;
 #endif
     do {
-        nonblocking = !kvm_enabled() && last_io > 0;
+        nonblocking = !kvm_enabled() && !xen_enabled() && last_io > 0;
 #ifdef CONFIG_PROFILER
         ti = profile_getclock();
 #endif