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>

diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index 387d30d8f2a807466f33b949dfe4c1d7776629d5..f77f15bd3b0c0307f70f8fe58163daec676ae9ed 100644 (file)
--- 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 e0441c34db1cf81dff8e327fa38400f0bb44bbd3..6b012b986b577d5772c5007e26376c9bc8311ec3 100644 (file)
--- 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

diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
index 14810abedc2ec455adbde24094a5c468477e03d8..8831e7c421672ec5775377748b940793f4f879b1 100644 (file)
--- a/net/vmw_vsock/Kconfig
+++ b/net/vmw_vsock/Kconfig
@@ -26,3 +26,23 @@ config VMWARE_VMCI_VSOCKETS
 
          To compile this driver as a module, choose M here: the module
          will be called vmw_vsock_vmci_transport. If unsure, say N.
+
+config VIRTIO_VSOCKETS
+       tristate "virtio transport for Virtual Sockets"
+       depends on VSOCKETS && VIRTIO
+       select VIRTIO_VSOCKETS_COMMON
+       help
+         This module implements a virtio transport for Virtual Sockets.
+
+         Enable this transport if your Virtual Machine host supports Virtual
+         Sockets over virtio.
+
+         To compile this driver as a module, choose M here: the module will be
+         called vmw_vsock_virtio_transport. If unsure, say N.
+
+config VIRTIO_VSOCKETS_COMMON
+       tristate
+       help
+         This option is selected by any driver which needs to access
+         the virtio_vsock.  The module will be called
+         vmw_vsock_virtio_transport_common.

diff --git a/net/vmw_vsock/Makefile b/net/vmw_vsock/Makefile
index 2ce52d70f22495d9388216cb81e94135446b234e..bc27c70e0e59f76a487af92455ac6542a035f762 100644 (file)
--- a/net/vmw_vsock/Makefile
+++ b/net/vmw_vsock/Makefile
@@ -1,7 +1,13 @@
 obj-$(CONFIG_VSOCKETS) += vsock.o
 obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o
+obj-$(CONFIG_VIRTIO_VSOCKETS) += vmw_vsock_virtio_transport.o
+obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += vmw_vsock_virtio_transport_common.o
 
 vsock-y += af_vsock.o vsock_addr.o
 
 vmw_vsock_vmci_transport-y += vmci_transport.o vmci_transport_notify.o \
        vmci_transport_notify_qstate.o
+
+vmw_vsock_virtio_transport-y += virtio_transport.o
+
+vmw_vsock_virtio_transport_common-y += virtio_transport_common.o