Re: [Qemu-riscv] [RFC PATCH 1/3] hw/Kconfig: PCI bus implies PCI_DEVICES

[Thomas Huth]

On 15/07/2019 11.55, Philippe Mathieu-Daudé wrote:
> If a controller device provides a PCI bus, we can plug any PCI
> daughter card on it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
>  docs/devel/kconfig.rst | 1 -
>  hw/alpha/Kconfig       | 1 -
>  hw/arm/Kconfig         | 4 ----
>  hw/hppa/Kconfig        | 1 -
>  hw/i386/Kconfig        | 1 -
>  hw/pci/Kconfig         | 1 +
>  hw/ppc/Kconfig         | 6 ------
>  hw/riscv/Kconfig       | 1 -
>  hw/sh4/Kconfig         | 1 -
>  hw/sparc64/Kconfig     | 1 -
>  10 files changed, 1 insertion(+), 17 deletions(-)
> 
> diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst
> index d6f8eb0977..6c010d38d4 100644
> --- a/docs/devel/kconfig.rst
> +++ b/docs/devel/kconfig.rst
> @@ -56,7 +56,6 @@ stanza like the following::
>  
>        config ARM_VIRT
>           bool
> -         imply PCI_DEVICES
>           imply VFIO_AMD_XGBE
>           imply VFIO_XGMAC
>           select A15MPCORE
> diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig
> index 15c59ff264..ddac1bf8e5 100644
> --- a/hw/alpha/Kconfig
> +++ b/hw/alpha/Kconfig
> @@ -1,6 +1,5 @@
>  config DP264
>      bool
> -    imply PCI_DEVICES
>      imply TEST_DEVICES
>      imply E1000_PCI
>      select I82374
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index ab65ecd216..51db042a0a 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -1,6 +1,5 @@
>  config ARM_VIRT
>      bool
> -    imply PCI_DEVICES
>      imply TEST_DEVICES
>      imply VFIO_AMD_XGBE
>      imply VFIO_PLATFORM
> @@ -159,7 +158,6 @@ config Z2
>  
>  config REALVIEW
>      bool
> -    imply PCI_DEVICES
>      imply PCI_TESTDEV
>      select SMC91C111
>      select LAN9118
> @@ -186,7 +184,6 @@ config REALVIEW
>  
>  config SBSA_REF
>      bool
> -    imply PCI_DEVICES
>      select AHCI
>      select ARM_SMMUV3
>      select GPIO_KEY
> @@ -365,7 +362,6 @@ config MPS2
>  
>  config FSL_IMX7
>      bool
> -    imply PCI_DEVICES
>      imply TEST_DEVICES
>      select A15MPCORE
>      select PCI
> diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig
> index 6e5d74a825..13183ff243 100644
> --- a/hw/hppa/Kconfig
> +++ b/hw/hppa/Kconfig
> @@ -1,6 +1,5 @@
>  config DINO
>      bool
> -    imply PCI_DEVICES
>      imply E1000_PCI
>      imply VIRTIO_VGA
>      select PCI
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index 4ddf2a9c55..4eceab2c7c 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -10,7 +10,6 @@ config PC
>      imply ISA_IPMI_BT
>      imply ISA_DEBUG
>      imply PARALLEL
> -    imply PCI_DEVICES
>      imply PVPANIC
>      imply QXL
>      imply SEV
> diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig
> index 77f8b005ff..0f7267db35 100644
> --- a/hw/pci/Kconfig
> +++ b/hw/pci/Kconfig
> @@ -1,5 +1,6 @@
>  config PCI
>      bool
> +    imply PCI_DEVICES

No, please don't change this. This was done on purpose, since almost all
PCI_DEVICES do not work on s390x (so s390x does *not* imply PCI_DEVICES).

 Thomas