diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b7b05421e4..40e1a1abed 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 0fdff10c13..ebda9fdf22 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