diff options
| author |   Anthony Liguori <aliguori@us.ibm.com> | 2012-06-27 08:20:43 -0500 |
|---|---|---|
| committer |   Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-08-21 15:36:34 -0500 |
| commit | f408f49165111b95a7186e2b1e01ee577c643855 (patch) | |
| tree | c8545c312c86235d887a91b9bccf7bf3b0b83d10 | |
| parent | 785adb09b9fd0d4df6707f00247ec519c42fcfc6 (diff) | |
qtest: fix infinite loop when QEMU aborts abruptly
From Markus:
Makes "make check" hang:
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64 gtester -k --verbose -m=quick tests/crash-test tests/rtc-test
TEST: tests/crash-test... (pid=972)
qemu-system-x86_64: Device needs media, but drive is empty
[Nothing happens, wait a while, then hit ^C]
make: *** [check-qtest-x86_64] Interrupt
This was due to the fact that we weren't checked for errors when
reading from the QMP socket. This patch adds appropriate error
checking.
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 039380a8e18f618cdacf72486449c04dc1b70eef)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | tests/libqtest.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index 6d333ef0a..0664323e1 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -290,6 +290,11 @@ void qtest_qmp(QTestState *s, const char *fmt, ...) continue; } + if (len == -1 || len == 0) { + fprintf(stderr, "Broken pipe\n"); + exit(1); + } + switch (c) { case '{': nesting++; |