Merge pull request #2194 from egernst/fixup-vhost-fc

fc: config: vhost-net not supported
kata-containers · Nov 14, 2019 · 35f54fd · 35f54fd
2 parents f2bbcf4 + 519eff7
commit 35f54fd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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