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 | |
parent | 90c5d39cb847d7f360454950be647cd83cacea58 (diff) | |
parent | 01c22f2cdd4fcf02276ea10f48253850a5fd7259 (diff) | |
download | qemu-b19fc63cadb2815d5bcb1ec25b22849e455cbb31.tar.gz |
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')
-rw-r--r-- | tests/libqtest.c | 3 | ||||
-rw-r--r-- | tests/libqtest.h | 4 | ||||
-rw-r--r-- | tests/virtio-console-test.c | 19 |
3 files changed, 16 insertions, 10 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index 2b90e4a76e..b03b57a3db 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); - s = g_malloc(sizeof(*s)); + global_qtest = 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,6 +181,7 @@ 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 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; } /** diff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c index f98f5af252..6be96e8c64 100644 --- a/tests/virtio-console-test.c +++ b/tests/virtio-console-test.c @@ -13,8 +13,18 @@ #include "qemu/osdep.h" /* Tests only initialization so far. TODO: Replace with functional tests */ -static void pci_nop(void) +static void console_pci_nop(void) { + qtest_start("-device virtio-serial-pci,id=vser0 " + "-device virtconsole,bus=vser0.0"); + qtest_end(); +} + +static void serialport_pci_nop(void) +{ + qtest_start("-device virtio-serial-pci,id=vser0 " + "-device virtserialport,bus=vser0.0"); + qtest_end(); } int main(int argc, char **argv) @@ -22,13 +32,10 @@ int main(int argc, char **argv) int ret; g_test_init(&argc, &argv, NULL); - qtest_add_func("/virtio/console/pci/nop", pci_nop); + qtest_add_func("/virtio/console/pci/nop", console_pci_nop); + qtest_add_func("/virtio/serialport/pci/nop", serialport_pci_nop); - qtest_start("-device virtio-serial-pci,id=vser0 " - "-device virtconsole,bus=vser0.0"); ret = g_test_run(); - qtest_end(); - return ret; } |