diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-03-27 15:09:49 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-31 22:20:04 +0200 |
| commit | 96b8ca47f8f21ba32a60930cddbf5da27d36b20d (patch) | |
| tree | 62ae4b9b7b133449035c27917e2e07f99107a824 /tests/libqtest.c | |
| parent | 58b590148ca1b19f64f533d40e32b5acce5c21e7 (diff) | |
| download | qemu-96b8ca47f8f21ba32a60930cddbf5da27d36b20d.tar.gz | |
Revert "qtest: Fix crash if SIGABRT during qtest_init()"
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 <stefanha@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'tests/libqtest.c')
| -rw-r--r-- | tests/libqtest.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index b03b57a3db..2b90e4a76e 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); |