Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Stable 1.5 backports #1546

Merged
merged 3 commits into from
Apr 17, 2019
Merged

Stable 1.5 backports #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c764f3
network: Make tcfilter model as default
amshinde Apr 8, 2019
749d84c
network: Change the package level network default
amshinde Apr 12, 2019
8874e25
cli: fix kata-check test
bergwolf Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cli/kata-check_amd64_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion virtcontainers/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down