]> git.proxmox.com Git - qemu.git/commitdiff
qtest: fix infinite loop when QEMU aborts abruptly
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 27 Jun 2012 13:20:43 +0000 (08:20 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 27 Jun 2012 21:26:59 +0000 (16:26 -0500)
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>
tests/libqtest.c

index 1d73fd19539689ed44a68d173c45400e5ffbbc91..071b6be521886d38e1c0da51e20db4fcf540bace 100644 (file)
@@ -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++;