]> git.proxmox.com Git - qemu.git/commitdiff
main_loop: do not set nonblocking if xen_enabled()
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 3 Jun 2013 15:38:43 +0000 (15:38 +0000)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 11 Jun 2013 21:57:46 +0000 (16:57 -0500)
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: qemu-stable@nongnu.org
(cherry picked from commit a7d4207d378069a5bb3175a131e8fdedd39ef97d)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
vl.c

diff --git a/vl.c b/vl.c
index 59dc0b45dad994b974eecbdbc82c6a95b5680dc0..efb073ff4a8406042d2786ba192cc5a539e4f14f 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -2022,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