motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "qtest: Fix crash if SIGABRT during qtest_init()"

Browse source 
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 cb201b4872.

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>
This commit is contained in:
Stefan Hajnoczi 2014-03-27 15:09:49 +01:00 • committed by Andreas Färber
parent 58b590148c
commit 96b8ca47f8
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/libqtest.c
View file

@ -120,7 +120,7 @@ QTestState *qtest_init(const char *extra_args)
qemu_binary = getenv("QTEST_QEMU_BINARY"); qemu_binary = getenv("QTEST_QEMU_BINARY");
g_assert(qemu_binary != NULL); 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()); socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", 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) void qtest_quit(QTestState *s)
{ {
sigaction(SIGABRT, &s->sigact_old, NULL); sigaction(SIGABRT, &s->sigact_old, NULL);
global_qtest = NULL;
kill_qemu(s); kill_qemu(s);
close(s->fd); close(s->fd);

4
tests/libqtest.h
View file

@ -335,7 +335,8 @@ void qtest_add_func(const char *str, void (*fn));
*/ */
static inline QTestState *qtest_start(const char *args) 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) static inline void qtest_end(void)
{ {
qtest_quit(global_qtest); qtest_quit(global_qtest);
global_qtest = NULL;
} }
/** /**