summaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorAsias He <asias@redhat.com>2016-07-28 15:36:35 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-08-02 02:57:30 +0300
commit304ba62fd4e670c1a5784585da0fac9f7309ef6c (patch)
tree3ce5ae9712434027383a074756eaa7841e0f4b28 /drivers/vhost
parent433fc58e6bf2c8bd97e57153ed28e64fd78207b8 (diff)
downloadlinux-stable-304ba62fd4e670c1a5784585da0fac9f7309ef6c.tar.gz
linux-stable-304ba62fd4e670c1a5784585da0fac9f7309ef6c.tar.bz2
linux-stable-304ba62fd4e670c1a5784585da0fac9f7309ef6c.zip
VSOCK: Add Makefile and Kconfig
Enable virtio-vsock and vhost-vsock. Signed-off-by: Asias He <asias@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/Kconfig14
-rw-r--r--drivers/vhost/Makefile4
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index 387d30d8f2a8..f77f15bd3b0c 100644
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -19,6 +19,20 @@ config VHOST_SCSI
Say M here to enable the vhost_scsi TCM fabric module
for use with virtio-scsi guests
+config VHOST_VSOCK
+ tristate "vhost virtio-vsock driver"
+ depends on VSOCKETS && EVENTFD
+ select VIRTIO_VSOCKETS_COMMON
+ select VHOST
+ default n
+ ---help---
+ This kernel module can be loaded in the host kernel to provide AF_VSOCK
+ sockets for communicating with guests. The guests must have the
+ virtio_transport.ko driver loaded to use the virtio-vsock device.
+
+ To compile this driver as a module, choose M here: the module will be called
+ vhost_vsock.
+
config VHOST_RING
tristate
---help---
diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile
index e0441c34db1c..6b012b986b57 100644
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@ -4,5 +4,9 @@ vhost_net-y := net.o
obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
vhost_scsi-y := scsi.o
+obj-$(CONFIG_VHOST_VSOCK) += vhost_vsock.o
+vhost_vsock-y := vsock.o
+
obj-$(CONFIG_VHOST_RING) += vringh.o
+
obj-$(CONFIG_VHOST) += vhost.o