diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 21:50:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-13 21:50:40 +0000 |
| commit | b19fc63cadb2815d5bcb1ec25b22849e455cbb31 (patch) | |
| tree | 2b673750f06a40b9e78d5ed8142e6f8e49936a93 /tests/libqtest.h | |
| parent | 90c5d39cb847d7f360454950be647cd83cacea58 (diff) | |
| parent | 01c22f2cdd4fcf02276ea10f48253850a5fd7259 (diff) | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
QOM/QTest infrastructure fixes
* QOM cast fix for virtserialport and regression test
* QTest error handling fix
* QTest output cleanup
# gpg: Signature made Thu 13 Mar 2014 20:43:34 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.0:
main-loop: Suppress "I/O thread spun" warnings for qtest
qtest: Fix crash if SIGABRT during qtest_init()
virtio-console-test: Test virtserialport as well
virtio-console: Fix VIRTIO_CONSOLE() cast macro
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/libqtest.h')
| -rw-r--r-- | tests/libqtest.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/libqtest.h b/tests/libqtest.h index 8268c098bf..27a58fdb1c 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -335,8 +335,7 @@ void qtest_add_func(const char *str, void (*fn)); */ static inline QTestState *qtest_start(const char *args) { - global_qtest = qtest_init(args); - return global_qtest; + return qtest_init(args); } /** @@ -347,7 +346,6 @@ static inline QTestState *qtest_start(const char *args) static inline void qtest_end(void) { qtest_quit(global_qtest); - global_qtest = NULL; } /** |