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 <[email protected]>
kata-containers · Aug 9, 2019 · 565f14f · 565f14f
1 parent 2c99b95
commit 565f14f
Show file tree

Hide file tree

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