From 565f14f685cdd317d75954a7861e0d05642bea2a Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Fri, 9 Aug 2019 13:01:54 -0700 Subject: [PATCH] acrn: Change the default network model for ACRN to macvtap 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 --- Makefile | 2 +- virtcontainers/acrn_arch_base.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 43b45150c3..eecc9d4097 100644 --- a/Makefile +++ b/Makefile @@ -300,7 +300,7 @@ ifneq (,$(ACRNCMD)) # acrn-specific options (all should be suffixed by "_ACRN") DEFBLOCKSTORAGEDRIVER_ACRN := virtio-blk - DEFNETWORKMODEL_ACRN := bridged + DEFNETWORKMODEL_ACRN := macvtap KERNEL_NAME_ACRN = $(call MAKE_KERNEL_NAME,$(KERNELTYPE)) KERNELPATH_ACRN = $(KERNELDIR)/$(KERNEL_NAME_ACRN) endif diff --git a/virtcontainers/acrn_arch_base.go b/virtcontainers/acrn_arch_base.go index a9882576ad..28f5039ed6 100644 --- a/virtcontainers/acrn_arch_base.go +++ b/virtcontainers/acrn_arch_base.go @@ -711,8 +711,6 @@ func (a *acrnArchBase) appendSocket(devices []Device, socket types.Socket) []Dev func networkModelToAcrnType(model NetInterworkingModel) NetDeviceType { switch model { - case NetXConnectBridgedModel: - return TAP case NetXConnectMacVtapModel: return MACVTAP default: