From c63de1523a0322241a50932591b72c992f38db71 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Fri, 7 Dec 2018 11:46:47 +0100 Subject: [PATCH] kernel: enable vsock on s390x The vsock options need to be enabled to build a kernel able to use the vsock option Fixes: #274 Signed-off-by: Alice Frosi --- kernel/configs/s390_kata_kvm_4.14.x | 7 +++++-- kernel/kata_config_version | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/configs/s390_kata_kvm_4.14.x b/kernel/configs/s390_kata_kvm_4.14.x index 5574ec14ae..cbcc4d33e3 100644 --- a/kernel/configs/s390_kata_kvm_4.14.x +++ b/kernel/configs/s390_kata_kvm_4.14.x @@ -576,7 +576,7 @@ CONFIG_ELFCORE=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y # CONFIG_HAVE_AOUT is not set -# CONFIG_BINFMT_MISC is not set +CONFIG_BINFMT_MISC=y CONFIG_COREDUMP=y CONFIG_SECCOMP=y @@ -762,7 +762,9 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set # CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set -# CONFIG_VSOCKETS is not set +CONFIG_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS_COMMON=y # CONFIG_NETLINK_DIAG is not set # CONFIG_MPLS is not set # CONFIG_NET_NSH is not set @@ -2176,6 +2178,7 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=y # CONFIG_KVM_S390_UCONTROL is not set # CONFIG_VHOST_NET is not set +# CONFIG_VHOST_VSOCK is not set # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set CONFIG_S390_GUEST=y CONFIG_S390_GUEST_OLD_TRANSPORT=y diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 3c032078a4..d6b24041cf 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -18 +19