github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-13 07:04:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1502 from amshinde/make-tc-default

Browse Source 
network: Make tcfilter model as default
This commit is contained in:
Archana Shinde 2019-04-15 11:34:07 -07:00 committed by GitHub
commit edc77a0263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -210,7 +210,7 @@ ifneq (,$(QEMUCMD))
# qemu-specific options (all should be suffixed by "_QEMU") # qemu-specific options (all should be suffixed by "_QEMU")
DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi
DEFNETWORKMODEL_QEMU := macvtap DEFNETWORKMODEL_QEMU := tcfilter
KERNELNAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE)) KERNELNAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE))
KERNELPATH_QEMU = $(KERNELDIR)/$(KERNELNAME_QEMU) KERNELPATH_QEMU = $(KERNELDIR)/$(KERNELNAME_QEMU)
endif endif

2
virtcontainers/network.go
View File

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