From 7c28b925b7e176b4e44ed05d23cf883561000546 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 23 Jan 2019 14:56:04 +0800 Subject: build: convert pci.mak to Kconfig Instead of including the same list of devices for each target, set CONFIG_PCI to true, and make the devices default to present whenever PCI is available. However, s390x does not want all the PCI devices, so there is a separate symbol to enable them. Done mostly with the following script: while read i; do i=${i%=y}; i=${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y if PCI_DEVICES\' -e' depends on PCI' \ `grep -lw $i hw/*/Kconfig` done < default-configs/pci.mak followed by replacing a few "depends on" clauses with "select" whenever the symbol is not really related to PCI. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- hw/display/Kconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'hw/display/Kconfig') diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1149ea2bcd..9199beb447 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 config VGA_CIRRUS bool + default y if PCI_DEVICES + depends on PCI + select VGA config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 config VGA_PCI bool + default y if PCI_DEVICES + depends on PCI + select VGA config VGA_ISA bool @@ -39,9 +45,15 @@ config VGA_ISA_MM config VMWARE_VGA bool + default y if PCI_DEVICES + depends on PCI + select VGA config BOCHS_DISPLAY bool + default y if PCI_DEVICES + depends on PCI + select VGA config BLIZZARD bool @@ -69,12 +81,16 @@ config VGA config QXL bool depends on SPICE && PCI + select VGA config VIRTIO_GPU bool config VIRTIO_VGA bool + default y if PCI_DEVICES + depends on VIRTIO_PCI + select VGA config DPCD bool -- cgit v1.2.3