From nobody Fri Jun 28 05:45:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548228218918954.6366673881313; Tue, 22 Jan 2019 23:23:38 -0800 (PST) Received: from localhost ([127.0.0.1]:57095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCsr-0005vM-PU for importer@patchew.org; Wed, 23 Jan 2019 02:23:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCWI-000538-67 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCWB-0003n4-H5 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:18 -0500 Received: from mga18.intel.com ([134.134.136.126]:36921) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCWB-0002NF-5z for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:11 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2019 22:59:27 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:59:24 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="129980985" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:04 +0800 Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123065618.3520-1-yang.zhong@intel.com> References: <20190123065618.3520-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [RFC PATCH v4 30/44] build: convert pci.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, "Michael S . Tsirkin" , pbonzini@redhat.com, sameo@linux.intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini 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. Done mostly with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -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 Acked-by: Richard Henderson --- default-configs/alpha-softmmu.mak | 2 +- default-configs/arm-softmmu.mak | 2 +- default-configs/hppa-softmmu.mak | 2 +- default-configs/i386-softmmu.mak | 4 +-- default-configs/mips-softmmu-common.mak | 2 +- default-configs/pci.mak | 48 ------------------------- default-configs/ppc-softmmu.mak | 2 +- default-configs/riscv32-softmmu.mak | 3 +- default-configs/riscv64-softmmu.mak | 3 +- default-configs/sh4-softmmu.mak | 2 +- default-configs/sh4eb-softmmu.mak | 2 +- default-configs/sparc64-softmmu.mak | 2 +- hw/audio/Kconfig | 6 ++++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 15 +++++++- hw/ide/Kconfig | 3 ++ hw/ipack/Kconfig | 2 ++ hw/misc/Kconfig | 4 +++ hw/net/Kconfig | 23 ++++++++++++ hw/pci-bridge/Kconfig | 4 +++ hw/pci-host/Kconfig | 4 +++ hw/pci/Kconfig | 1 + hw/scsi/Kconfig | 11 ++++++ hw/sd/Kconfig | 3 ++ hw/usb/Kconfig | 10 ++++++ hw/virtio/Kconfig | 3 ++ hw/watchdog/Kconfig | 2 ++ 28 files changed, 105 insertions(+), 64 deletions(-) delete mode 100644 default-configs/pci.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 400dff3c1c..e583177e79 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for alpha-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 93983d0be0..67dd1d9531 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for arm-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 846e9f0ba6..673ae5a7cf 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,5 +1,5 @@ -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 66829feada..c885869634 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,11 +1,10 @@ # Default configuration for i386-softmmu =20 -include pci.mak +CONFIG_PCI=3Dy include sound.mak include usb.mak include hyperv.mak CONFIG_VGA_ISA=3Dy -CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy @@ -52,7 +51,6 @@ CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 479fb4d900..ecb45276f3 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,8 +1,8 @@ # Common mips*-softmmu CONFIG defines =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_ESP=3Dy CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak deleted file mode 100644 index b17b456b1e..0000000000 --- a/default-configs/pci.mak +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_PCI=3Dy -CONFIG_PCI_EXPRESS=3Dy -# For now, CONFIG_IDE_CORE requires ISA, so we enable it here -CONFIG_ISA_BUS=3Dy -CONFIG_VIRTIO_PCI=3Dy -include virtio.mak -CONFIG_USB_UHCI=3Dy -CONFIG_USB_OHCI=3Dy -CONFIG_USB_EHCI=3Dy -CONFIG_USB_XHCI=3Dy -CONFIG_USB_XHCI_NEC=3Dy -CONFIG_NE2000_PCI=3Dy -CONFIG_EEPRO100_PCI=3Dy -CONFIG_PCNET_PCI=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_AC97=3Dy -CONFIG_HDA=3Dy -CONFIG_ES1370=3Dy -CONFIG_SCSI=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy -CONFIG_MEGASAS_SCSI_PCI=3Dy -CONFIG_MPTSAS_SCSI_PCI=3Dy -CONFIG_RTL8139_PCI=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_AHCI=3Dy -CONFIG_ESP=3Dy -CONFIG_ESP_PCI=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_SERIAL_PCI=3Dy -CONFIG_CAN_BUS=3Dy -CONFIG_CAN_SJA1000=3Dy -CONFIG_CAN_PCI=3Dy -CONFIG_IPACK=3Dy -CONFIG_WDT_IB6300ESB=3Dy -CONFIG_PCI_TESTDEV=3Dy -CONFIG_NVME_PCI=3Dy -CONFIG_SD=3Dy -CONFIG_SDHCI=3Dy -CONFIG_EDU=3Dy -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy -CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) -CONFIG_ROCKER=3Dy -CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 7f80f0ccba..2d69adfabd 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for ppc-softmmu =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 65337166e1..018c017341 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,8 +1,7 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 65337166e1..018c017341 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,8 +1,7 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1fdb009151..8382504d11 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for sh4-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3b550a5fe8..a77e1538e9 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for sh4eb-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1fae4888db..db393d9eb3 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for sparc64-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy CONFIG_M48T59=3Dy CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 207baee6e1..af34bbcf0c 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -3,9 +3,13 @@ config SB16 =20 config ES1370 bool + default y + depends on PCI =20 config AC97 bool + default y + depends on PCI =20 config ADLIB bool @@ -18,6 +22,8 @@ config CS4231A =20 config HDA bool + default y + depends on PCI =20 config PCSPK bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 9d418bce4d..3710434436 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -21,6 +21,8 @@ config ONENAND =20 config NVME_PCI bool + default y + depends on PCI =20 config VIRTIO_BLK bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 26c13243cf..1ed6f0dbce 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -15,6 +15,8 @@ config SERIAL_ISA =20 config SERIAL_PCI bool + default y + depends on PCI =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 132aeffdbe..6bcfc10bcb 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 =20 config VGA_CIRRUS bool + default y + depends on PCI + select VGA =20 config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 =20 config VGA_PCI bool + default y + depends on PCI + select VGA =20 config VGA_ISA bool @@ -39,9 +45,15 @@ config VGA_ISA_MM =20 config VMWARE_VGA bool + default y + depends on PCI + select VGA =20 config BOCHS_DISPLAY bool + default y + depends on PCI + select VGA =20 config BLIZZARD bool @@ -67,7 +79,8 @@ config VGA =20 config QXL bool - depends on SPICE + depends on SPICE && PCI + select VGA =20 config VIRTIO_GPU bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index fe27705790..3778580df2 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -7,6 +7,7 @@ config IDE_QDEV =20 config IDE_PCI bool + depends on PCI select IDE_CORE =20 config IDE_ISA @@ -42,6 +43,8 @@ config MICRODRIVE =20 config AHCI bool + default y + depends on PCI select IDE_QDEV =20 config IDE_SII3112 diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index 481e0d2e64..98bd21cf0f 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,2 +1,4 @@ config IPACK bool + default y + depends on PCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index cc8dbed24e..1ca4b2464e 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -21,9 +21,13 @@ config ISA_TESTDEV =20 config PCI_TESTDEV bool + default y + depends on PCI =20 config EDU bool + default y + depends on PCI =20 config PCA9552 bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d358b2cd25..887c596f70 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -3,27 +3,42 @@ config DP8393X =20 config NE2000_PCI bool + default y + depends on PCI =20 config EEPRO100_PCI bool + default y + depends on PCI =20 config PCNET_PCI bool + default y + depends on PCI + select PCNET_COMMON =20 config PCNET_COMMON bool =20 config E1000_PCI bool + default y + depends on PCI =20 config E1000E_PCI_EXPRESS bool + default y + depends on PCI_EXPRESS =20 config RTL8139_PCI bool + default y + depends on PCI =20 config VMXNET3_PCI bool + default y + depends on PCI =20 config SMC91C111 bool @@ -81,12 +96,20 @@ config ETSEC =20 config ROCKER bool + default y + depends on PCI =20 config CAN_BUS bool =20 config CAN_PCI bool + default y + depends on PCI + select CAN_BUS =20 config CAN_SJA1000 bool + default y + depends on PCI + select CAN_BUS diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index bb19b7aac1..c8ccf71259 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,14 +1,18 @@ config PCIE_PORT bool + default y + depends on PCI_EXPRESS =20 config PXB bool =20 config XIO3130 bool + depends on PCI_EXPRESS =20 config IOH3420 bool + depends on PCI_EXPRESS =20 config I82801B11 bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 2edc5bbc9a..80d483e0e9 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -24,12 +24,16 @@ config PCI_PIIX =20 config PCI_EXPRESS_Q35 bool + select PCI_EXPRESS =20 config PCI_EXPRESS_GENERIC_BRIDGE bool + select PCI_EXPRESS =20 config PCI_EXPRESS_XILINX bool + select PCI_EXPRESS =20 config PCI_EXPRESS_DESIGNWARE bool + select PCI_EXPRESS diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 81533b9dc0..4ca2537980 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -3,3 +3,4 @@ config PCI =20 config PCI_EXPRESS bool + select PCI diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index eb78478ef0..812a12522b 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -3,21 +3,32 @@ config SCSI =20 config LSI_SCSI_PCI bool + default y + depends on PCI =20 config MPTSAS_SCSI_PCI bool + default y + depends on PCI =20 config MEGASAS_SCSI_PCI bool + default y + depends on PCI =20 config VMW_PVSCSI_SCSI_PCI bool + default y + depends on PCI =20 config ESP bool =20 config ESP_PCI bool + default y + depends on PCI + select ESP =20 config VIRTIO_SCSI bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 4f43bbb352..90ac74950a 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -9,3 +9,6 @@ config SD =20 config SDHCI bool + default y + depends on PCI + select SD diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index cbf5c5d761..f23c542d27 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -3,21 +3,31 @@ config USB =20 config USB_UHCI bool + default y + depends on PCI =20 config USB_OHCI bool + default y + depends on PCI =20 config USB_EHCI bool + default y + depends on PCI =20 config USB_EHCI_SYSBUS bool =20 config USB_XHCI bool + default y + depends on PCI =20 config USB_XHCI_NEC bool + default y + depends on PCI =20 config USB_MUSB bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index ebf18124fb..aabd6d4d96 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -6,6 +6,9 @@ config VIRTIO_RNG =20 config VIRTIO_PCI bool + default y + depends on PCI + select VIRTIO =20 config VIRTIO_MMIO bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index cd0244f4e1..4e24bf8240 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG =20 config WDT_IB6300ESB bool + default y + depends on PCI =20 config WDT_IB700 bool --=20 2.17.1