virtio-vga: only enable for specific boards

When virtio-vga was added, the intention was to only support it for
those machines where the firmware does not know about virtio-gpu,
and supported VGA legacy hardware before virtio-{gpu,vga} were
introduced.

The Kconfig switch however enabled virtio-vga for all machines with
a PCI bus, and libvirt then prefers it even on hardware where
virtio-gpu would be preferrable.  At least for now, only enable
virtio-vga for PC, hppa and pSeries machines, as was the case
before Kconfig dependencies were introduced.

Reported-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 86c1d544c5ce320eacef874fe4250aeb249665e4..72be57a40311a3d38e162d01ed1197347ac7263a 100644 (file)
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -100,7 +100,7 @@ config VIRTIO_GPU
 
 config VIRTIO_VGA
     bool
-    default y if PCI_DEVICES
+    # defaults to "N", enabled by specific boards
     depends on VIRTIO_PCI
     select VGA
 

diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
index 7334f57081d607fa8a9a6830965066469b51a04d..6e5d74a8257593f0844ceb710862e485ec42eda6 100644 (file)
--- a/hw/hppa/Kconfig
+++ b/hw/hppa/Kconfig
@@ -2,6 +2,7 @@ config DINO
     bool
     imply PCI_DEVICES
     imply E1000_PCI
+    imply VIRTIO_VGA
     select PCI
     select SERIAL
     select ISA_BUS

diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index 8e8444dbf99c3bc63a9f2830ea09b8608448ce2c..a6aed7c1313fd80ac978077c8d1c53bcf1aa41c9 100644 (file)
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -19,6 +19,7 @@ config PC
     imply TPM_CRB
     imply TPM_TIS
     imply VGA_PCI
+    imply VIRTIO_VGA
     select FDC
     select I8259
     select I8254

diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index ae07b4da63b97f4678d7362454308c5e596175a2..a3465155f0471f52036c84bc74c8feb017902149 100644 (file)
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -2,6 +2,7 @@ config PSERIES
     bool
     imply PCI_DEVICES
     imply TEST_DEVICES
+    imply VIRTIO_VGA
     select DIMM
     select PCI
     select SPAPR_VSCSI