diff --git a/Makefile b/Makefile index 51e5fd0f97..224cb7fb3d 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,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/cli/kata-check_amd64_test.go b/cli/kata-check_amd64_test.go index 8cb06167fb..d41d320e96 100644 --- a/cli/kata-check_amd64_test.go +++ b/cli/kata-check_amd64_test.go @@ -215,7 +215,7 @@ func TestCheckCheckKernelModulesNoNesting(t *testing.T) { assert.NoError(err) assert.Equal(count, uint32(0)) - re := regexp.MustCompile(`\bwarning\b.*\bnested\b`) + re := regexp.MustCompile(`.*\bnested\b`) matches := re.FindAllStringSubmatch(buf.String(), -1) assert.NotEmpty(matches) } @@ -309,7 +309,7 @@ func TestCheckCheckKernelModulesNoUnrestrictedGuest(t *testing.T) { assert.NoError(err) assert.Equal(count, uint32(0)) - re := regexp.MustCompile(`\bwarning\b.*\bunrestricted_guest\b`) + re := regexp.MustCompile(`.*\bunrestricted_guest\b`) matches := re.FindAllStringSubmatch(buf.String(), -1) assert.NotEmpty(matches) } diff --git a/virtcontainers/network.go b/virtcontainers/network.go index 777d12fec2..73687d5836 100644 --- a/virtcontainers/network.go +++ b/virtcontainers/network.go @@ -110,7 +110,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 (