From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 27 Jun 2012 13:20:43 +0000 (-0500)
Subject: qtest: fix infinite loop when QEMU aborts abruptly
X-Git-Tag: qemu-xen-4.3.0-rc1~950
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=039380a8e18f618cdacf72486449c04dc1b70eef;p=qemu-upstream-4.6-testing.git

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>
---

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 1d73fd195..071b6be52 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++;