diff options
author | Asias He <asias@redhat.com> | 2016-07-28 10:36:35 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2016-08-01 19:57:30 -0400 |
commit | 304ba62fd4e670c1a5784585da0fac9f7309ef6c (patch) | |
tree | 3ce5ae9712434027383a074756eaa7841e0f4b28 /net | |
parent | 433fc58e6bf2c8bd97e57153ed28e64fd78207b8 (diff) |
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 'net')
-rw-r--r-- | net/vmw_vsock/Kconfig | 20 | ||||
-rw-r--r-- | net/vmw_vsock/Makefile | 6 |
2 files changed, 26 insertions, 0 deletions
diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig index 14810abedc2e..8831e7c42167 100644 --- a/net/vmw_vsock/Kconfig +++ b/net/vmw_vsock/Kconfig | |||
@@ -26,3 +26,23 @@ config VMWARE_VMCI_VSOCKETS | |||
26 | 26 | ||
27 | To compile this driver as a module, choose M here: the module | 27 | To compile this driver as a module, choose M here: the module |
28 | will be called vmw_vsock_vmci_transport. If unsure, say N. | 28 | will be called vmw_vsock_vmci_transport. If unsure, say N. |
29 | |||
30 | config VIRTIO_VSOCKETS | ||
31 | tristate "virtio transport for Virtual Sockets" | ||
32 | depends on VSOCKETS && VIRTIO | ||
33 | select VIRTIO_VSOCKETS_COMMON | ||
34 | help | ||
35 | This module implements a virtio transport for Virtual Sockets. | ||
36 | |||
37 | Enable this transport if your Virtual Machine host supports Virtual | ||
38 | Sockets over virtio. | ||
39 | |||
40 | To compile this driver as a module, choose M here: the module will be | ||
41 | called vmw_vsock_virtio_transport. If unsure, say N. | ||
42 | |||
43 | config VIRTIO_VSOCKETS_COMMON | ||
44 | tristate | ||
45 | help | ||
46 | This option is selected by any driver which needs to access | ||
47 | the virtio_vsock. The module will be called | ||
48 | vmw_vsock_virtio_transport_common. | ||
diff --git a/net/vmw_vsock/Makefile b/net/vmw_vsock/Makefile index 2ce52d70f224..bc27c70e0e59 100644 --- a/net/vmw_vsock/Makefile +++ b/net/vmw_vsock/Makefile | |||
@@ -1,7 +1,13 @@ | |||
1 | obj-$(CONFIG_VSOCKETS) += vsock.o | 1 | obj-$(CONFIG_VSOCKETS) += vsock.o |
2 | obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o | 2 | obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o |
3 | obj-$(CONFIG_VIRTIO_VSOCKETS) += vmw_vsock_virtio_transport.o | ||
4 | obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += vmw_vsock_virtio_transport_common.o | ||
3 | 5 | ||
4 | vsock-y += af_vsock.o vsock_addr.o | 6 | vsock-y += af_vsock.o vsock_addr.o |
5 | 7 | ||
6 | vmw_vsock_vmci_transport-y += vmci_transport.o vmci_transport_notify.o \ | 8 | vmw_vsock_vmci_transport-y += vmci_transport.o vmci_transport_notify.o \ |
7 | vmci_transport_notify_qstate.o | 9 | vmci_transport_notify_qstate.o |
10 | |||
11 | vmw_vsock_virtio_transport-y += virtio_transport.o | ||
12 | |||
13 | vmw_vsock_virtio_transport_common-y += virtio_transport_common.o | ||