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.5.1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=951411fa360fb209fdb761b08bf81ab2ee276cf0;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
(cherry picked from commit a7d4207d378069a5bb3175a131e8fdedd39ef97d)

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

diff --git a/vl.c b/vl.c
index 59dc0b45dad..efb073ff4a8 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