Commit 039380a8 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 7de3abe5
...@@ -291,6 +291,11 @@ void qtest_qmp(QTestState *s, const char *fmt, ...) ...@@ -291,6 +291,11 @@ void qtest_qmp(QTestState *s, const char *fmt, ...)
continue; continue;
} }
if (len == -1 || len == 0) {
fprintf(stderr, "Broken pipe\n");
exit(1);
}
switch (c) { switch (c) {
case '{': case '{':
nesting++; nesting++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment