mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kconfig: add dependencies on CONFIG_MSI_NONBROKEN

Browse Source 
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>
This commit is contained in:
Paolo Bonzini 2019-03-14 14:09:09 +01:00
parent ca9b7e29de
commit d6c1bd4a22
8 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Kconfig.host
View File

@ -31,3 +31,6 @@ config XEN
config VIRTFS config VIRTFS
bool bool
config PVRDMA
bool

3
Makefile
View File

@ -356,7 +356,8 @@ MINIKCONF_ARGS = \
CONFIG_X11=$(CONFIG_X11) \ CONFIG_X11=$(CONFIG_X11) \
CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \ CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \
CONFIG_VIRTFS=$(CONFIG_VIRTFS) \ 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_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \

1
hw/Kconfig
View File

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

4
hw/misc/Kconfig
View File

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

4
hw/net/Kconfig
View File

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

6
hw/pci-bridge/Kconfig
View File

@ -1,7 +1,7 @@
config PCIE_PORT config PCIE_PORT
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI_EXPRESS depends on PCI_EXPRESS && MSI_NONBROKEN
config PXB config PXB
bool bool
@ -10,12 +10,12 @@ config PXB
config XIO3130 config XIO3130
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI_EXPRESS depends on PCI_EXPRESS && MSI_NONBROKEN
config IOH3420 config IOH3420
bool bool
default y if PCI_DEVICES default y if PCI_DEVICES
depends on PCI_EXPRESS depends on PCI_EXPRESS && MSI_NONBROKEN
config I82801B11 config I82801B11
bool bool

3
hw/rdma/Kconfig Normal file
View File

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

6
hw/rdma/Makefile.objs
View File

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