Skip to content

Commit

Permalink
VSOCK: Add Makefile and Kconfig
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
Asias He authored and David S. Miller committed Dec 3, 2015
1 parent 98bb892 commit 8a2a202
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/vhost/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@ config VHOST_CROSS_ENDIAN_LEGACY
adds some overhead, it is disabled by default.

If unsure, say "N".

if STAGING
source "drivers/vhost/Kconfig.vsock"
endif
7 changes: 7 additions & 0 deletions drivers/vhost/Kconfig.vsock
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
config VHOST_VSOCK
tristate "vhost virtio-vsock driver"
depends on VSOCKETS && EVENTFD
select VIRTIO_VSOCKETS_COMMON
default n
---help---
Say M here to enable the vhost-vsock for virtio-vsock guests
4 changes: 4 additions & 0 deletions drivers/vhost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 18 additions & 0 deletions net/vmw_vsock/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,21 @@ 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 runs on Qemu/KVM.

To compile this driver as a module, choose M here: the module
will be called virtio_vsock_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.
2 changes: 2 additions & 0 deletions net/vmw_vsock/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
obj-$(CONFIG_VSOCKETS) += vsock.o
obj-$(CONFIG_VMWARE_VMCI_VSOCKETS) += vmw_vsock_vmci_transport.o
obj-$(CONFIG_VIRTIO_VSOCKETS) += virtio_transport.o
obj-$(CONFIG_VIRTIO_VSOCKETS_COMMON) += virtio_transport_common.o

vsock-y += af_vsock.o vsock_addr.o

Expand Down

0 comments on commit 8a2a202

Please sign in to comment.