[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/23] kconfig: add dependencies on CONFIG_MSI_NONBRO
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/23] kconfig: add dependencies on CONFIG_MSI_NONBROKEN |
Date: |
Wed, 27 Mar 2019 13:37:41 +0100 |
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 <address@hidden>
---
Kconfig.host | 3 +++
Makefile | 3 ++-
hw/Kconfig | 1 +
hw/misc/Kconfig | 4 ++--
hw/net/Kconfig | 4 ++--
hw/pci-bridge/Kconfig | 6 +++---
hw/rdma/Kconfig | 3 +++
hw/rdma/Makefile.objs | 6 ++----
8 files changed, 18 insertions(+), 12 deletions(-)
create mode 100644 hw/rdma/Kconfig
diff --git a/Kconfig.host b/Kconfig.host
index add5b17..aec9536 100644
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -31,3 +31,6 @@ config XEN
config VIRTFS
bool
+
+config PVRDMA
+ bool
diff --git a/Makefile b/Makefile
index d8dad39..dbb8e13 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
diff --git a/hw/Kconfig b/hw/Kconfig
index d5ecd02..88b9f15 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -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
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 2c60be9..5f67d0d 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -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
diff --git a/hw/net/Kconfig b/hw/net/Kconfig
index c00ec03..7d7bbc5 100644
--- a/hw/net/Kconfig
+++ b/hw/net/Kconfig
@@ -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
diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
index b167b98..a51ec71 100644
--- a/hw/pci-bridge/Kconfig
+++ b/hw/pci-bridge/Kconfig
@@ -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
diff --git a/hw/rdma/Kconfig b/hw/rdma/Kconfig
new file mode 100644
index 0000000..8e22112
--- /dev/null
+++ b/hw/rdma/Kconfig
@@ -0,0 +1,3 @@
+config VMW_PVRDMA
+ default y if PCI_DEVICES
+ depends on PVRDMA && PCI && MSI_NONBROKEN
diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs
index bd36cbf..533ab2f 100644
--- a/hw/rdma/Makefile.objs
+++ b/hw/rdma/Makefile.objs
@@ -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
--
1.8.3.1
- [Qemu-devel] [PULL 00/23] Misc patches for QEMU 4.0-rc, mostly Kconfig refinements, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 03/23] kconfig: add dependencies on CONFIG_MSI_NONBROKEN,
Paolo Bonzini <=
- [Qemu-devel] [PULL 01/23] riscv: plic: Set msi_nonbroken as true, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 05/23] target/i386: sev: Do not pin the ram device memory region, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 04/23] memory: Fix the memory region type assignment order, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 06/23] hw/char/parallel: Make it possible to compile also without CONFIG_PARALLEL, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 02/23] kconfig: add CONFIG_MSI_NONBROKEN, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 08/23] prep: do not select I82374, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 07/23] hw/i386/Kconfig: PC uses I8257, not I82374, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 10/23] hw/isa/Kconfig: PIIX4 southbridge requires USB UHCI, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 11/23] hw/i386/Kconfig: enable devices that can be created by default, Paolo Bonzini, 2019/03/27
- [Qemu-devel] [PULL 13/23] hw/mips/Kconfig: Fulong 2e board requires ati-vga/rtl8139 PCI devices, Paolo Bonzini, 2019/03/27