Commit 213e7721 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

vhost: revert "vhost: disable for OABI" 



This reverts commit d085eb8c ("vhost: disable for OABI")
With commit "virtio: force spec specified alignment on types"
in place, we force proper alignment for all structures,
so there's no longer a reason to blacklist OABI.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a865e420

drivers/misc/mic/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ config MIC_COSM 


config VOP

	tristate "VOP Driver"

	depends on VOP_BUS && VHOST_DPN

	depends on VOP_BUS

	select VHOST_RING

	select VIRTIO

	help

drivers/net/caif/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config CAIF_HSI 


config CAIF_VIRTIO

	tristate "CAIF virtio transport driver"

	depends on CAIF && HAS_DMA && VHOST_DPN

	depends on CAIF && HAS_DMA

	select VHOST_RING

	select VIRTIO

	select GENERIC_ALLOCATOR

drivers/vdpa/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ if VDPA 


config VDPA_SIM

	tristate "vDPA device simulator"

	depends on RUNTIME_TESTING_MENU && HAS_DMA && VHOST_DPN

	depends on RUNTIME_TESTING_MENU && HAS_DMA

	select VHOST_RING

	default n

	help

drivers/vhost/Kconfig

+4 −13
Original line number Diff line number Diff line
@@ -13,15 +13,6 @@ config VHOST_RING 
	  This option is selected by any driver which needs to access

	  the host side of a virtio ring.



config VHOST_DPN

	bool

	depends on !ARM || AEABI

	default y

	help

	  Anything selecting VHOST or VHOST_RING must depend on VHOST_DPN.

	  This excludes the deprecated ARM ABI since that forces a 4 byte

	  alignment on all structs - incompatible with virtio spec requirements.



config VHOST

	tristate

	select VHOST_IOTLB
@@ -37,7 +28,7 @@ if VHOST_MENU 


config VHOST_NET

	tristate "Host kernel accelerator for virtio net"

	depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) && VHOST_DPN

	depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP)

	select VHOST

	---help---

	  This kernel module can be loaded in host kernel to accelerate
@@ -49,7 +40,7 @@ config VHOST_NET 


config VHOST_SCSI

	tristate "VHOST_SCSI TCM fabric driver"

	depends on TARGET_CORE && EVENTFD && VHOST_DPN

	depends on TARGET_CORE && EVENTFD

	select VHOST

	default n

	---help---
@@ -58,7 +49,7 @@ config VHOST_SCSI 


config VHOST_VSOCK

	tristate "vhost virtio-vsock driver"

	depends on VSOCKETS && EVENTFD && VHOST_DPN

	depends on VSOCKETS && EVENTFD

	select VHOST

	select VIRTIO_VSOCKETS_COMMON

	default n
@@ -72,7 +63,7 @@ config VHOST_VSOCK 


config VHOST_VDPA

	tristate "Vhost driver for vDPA-based backend"

	depends on EVENTFD && VHOST_DPN

	depends on EVENTFD

	select VHOST

	depends on VDPA

	help