aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-06-27 08:20:43 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-06-27 16:26:59 -0500
commit039380a8e18f618cdacf72486449c04dc1b70eef (patch)
tree6741402adfdaacb71e53ba0c28c7a2a9c3b2499a
parent7de3abe505e34398cef5bddf6c4d0bd9ee47007f (diff)
downloadqemu-arm-039380a8e18f618cdacf72486449c04dc1b70eef.tar.gz
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>
-rw-r--r--tests/libqtest.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 1d73fd1953..071b6be521 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -291,6 +291,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++;