target-arm: Add trace events for the generic timers

[mirror_qemu.git] / tests / display-vga-test.c

diff --git a/tests/display-vga-test.c b/tests/display-vga-test.c
index 17f59101e8deb1e5c607fbda2e1d7a17f922eb4a..91460215ccf192866e5b668a565490ee75897919 100644 (file)
--- a/tests/display-vga-test.c
+++ b/tests/display-vga-test.c
@@ -7,10 +7,8 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <glib.h>
-#include <string.h>
-#include "libqtest.h"
 #include "qemu/osdep.h"
+#include "libqtest.h"
 
 static void pci_cirrus(void)
 {
@@ -36,17 +34,31 @@ static void pci_multihead(void)
     qtest_end();
 }
 
-int main(int argc, char **argv)
+static void pci_virtio_gpu(void)
+{
+    qtest_start("-vga none -device virtio-gpu-pci");
+    qtest_end();
+}
+
+#ifdef CONFIG_VIRTIO_VGA
+static void pci_virtio_vga(void)
 {
-    int ret;
+    qtest_start("-vga none -device virtio-vga");
+    qtest_end();
+}
+#endif
 
+int main(int argc, char **argv)
+{
     g_test_init(&argc, &argv, NULL);
 
     qtest_add_func("/display/pci/cirrus", pci_cirrus);
     qtest_add_func("/display/pci/stdvga", pci_stdvga);
     qtest_add_func("/display/pci/secondary", pci_secondary);
     qtest_add_func("/display/pci/multihead", pci_multihead);
-    ret = g_test_run();
-
-    return ret;
+    qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu);
+#ifdef CONFIG_VIRTIO_VGA
+    qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
+#endif
+    return g_test_run();
 }