Commit d6c1bd4a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ca9b7e29

Kconfig.host

+3 −0
Original line number Diff line number Diff line
@@ -31,3 +31,6 @@ config XEN 


config VIRTFS

    bool



config PVRDMA

    bool

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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 \

hw/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

hw/misc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

hw/net/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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