network: Merge pull request kata-containers#1502 from amshinde/make-t…

…c-default network: Make tcfilter model as default (cherry picked from commit edc77a0) Fixes: kata-containers#1501 Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
ganeshmaharaj · Apr 16, 2019 · 8d3ba44 · 8d3ba44
1 parent de0c06b
commit 8d3ba44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -208,7 +208,7 @@ ifneq (,$(QEMUCMD))
 
     # qemu-specific options (all should be suffixed by "_QEMU")
     DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi
-    DEFNETWORKMODEL_QEMU := macvtap
+    DEFNETWORKMODEL_QEMU := tcfilter
     KERNELNAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE))
     KERNELPATH_QEMU = $(KERNELDIR)/$(KERNELNAME_QEMU)
 endif

diff --git a/virtcontainers/network.go b/virtcontainers/network.go
@@ -112,7 +112,7 @@ func (n *NetInterworkingModel) SetModel(modelName string) error {
 // DefaultNetInterworkingModel is a package level default
 // that determines how the VM should be connected to the
 // the container network interface
-var DefaultNetInterworkingModel = NetXConnectMacVtapModel
+var DefaultNetInterworkingModel = NetXConnectTCFilterModel
 
 // Introduces constants related to networking
 const (