From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpweN-0004ni-S2 for qemu-devel@nongnu.org; Wed, 15 Aug 2018 10:19:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpweK-0007UG-IK for qemu-devel@nongnu.org; Wed, 15 Aug 2018 10:19:51 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53537 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fpweJ-0007Rj-UX for qemu-devel@nongnu.org; Wed, 15 Aug 2018 10:19:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CAD9818F053 for ; Wed, 15 Aug 2018 14:19:47 +0000 (UTC) From: Markus Armbruster Date: Wed, 15 Aug 2018 16:19:45 +0200 Message-Id: <20180815141945.10457-2-armbru@redhat.com> In-Reply-To: <20180815141945.10457-1-armbru@redhat.com> References: <20180815141945.10457-1-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/1] libqtest: Improve error reporting for bad read from QEMU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, pbonzini@redhat.com, thuth@redhat.com, lvivier@redhat.com When read() from the qtest socket or the QMP socket fails or EOFs, we report "Broken pipe" and exit(1). This commonly happens when QEMU crashes. It also happens when QEMU refuses to run because the test passed it bad arguments. Sadly, we neglect to report either. Improve this by calling abort() instead of exit(1), so kill_qemu() runs, and reports how QEMU died. This improves error reporting to something like /x86_64/device/introspect/list: Broken pipe tests/libqtest.c:129: kill_qemu() detected QEMU death from signal 6 (Aborted) (dumped core) Three exit() remain in libqtest.c: * In qmp_response(), when we can't parse a QMP reply read from the QMP socket. Change to abort() for consistency. * In qtest_qemu_binary(), when QTEST_QEMU_BINARY isn't in the environment. This can only happen before we start QEMU. Leave alone. * In qtest_init_without_qmp_handshake(), when the fork()ed child fails to execlp(). Leave alone. exit() elsewhere are unlikely due to QEMU dying on us. If that should turn out to be wrong, we can move kill_qemu() from the abrt handler to atexit() or something. Signed-off-by: Markus Armbruster --- tests/libqtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index b703fca26d..852ccff1ce 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -367,7 +367,7 @@ static GString *qtest_recv_line(QTestState *s) if (len == -1 || len == 0) { fprintf(stderr, "Broken pipe\n"); - exit(1); + abort(); } g_string_append_len(s->rx, buffer, len); @@ -454,7 +454,7 @@ static void qmp_response(JSONMessageParser *parser, GQueue *tokens) obj = json_parser_parse(tokens, NULL); if (!obj) { fprintf(stderr, "QMP JSON response parsing failed\n"); - exit(1); + abort(); } g_assert(!qmp->response); @@ -480,7 +480,7 @@ QDict *qmp_fd_receive(int fd) if (len == -1 || len == 0) { fprintf(stderr, "Broken pipe\n"); - exit(1); + abort(); } if (log) { -- 2.17.1