github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 17:22:33 +00:00
Code Issues Projects Releases Wiki Activity

acrn: Change the default network model for ACRN to macvtap

Browse Source 
Drop the bits for bridged networking in ACRN and change the default
to macvtap. We should eventually change this to tcfilter with additional
testing.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2019-08-09 13:01:54 -07:00
parent 2c99b95c53
commit 565f14f685
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -300,7 +300,7 @@ ifneq (,$(ACRNCMD))
# acrn-specific options (all should be suffixed by "_ACRN") # acrn-specific options (all should be suffixed by "_ACRN")
DEFBLOCKSTORAGEDRIVER_ACRN := virtio-blk DEFBLOCKSTORAGEDRIVER_ACRN := virtio-blk
DEFNETWORKMODEL_ACRN := bridged DEFNETWORKMODEL_ACRN := macvtap
KERNEL_NAME_ACRN = $(call MAKE_KERNEL_NAME,$(KERNELTYPE)) KERNEL_NAME_ACRN = $(call MAKE_KERNEL_NAME,$(KERNELTYPE))
KERNELPATH_ACRN = $(KERNELDIR)/$(KERNEL_NAME_ACRN) KERNELPATH_ACRN = $(KERNELDIR)/$(KERNEL_NAME_ACRN)
endif endif

2
virtcontainers/acrn_arch_base.go
View File

@ -711,8 +711,6 @@ func (a *acrnArchBase) appendSocket(devices []Device, socket types.Socket) []Dev
func networkModelToAcrnType(model NetInterworkingModel) NetDeviceType { func networkModelToAcrnType(model NetInterworkingModel) NetDeviceType {
switch model { switch model {
case NetXConnectBridgedModel:
return TAP
case NetXConnectMacVtapModel: case NetXConnectMacVtapModel:
return MACVTAP return MACVTAP
default: default: