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 3 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
31 31
 
32 32
 config VIRTFS
33 33
     bool
34
+
35
+config PVRDMA
36
+    bool

+ 2
- 1
Makefile View File

@@ -356,7 +356,8 @@ MINIKCONF_ARGS = \
356 356
     CONFIG_X11=$(CONFIG_X11) \
357 357
     CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \
358 358
     CONFIG_VIRTFS=$(CONFIG_VIRTFS) \
359
-    CONFIG_LINUX=$(CONFIG_LINUX)
359
+    CONFIG_LINUX=$(CONFIG_LINUX) \
360
+    CONFIG_PVRDMA=$(CONFIG_PVRDMA)
360 361
 
361 362
 MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
362 363
 MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \

+ 1
- 0
hw/Kconfig View File

@@ -26,6 +26,7 @@ source pci-bridge/Kconfig
26 26
 source pci-host/Kconfig
27 27
 source pcmcia/Kconfig
28 28
 source pci/Kconfig
29
+source rdma/Kconfig
29 30
 source scsi/Kconfig
30 31
 source sd/Kconfig
31 32
 source smbios/Kconfig

+ 2
- 2
hw/misc/Kconfig View File

@@ -34,7 +34,7 @@ config PCI_TESTDEV
34 34
 config EDU
35 35
     bool
36 36
     default y if TEST_DEVICES
37
-    depends on PCI
37
+    depends on PCI && MSI_NONBROKEN
38 38
 
39 39
 config PCA9552
40 40
     bool
@@ -67,7 +67,7 @@ config MACIO
67 67
 config IVSHMEM_DEVICE
68 68
     bool
69 69
     default y if PCI_DEVICES
70
-    depends on PCI && LINUX && IVSHMEM
70
+    depends on PCI && LINUX && IVSHMEM && MSI_NONBROKEN
71 71
 
72 72
 config ECCMEMCTL
73 73
     bool

+ 2
- 2
hw/net/Kconfig View File

@@ -28,7 +28,7 @@ config E1000_PCI
28 28
 config E1000E_PCI_EXPRESS
29 29
     bool
30 30
     default y if PCI_DEVICES
31
-    depends on PCI_EXPRESS
31
+    depends on PCI_EXPRESS && MSI_NONBROKEN
32 32
 
33 33
 config RTL8139_PCI
34 34
     bool
@@ -107,7 +107,7 @@ config ETSEC
107 107
 config ROCKER
108 108
     bool
109 109
     default y if PCI_DEVICES
110
-    depends on PCI
110
+    depends on PCI && MSI_NONBROKEN
111 111
 
112 112
 config CAN_BUS
113 113
     bool

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

@@ -1,7 +1,7 @@
1 1
 config PCIE_PORT
2 2
     bool
3 3
     default y if PCI_DEVICES
4
-    depends on PCI_EXPRESS
4
+    depends on PCI_EXPRESS && MSI_NONBROKEN
5 5
 
6 6
 config PXB
7 7
     bool
@@ -10,12 +10,12 @@ config PXB
10 10
 config XIO3130
11 11
     bool
12 12
     default y if PCI_DEVICES
13
-    depends on PCI_EXPRESS
13
+    depends on PCI_EXPRESS && MSI_NONBROKEN
14 14
 
15 15
 config IOH3420
16 16
     bool
17 17
     default y if PCI_DEVICES
18
-    depends on PCI_EXPRESS
18
+    depends on PCI_EXPRESS && MSI_NONBROKEN
19 19
 
20 20
 config I82801B11
21 21
     bool

+ 3
- 0
hw/rdma/Kconfig View File

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

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

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

Loading…
Cancel
Save