From 519eff723666f3ae419cf5a845ef593a2e085be9 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Wed, 13 Nov 2019 14:10:18 -0800 Subject: [PATCH] fc: config: vhost-net not supported vhost-net backend is not supported by the Firecracker VMM. It doesn't make sense to have this in the configuration, and we should explicitly disable it. Fixes: #2192 Signed-off-by: Eric Ernst --- cli/config/configuration-fc.toml.in | 3 --- pkg/katautils/config.go | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cli/config/configuration-fc.toml.in b/cli/config/configuration-fc.toml.in index 520642d914..b272ba9e57 100644 --- a/cli/config/configuration-fc.toml.in +++ b/cli/config/configuration-fc.toml.in @@ -160,9 +160,6 @@ use_vsock = true # Default false #hotplug_vfio_on_root_bus = true -# If host doesn't support vhost_net, set to true. Thus we won't create vhost fds for nics. -# Default false -#disable_vhost_net = true # # Default entropy source. # The path to a host source of entropy (including a real hardware RNG) diff --git a/pkg/katautils/config.go b/pkg/katautils/config.go index 51d2ceba4b..386f9df5a8 100644 --- a/pkg/katautils/config.go +++ b/pkg/katautils/config.go @@ -533,6 +533,7 @@ func newFirecrackerHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) { DisableNestingChecks: h.DisableNestingChecks, BlockDeviceDriver: blockDriver, EnableIOThreads: h.EnableIOThreads, + DisableVhostNet: true, // vhost-net backend is not supported in Firecracker UseVSock: true, GuestHookPath: h.guestHookPath(), }, nil