Merge remote-tracking branch 'sstabellini/tags/xen-20161122-tag' into staging

[mirror_qemu.git] / main-loop.c

diff --git a/main-loop.c b/main-loop.c
index 66c4eb69a3c0474059a7237835e87cf0a034bc1e..ad10bca211224ae869882920a09476a9e0e92ce6 100644 (file)
--- a/main-loop.c
+++ b/main-loop.c
@@ -234,7 +234,7 @@ static int os_host_main_loop_wait(int64_t timeout)
     if (!timeout && (spin_counter > MAX_MAIN_LOOP_SPIN)) {
         static bool notified;
 
-        if (!notified && !qtest_driver()) {
+        if (!notified && !qtest_enabled() && !qtest_driver()) {
             fprintf(stderr,
                     "main-loop: WARNING: I/O thread spun for %d iterations\n",
                     MAX_MAIN_LOOP_SPIN);