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.h | |
| 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.h')
| -rw-r--r-- | tests/libqtest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/libqtest.h b/tests/libqtest.h index 27a58fdb1c..8268c098bf 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; } /** |