mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-05 02:52:17 +00:00
de993ec0d9
- removed some Hyper-V patches which were picked up between 4.4.20 and 4.4.21 - udate aufs Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
107 lines
3.4 KiB
Diff
107 lines
3.4 KiB
Diff
From 30e1801c9e9683512a0cd169edf015923497dd70 Mon Sep 17 00:00:00 2001
|
|
From: Asias He <asias@redhat.com>
|
|
Date: Thu, 28 Jul 2016 15:36:35 +0100
|
|
Subject: [PATCH 10/42] 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>
|
|
(cherry picked from commit 304ba62fd4e670c1a5784585da0fac9f7309ef6c)
|
|
---
|
|
drivers/vhost/Kconfig | 14 ++++++++++++++
|
|
drivers/vhost/Makefile | 4 ++++
|
|
net/vmw_vsock/Kconfig | 20 ++++++++++++++++++++
|
|
net/vmw_vsock/Makefile | 6 ++++++
|
|
4 files changed, 44 insertions(+)
|
|
|
|
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
|
|
index 533eaf0..2b5f588 100644
|
|
--- a/drivers/vhost/Kconfig
|
|
+++ b/drivers/vhost/Kconfig
|
|
@@ -21,6 +21,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 e0441c3..6b012b9 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
|
|
diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
|
|
index 14810ab..8831e7c 100644
|
|
--- 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 2ce52d7..bc27c70 100644
|
|
--- 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
|
|
--
|
|
2.10.0
|
|
|