diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-11-30 13:30:04 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-02 12:01:43 +0100 |
commit | 21a24302e85024dd7b2a151158adbc1f5dc5c4dd (patch) | |
tree | 8aa0a8bc189020b3cae10f09bf807ba9950fd6ad | |
parent | c1f2448998062f25df395cd239169400a4c41ed6 (diff) | |
download | qemu-21a24302e85024dd7b2a151158adbc1f5dc5c4dd.zip |
main-loop: suppress warnings under qtest
commit 01c22f2cdd4fcf02276ea10f48253850a5fd7259 ("main-loop: Suppress
"I/O thread spun" warnings for qtest") doesn't actually disable the
warning for everyone since some tests don't run under the qtest
accelerator.
Check qtest_driver instead.
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <1448882964-22433-1-git-send-email-mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | main-loop.c | 2 | ||||
-rw-r--r-- | stubs/qtest.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/main-loop.c b/main-loop.c index df28670606..5877615387 100644 --- a/main-loop.c +++ b/main-loop.c @@ -230,7 +230,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_enabled()) { + if (!notified && !qtest_driver()) { fprintf(stderr, "main-loop: WARNING: I/O thread spun for %d iterations\n", MAX_MAIN_LOOP_SPIN); diff --git a/stubs/qtest.c b/stubs/qtest.c index dc17594bb6..4dfde6104d 100644 --- a/stubs/qtest.c +++ b/stubs/qtest.c @@ -12,3 +12,8 @@ /* Needed for qtest_allowed() */ bool qtest_allowed; + +bool qtest_driver(void) +{ + return false; +} |