diff mbox series

[PULL,24/54] vfio: express vfio dependencies with Kconfig

Message ID	1551723614-1823-25-git-send-email-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:44 +0100 Message-Id: <1551723614-1823-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 24/54] vfio: express vfio dependencies with Kconfig Precedence: list Cc: Yang Zhong <yang.zhong@intel.com>, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/54] block: fix recursion in hw/block/dataplane \| expand [PULL,01/54] block: fix recursion in hw/block/dataplane [PULL,02/54] 9pfs: remove unnecessary conditionals [PULL,03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA [PULL,04/54] minikconfig: add parser skeleton [PULL,05/54] minikconfig: add AST [PULL,06/54] minikconfig: add semantic analysis [PULL,07/54] hw/display: make edid configurable [PULL,08/54] kconfig: introduce kconfig files [PULL,09/54] build: switch to Kconfig [PULL,10/54] minikconfig: implement allnoconfig and defconfig modes [PULL,11/54] kconfig: introduce CONFIG_TEST_DEVICES [PULL,12/54] ide: express dependencies with Kconfig [PULL,13/54] hw/pci/Makefile.objs: make pcie configurable [PULL,14/54] isa: express dependencies with kconfig [PULL,15/54] build: convert pci.mak to Kconfig [PULL,16/54] build: convert sound.mak to Kconfig [PULL,17/54] scsi: express dependencies with Kconfig [PULL,18/54] build: convert usb.mak to Kconfig [PULL,19/54] i386: express dependencies with Kconfig [PULL,20/54] i2c: express dependencies with Kconfig [PULL,21/54] ptimer: express dependencies with Kconfig [PULL,22/54] display: express dependencies with kconfig [PULL,23/54] hyperv: express dependencies with kconfig [PULL,24/54] vfio: express vfio dependencies with Kconfig [PULL,25/54] virtio: express virtio dependencies with Kconfig [PULL,26/54] tpm: express dependencies with Kconfig [PULL,27/54] isa: express SuperIO dependencies with Kconfig [PULL,28/54] ssi: express dependencies with kconfig [PULL,29/54] sd: express dependencies with kconfig [PULL,30/54] ipmi: express dependencies with kconfig [PULL,31/54] i386-softmmu.mak: remove all CONFIG_* except boards definitions [PULL,32/54] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig [PULL,33/54] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig [PULL,34/54] ppc: Express dependencies of the Mac machines with kconfig [PULL,35/54] ppc: Express dependencies of the Sam460EX machines with kconfig [PULL,36/54] ppc: Express dependencies of the embedded machines with kconfig [PULL,37/54] alpha-softmmu.mak: express dependencies with Kconfig [PULL,38/54] cris-softmmu.mak: express dependencies with Kconfig [PULL,39/54] hppa-softmmu.mak: express dependencies with Kconfig [PULL,40/54] lm32-softmmu.mak: express dependencies with Kconfig [PULL,41/54] m68k-softmmu.mak: express dependencies with Kconfig [PULL,42/54] microblaze-softmmu.mak: express dependencies with Kconfig [PULL,43/54] moxie-softmmu.mak: express dependencies with Kconfig [PULL,44/54] nios2-softmmu.mak: express dependencies with Kconfig [PULL,45/54] or1k-softmmu.mak: express dependencies with Kconfig [PULL,46/54] riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives [PULL,47/54] s390x: express dependencies with Kconfig [PULL,48/54] sh4-softmmu.mak: express dependencies with Kconfig [PULL,49/54] sparc-softmmu.mak: express dependencies with Kconfig [PULL,50/54] sparc64-softmmu.mak: express dependencies with Kconfig [PULL,51/54] unicore32-softmmu.mak: express dependencies with Kconfig [PULL,52/54] xtensa-softmmu.mak: express dependencies with Kconfig [PULL,53/54] .travis.yml: test that no-default-device builds do not regress [PULL,54/54] kconfig: add documentation

Commit Message

Paolo Bonzini March 4, 2019, 6:19 p.m. UTC

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/arm-softmmu.mak |  2 --
 hw/vfio/Kconfig                 | 13 ++++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b7b0542..40e1a1a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -123,8 +123,6 @@  CONFIG_VERSATILE_I2C=y
 
 CONFIG_PCI_EXPRESS=y
 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_VFIO_XGMAC=y
-CONFIG_VFIO_AMD_XGBE=y
 
 CONFIG_SDHCI=y
 CONFIG_INTEGRATOR=y
diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig
index 0fdff10..ebda9fd 100644
--- a/hw/vfio/Kconfig
+++ b/hw/vfio/Kconfig
@@ -9,21 +9,28 @@  config VFIO_PCI
 
 config VFIO_CCW
     bool
+    default y
     select VFIO
-    depends on LINUX
+    depends on LINUX && S390_CCW_VIRTIO
 
 config VFIO_PLATFORM
     bool
+    default y
     select VFIO
-    depends on LINUX
+    depends on LINUX && PLATFORM_BUS
 
 config VFIO_XGMAC
     bool
+    default y
+    depends on VFIO_PLATFORM
 
 config VFIO_AMD_XGBE
     bool
+    default y
+    depends on VFIO_PLATFORM
 
 config VFIO_AP
     bool
+    default y
     select VFIO
-    depends on LINUX
+    depends on LINUX && S390_CCW_VIRTIO