github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 01:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #710 from bergwolf/build

Browse Source 
cli: fix build
This commit is contained in:
James O. D. Hunt
2018-09-11 08:16:23 +01:00
committed by GitHub
parent 52394c3c18 13254440c6
commit daa80c244d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/config.go
View File

@@ -601,7 +601,7 @@ func checkHypervisorConfig(config vc.HypervisorConfig) error {
}, },
} }
memSizeMB := int64(config.DefaultMemSz) memSizeMB := int64(config.MemorySize)
if memSizeMB == 0 { if memSizeMB == 0 {
return errors.New("VM memory cannot be zero") return errors.New("VM memory cannot be zero")

8
cli/config_test.go
View File

@@ -476,7 +476,7 @@ func TestMinimalRuntimeConfig(t *testing.T) {
imagePath := path.Join(dir, "image.img") imagePath := path.Join(dir, "image.img")
initrdPath := path.Join(dir, "initrd.img") initrdPath := path.Join(dir, "initrd.img")
hypervisorPath := path.Join(dir, "hypervisor") hypervisorPath = path.Join(dir, "hypervisor")
kernelPath := path.Join(dir, "kernel") kernelPath := path.Join(dir, "kernel")
savedDefaultImagePath := defaultImagePath savedDefaultImagePath := defaultImagePath
@@ -1389,9 +1389,9 @@ func TestCheckHypervisorConfig(t *testing.T) {
kataLog.Logger.Out = logBuf kataLog.Logger.Out = logBuf
config := vc.HypervisorConfig{ config := vc.HypervisorConfig{
ImagePath: d.imagePath, ImagePath: d.imagePath,
InitrdPath: d.initrdPath, InitrdPath: d.initrdPath,
DefaultMemSz: d.memBytes, MemorySize: d.memBytes,
} }
err := checkHypervisorConfig(config) err := checkHypervisorConfig(config)