[PATCH 4/8] tests/qtest: Add -vga none by default

[Juan Quintela]

Nothing in qtest where using vga by default except for
dbus-display-test.  We add -device VGA there.

The only other test that fails after this change is:

109/659 qemu:qtest+qtest-ppc64 / qtest-ppc64/qos-test ERROR
21.34s killed by signal 6 SIGABRT

Bail out! 
ERROR:../../../../mnt/code/qemu/full/tests/qtest/virtio-iommu-test.c:189:test_attach_detach:
 assertion failed (ret == 0): (6 == 0)
stderr:
qemu-system-ppc64: warning: nic e1000.0 has no peer
qemu-system-ppc64: warning: nic e1000-82544gc.0 has no peer
qemu-system-ppc64: warning: nic e1000-82545em.0 has no peer
qemu-system-ppc64: warning: nic i82550.0 has no peer
qemu-system-ppc64: warning: nic i82551.0 has no peer
qemu-system-ppc64: warning: nic i82557a.0 has no peer
qemu-system-ppc64: warning: nic i82557b.0 has no peer
qemu-system-ppc64: warning: nic i82557c.0 has no peer
qemu-system-ppc64: warning: nic i82558a.0 has no peer
qemu-system-ppc64: warning: nic i82558b.0 has no peer
qemu-system-ppc64: warning: nic i82559a.0 has no peer
qemu-system-ppc64: warning: nic i82559b.0 has no peer
qemu-system-ppc64: warning: nic i82559c.0 has no peer
qemu-system-ppc64: warning: nic i82559er.0 has no peer
qemu-system-ppc64: warning: nic i82562.0 has no peer
qemu-system-ppc64: warning: nic i82801.0 has no peer
qemu-system-ppc64: warning: nic ne2k_pci.0 has no peer
qemu-system-ppc64: warning: nic tulip.0 has no peer
qemu-system-ppc64: warning: nic pcnet.0 has no peer
qemu-system-ppc64: warning: nic vmxnet3.0 has no peer
**
ERROR:../../../../mnt/code/qemu/full/tests/qtest/virtio-iommu-test.c:189:test_attach_detach:
 assertion failed (ret == 0): (6 == 0)

(test program exited with status code -6)
------------------------------------------

Problem is with virtio-iommu-test.c attach_detach test.  My
understanding is that the problem is that for pseries.

$ export QTEST_QEMU_BINARY=./qemu-system-ppc64
$ ./tests/qtest/qos-test -p 
/ppc64/pseries/spapr-pci-host-bridge/pci-bus-spapr/pci-bus/virtio-iommu-pci/virtio-iommu/virtio-iommu-tests/attach_detach
**
ERROR:../../../../mnt/code/qemu/full/tests/qtest/virtio-iommu-test.c:189:test_attach_detach:
 assertion failed (ret == 0): (6 == 0)
Bail out! 
ERROR:../../../../mnt/code/qemu/full/tests/qtest/virtio-iommu-test.c:189:test_attach_detach:
 assertion failed (ret == 0): (6 == 0)
Aborted (core dumped)

My understanding is that if I remove the vga device, pseries end
without any device on the pci bus and somehow it completely breaks.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/qtest/boot-serial-test.c  |  4 ++--
 tests/qtest/dbus-display-test.c |  2 +-
 tests/qtest/display-vga-test.c  | 12 ++++++------
 tests/qtest/libqtest.c          |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index 2f99d71cab..500a312cb5 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -144,7 +144,7 @@ static testdef_t tests[] = {
     { "avr", "arduino-duemilanove", "", "T", sizeof(bios_avr), NULL, bios_avr 
},
     { "avr", "arduino-mega-2560-v3", "", "T", sizeof(bios_avr), NULL, 
bios_avr},
     { "ppc", "ppce500", "", "U-Boot" },
-    { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
+    { "ppc", "40p", "-boot d", "Trying cd:," },
     { "ppc", "g3beige", "", "PowerPC,750" },
     { "ppc", "mac99", "", "PowerPC,G4" },
     { "ppc", "sam460ex", "-m 256", "DRAM:  256 MiB" },
@@ -175,7 +175,7 @@ static testdef_t tests[] = {
       sizeof(kernel_plml605), kernel_plml605 },
     { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
     /* For hppa, force bios to output to serial by disabling graphics. */
-    { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" },
+    { "hppa", "hppa", "", "SeaBIOS wants SYSTEM HALT" },
     { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
       kernel_aarch64 },
     { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 },
diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 8be5974763..4e428cff55 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -34,7 +34,7 @@ test_setup(QTestState **qts, GDBusConnection **conn)
 {
     int pair[2];
 
-    *qts = qtest_init("-display dbus,p2p=yes -name dbus-test");
+    *qts = qtest_init("-display dbus,p2p=yes -device VGA -name dbus-test");
 
     g_assert_cmpint(socketpair(AF_UNIX, SOCK_STREAM, 0, pair), ==, 0);
 
diff --git a/tests/qtest/display-vga-test.c b/tests/qtest/display-vga-test.c
index ace3bb28e0..ba3d1fcb36 100644
--- a/tests/qtest/display-vga-test.c
+++ b/tests/qtest/display-vga-test.c
@@ -12,37 +12,37 @@
 
 static void pci_cirrus(void)
 {
-    qtest_start("-vga none -device cirrus-vga");
+    qtest_start("-device cirrus-vga");
     qtest_end();
 }
 
 static void pci_stdvga(void)
 {
-    qtest_start("-vga none -device VGA");
+    qtest_start("-device VGA");
     qtest_end();
 }
 
 static void pci_secondary(void)
 {
-    qtest_start("-vga none -device secondary-vga");
+    qtest_start("-device secondary-vga");
     qtest_end();
 }
 
 static void pci_multihead(void)
 {
-    qtest_start("-vga none -device VGA -device secondary-vga");
+    qtest_start("-device VGA -device secondary-vga");
     qtest_end();
 }
 
 static void pci_virtio_gpu(void)
 {
-    qtest_start("-vga none -device virtio-gpu-pci");
+    qtest_start("-device virtio-gpu-pci");
     qtest_end();
 }
 
 static void pci_virtio_vga(void)
 {
-    qtest_start("-vga none -device virtio-vga");
+    qtest_start("-device virtio-vga");
     qtest_end();
 }
 
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index ee84dbfc36..16068b1b85 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -291,6 +291,7 @@ QTestState *qtest_init_without_qmp_handshake(const char 
*extra_args)
                               "-mon chardev=char0,mode=control "
                               "-display none "
                               "-net none "
+                              "-vga none "
                               "%s"
                               " -accel qtest",
                               qemu_binary, tracearg, socket_path,
-- 
2.37.2