From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTB0P-000397-NU for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:10:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTB0H-0007IX-0p for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:10:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTB0G-0007IP-Nl for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:09:56 -0400 From: Stefan Hajnoczi Date: Thu, 27 Mar 2014 15:09:49 +0100 Message-Id: <1395929390-30956-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1395929390-30956-1-git-send-email-stefanha@redhat.com> References: <1395929390-30956-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] Revert "qtest: Fix crash if SIGABRT during qtest_init()" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Markus Armbruster , Stefan Hajnoczi , Andreas Faerber It turns out there are test cases that use multiple libqtest instances. We cannot use a global qtest instance in the SIGABRT handler. This reverts commit cb201b4872f16dfbce63f8648b2584631e2e965f. Signed-off-by: Stefan Hajnoczi --- tests/libqtest.c | 3 +-- tests/libqtest.h | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index b03b57a..2b90e4a 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -120,7 +120,7 @@ QTestState *qtest_init(const char *extra_args) qemu_binary = getenv("QTEST_QEMU_BINARY"); g_assert(qemu_binary != NULL); - global_qtest = s = g_malloc(sizeof(*s)); + s = g_malloc(sizeof(*s)); socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid()); qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid()); @@ -181,7 +181,6 @@ QTestState *qtest_init(const char *extra_args) void qtest_quit(QTestState *s) { sigaction(SIGABRT, &s->sigact_old, NULL); - global_qtest = NULL; kill_qemu(s); close(s->fd); diff --git a/tests/libqtest.h b/tests/libqtest.h index 27a58fd..8268c09 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -335,7 +335,8 @@ void qtest_add_func(const char *str, void (*fn)); */ static inline QTestState *qtest_start(const char *args) { - return qtest_init(args); + global_qtest = qtest_init(args); + return global_qtest; } /** @@ -346,6 +347,7 @@ static inline QTestState *qtest_start(const char *args) static inline void qtest_end(void) { qtest_quit(global_qtest); + global_qtest = NULL; } /** -- 1.8.5.3