From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Mon, 3 Jun 2013 15:38:43 +0000 (+0000)
Subject: main_loop: do not set nonblocking if xen_enabled()
X-Git-Tag: v1.6.0-rc0~248^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7d4207d378069a5bb3175a131e8fdedd39ef97d;p=thirdparty%2Fqemu.git

main_loop: do not set nonblocking if xen_enabled()

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: qemu-stable@nongnu.org
---

diff --git a/vl.c b/vl.c
index 510d2c2ce44..47ab45d37a5 100644
--- 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