summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2014-03-13 16:47:24 +0100
committerAndreas Färber <afaerber@suse.de>2014-03-13 21:12:07 +0100
commitf33f991185bccd22963c256437b9d8ea63361ff5 (patch)
tree37f8d5acb239529130d32fc216a8abf1a03a55b9
parentbe21c336162f5f4269131faffb1c6461cf57b74a (diff)
downloadqemu-f33f991185bccd22963c256437b9d8ea63361ff5.tar.gz
virtio-console-test: Test virtserialport as well
A test is only as good as its coverage - testing virtserialport in addition to virtconsole showed that commit 0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM cast cleanup for VirtConsole) broke virtserialport. Acked-by: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--tests/virtio-console-test.c19
1 files changed, 13 insertions, 6 deletions
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;
}