autotest / virt-test

Linux Virtualization Tests
Other
97 stars 139 forks source link

virt-test: remove display configuration #2270

Closed xutian closed 9 years ago

xutian commented 9 years ago

display variants in commit 727ebae broken testing in ARM and PPC testing, so remove this part of configuration.

Signed-off-by: Xu Tian xutian@redhat.com

ldoktor commented 9 years ago

OK, quite radical solution, I had something like:

diff --git a/shared/cfg/guest-hw.cfg b/shared/cfg/guest-hw.cfg
index 6cd6e14..b8820a7 100644
--- a/shared/cfg/guest-hw.cfg
+++ b/shared/cfg/guest-hw.cfg
@@ -365,15 +365,8 @@ variants:
         vga = qxl
     - @vnc:
         display = vnc
-        Linux:
-            vga = cirrus
-        Windows:
-            vga = std
-            WinXP, Win2003:
-                vga = cirrus
     - sdl:
         display = sdl
-        vga = cirrus
     - nographic:
         display = nographic
         vga =
diff --git a/shared/cfg/guest-os/Windows/Win2003.cfg b/shared/cfg/guest-os/Windows/Win2003.cfg
index ec9fbf8..c125410 100644
--- a/shared/cfg/guest-os/Windows/Win2003.cfg
+++ b/shared/cfg/guest-os/Windows/Win2003.cfg
@@ -18,3 +18,5 @@
     no iometer_windows.performance.msi_on
     # MSI is not supported on WinXP/2003
     # download.microsoft.com/download/9/c/5/9c5b2167-8017-4bae-9fde-d599bac8184a/PCI-PCIe_FAQ.doc
+    # Windows 2003 only supports cirrus
+    vga = cirrus
diff --git a/shared/cfg/guest-os/Windows/WinXP.cfg b/shared/cfg/guest-os/Windows/WinXP.cfg
index 06ce06e..51ec9d5 100644
--- a/shared/cfg/guest-os/Windows/WinXP.cfg
+++ b/shared/cfg/guest-os/Windows/WinXP.cfg
@@ -18,3 +18,5 @@
     # netsh interface set interface name="Local Area Connection" admin=DISABLED
     # this cmd works since Win2003
     # http://support.microsoft.com/kb/262265 http://forum.sysinternals.com/command-used-to-disable-network-interface_topic9483_page1.html
+    # WinXP supports only cirrus
+    vga = cirrus

in mind, but if that doesn't suit your needs and if the variants are not being used in upstream, then we better remove them completely.

Acked-by: Lukáš Doktor ldoktor@redhat.com