diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-10-17 20:09:39 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-11-02 09:28:57 +0100 |
| commit | 7d175d29c9430fcba7a98f2c71925137b7870da4 (patch) | |
| tree | 3d6696bb6aeacfb459859ae11f1841bd4d617911 | |
| parent | 85cdeb36a4d4f46f04ea3f4a9e4f1e86dd8e5c9a (diff) | |
main-loop: Suppress I/O thread warning under qtest
We do not want to display the "I/O thread spun" warning for test cases
that run under qtest. The first attempt for this (commit
01c22f2cdd4fcf02276ea10f48253850a5fd7259) tested whether qtest_enabled()
was true.
Commit 21a24302e85024dd7b2a151158adbc1f5dc5c4dd correctly recognized
that just testing qtest_enabled() is not sufficient since there are some
tests that do not use the qtest accelerator but just the qtest character
device, and thus replaced qtest_enabled() by qtest_driver().
However, there are also some tests that only use the qtest accelerator
and not the qtest chardev; perhaps most notably the bash iotests.
Therefore, we have to check both qtest_enabled() and qtest_driver().
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20161017180939.27912-1-mreitz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | main-loop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main-loop.c b/main-loop.c index 66c4eb69a3..ad10bca211 100644 --- 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); |