From 18bb9a5d9bbcd7701c7eec3be58f9857ed4c6e92 Mon Sep 17 00:00:00 2001 From: Feng Wang Date: Thu, 2 Dec 2021 21:55:31 -0800 Subject: [PATCH] runtime: enable vhost-net for rootless hypervisor vhost-net is disabled in the rootless kata runtime feature, which has been abandoned since kata 2.0. I reused the rootless flag for nonroot hypervisor and would like to enable vhost-net. Fixes #3182 Signed-off-by: Feng Wang (cherry picked from commit b3bcb7b2516f05176985477f5af2bee2ddf6b7e7) --- src/runtime/virtcontainers/network.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/runtime/virtcontainers/network.go b/src/runtime/virtcontainers/network.go index bf2b09a3ae..dcb7585091 100644 --- a/src/runtime/virtcontainers/network.go +++ b/src/runtime/virtcontainers/network.go @@ -27,7 +27,6 @@ import ( "github.com/kata-containers/kata-containers/src/runtime/pkg/katautils/katatrace" pbTypes "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/agent/protocols" - "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/uuid" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" ) @@ -440,12 +439,7 @@ func xConnectVMNetwork(ctx context.Context, endpoint Endpoint, h Hypervisor) err queues = int(h.HypervisorConfig().NumVCPUs) } - var disableVhostNet bool - if rootless.IsRootless() { - disableVhostNet = true - } else { - disableVhostNet = h.HypervisorConfig().DisableVhostNet - } + disableVhostNet := h.HypervisorConfig().DisableVhostNet if netPair.NetInterworkingModel == NetXConnectDefaultModel { netPair.NetInterworkingModel = DefaultNetInterworkingModel