Browse Source

kconfig: add dependencies on CONFIG_MSI_NONBROKEN

For devices that require msi_init/msix_init to succeed, add a
dependency on CONFIG_MSI_NONBROKEN.  This will prevent those devices
from appearing in a binary that cannot instantiate them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
tags/v4.0.0-rc2
Paolo Bonzini 6 months ago
parent
commit
d6c1bd4a22
8 changed files with 18 additions and 12 deletions
  1. 3
    0
      Kconfig.host
  2. 2
    1
      Makefile
  3. 1
    0
      hw/Kconfig
  4. 2
    2
      hw/misc/Kconfig
  5. 2
    2
      hw/net/Kconfig
  6. 3
    3
      hw/pci-bridge/Kconfig
  7. 3
    0
      hw/rdma/Kconfig
  8. 2
    4
      hw/rdma/Makefile.objs

+ 3
- 0
Kconfig.host View File

@@ -31,3 +31,6 @@ config XEN

config VIRTFS
bool

config PVRDMA
bool

+ 2
- 1
Makefile View File

@@ -356,7 +356,8 @@ MINIKCONF_ARGS = \
CONFIG_X11=$(CONFIG_X11) \
CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \
CONFIG_VIRTFS=$(CONFIG_VIRTFS) \
CONFIG_LINUX=$(CONFIG_LINUX)
CONFIG_LINUX=$(CONFIG_LINUX) \
CONFIG_PVRDMA=$(CONFIG_PVRDMA)

MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \

+ 1
- 0
hw/Kconfig View File

@@ -26,6 +26,7 @@ source pci-bridge/Kconfig
source pci-host/Kconfig
source pcmcia/Kconfig
source pci/Kconfig
source rdma/Kconfig
source scsi/Kconfig
source sd/Kconfig
source smbios/Kconfig

+ 2
- 2
hw/misc/Kconfig View File

@@ -34,7 +34,7 @@ config PCI_TESTDEV
config EDU
bool
default y if TEST_DEVICES
depends on PCI
depends on PCI && MSI_NONBROKEN

config PCA9552
bool
@@ -67,7 +67,7 @@ config MACIO
config IVSHMEM_DEVICE
bool
default y if PCI_DEVICES
depends on PCI && LINUX && IVSHMEM
depends on PCI && LINUX && IVSHMEM && MSI_NONBROKEN

config ECCMEMCTL
bool

+ 2
- 2
hw/net/Kconfig View File

@@ -28,7 +28,7 @@ config E1000_PCI
config E1000E_PCI_EXPRESS
bool
default y if PCI_DEVICES
depends on PCI_EXPRESS
depends on PCI_EXPRESS && MSI_NONBROKEN

config RTL8139_PCI
bool
@@ -107,7 +107,7 @@ config ETSEC
config ROCKER
bool
default y if PCI_DEVICES
depends on PCI
depends on PCI && MSI_NONBROKEN

config CAN_BUS
bool

+ 3
- 3
hw/pci-bridge/Kconfig View File

@@ -1,7 +1,7 @@
config PCIE_PORT
bool
default y if PCI_DEVICES
depends on PCI_EXPRESS
depends on PCI_EXPRESS && MSI_NONBROKEN

config PXB
bool
@@ -10,12 +10,12 @@ config PXB
config XIO3130
bool
default y if PCI_DEVICES
depends on PCI_EXPRESS
depends on PCI_EXPRESS && MSI_NONBROKEN

config IOH3420
bool
default y if PCI_DEVICES
depends on PCI_EXPRESS
depends on PCI_EXPRESS && MSI_NONBROKEN

config I82801B11
bool

+ 3
- 0
hw/rdma/Kconfig View File

@@ -0,0 +1,3 @@
config VMW_PVRDMA
default y if PCI_DEVICES
depends on PVRDMA && PCI && MSI_NONBROKEN

+ 2
- 4
hw/rdma/Makefile.objs View File

@@ -1,5 +1,3 @@
ifeq ($(CONFIG_PVRDMA),y)
obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o
obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
obj-$(CONFIG_VMW_PVRDMA) += rdma_utils.o rdma_backend.o rdma_rm.o
obj-$(CONFIG_VMW_PVRDMA) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \
vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o
endif

Loading…
Cancel
Save