68 lines
1.8 KiB
Diff
68 lines
1.8 KiB
Diff
From c26cf7520b4fe94dff39742b32168ac0bd36c212 Mon Sep 17 00:00:00 2001
|
|
From: holyfei <yangfeiyu20102011@163.com>
|
|
Date: Wed, 18 Aug 2021 10:50:26 +0800
|
|
Subject: [PATCH] kata_integration: adapt with new kata-containers
|
|
|
|
reason: adapt with new kata-containers
|
|
|
|
Signed-off-by: holyfei <yangfeiyu20102011@163.com>
|
|
---
|
|
Makefile | 2 +-
|
|
hack/config-kata-arm64 | 2 +-
|
|
hack/config-kata-x86_64 | 6 +++---
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index f22fc80..db6b799 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -55,7 +55,7 @@ agent:
|
|
test:
|
|
docker run -ti --rm --runtime=kata-runtime busybox sh
|
|
|
|
-initrd: agent
|
|
+initrd:
|
|
sh ./scripts/make_kata_container_initrd.sh
|
|
|
|
debug-initrd: runtime
|
|
diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64
|
|
index 253af36..425bb52 100644
|
|
--- a/hack/config-kata-arm64
|
|
+++ b/hack/config-kata-arm64
|
|
@@ -548,7 +548,7 @@ CONFIG_ACPI_GTDT=y
|
|
CONFIG_ACPI_PPTT=y
|
|
CONFIG_VIRTUALIZATION=y
|
|
# CONFIG_KVM is not set
|
|
-# CONFIG_VHOST_NET is not set
|
|
+CONFIG_VHOST_NET=y
|
|
CONFIG_VHOST_VSOCK=y
|
|
CONFIG_VHOST=y
|
|
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
|
|
diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64
|
|
index 452f903..7c57225 100644
|
|
--- a/hack/config-kata-x86_64
|
|
+++ b/hack/config-kata-x86_64
|
|
@@ -583,8 +583,8 @@ CONFIG_FIRMWARE_MEMMAP=y
|
|
CONFIG_HAVE_KVM=y
|
|
CONFIG_VIRTUALIZATION=y
|
|
# CONFIG_KVM is not set
|
|
-# CONFIG_VHOST_NET is not set
|
|
-# CONFIG_VHOST_VSOCK is not set
|
|
+CONFIG_VHOST_NET=y
|
|
+CONFIG_VHOST_VSOCK=y
|
|
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
|
|
|
|
#
|
|
@@ -1261,7 +1261,7 @@ CONFIG_DNS_RESOLVER=y
|
|
# CONFIG_OPENVSWITCH is not set
|
|
CONFIG_VSOCKETS=y
|
|
CONFIG_VSOCKETS_DIAG=y
|
|
-# CONFIG_VIRTIO_VSOCKETS is not set
|
|
+CONFIG_VIRTIO_VSOCKETS=y
|
|
# CONFIG_NETLINK_DIAG is not set
|
|
# CONFIG_MPLS is not set
|
|
# CONFIG_NET_NSH is not set
|
|
--
|
|
2.23.0
|
|
|