From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsr6-0005xf-G8 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Umsr5-00011R-BV for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:45:24 -0400 Sender: fluxion From: Michael Roth Date: Wed, 12 Jun 2013 16:41:18 -0500 Message-Id: <1371073298-14519-7-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 06/26] main_loop: do not set nonblocking if xen_enabled() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Stefano Stabellini Signed-off-by: Stefano Stabellini CC: qemu-stable@nongnu.org (cherry picked from commit a7d4207d378069a5bb3175a131e8fdedd39ef97d) Signed-off-by: Michael Roth --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 59dc0b4..efb073f 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 -- 1.7.9.5