github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48 from bergwolf/memsize

Browse Source 
qemu: skip setting system memory if it is set via dimm device
This commit is contained in:
Mark Ryan 2018-09-26 08:53:24 +02:00 committed by GitHub
commit c2d92fe208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/qemu.go
View File

@ -1562,13 +1562,13 @@ func (config *Config) appendMemoryKnobs() {
if config.Memory.Size != "" { if config.Memory.Size != "" {
dimmName := "dimm1" dimmName := "dimm1"
objMemParam := "memory-backend-ram,id=" + dimmName + ",size=" + config.Memory.Size + ",prealloc=on" objMemParam := "memory-backend-ram,id=" + dimmName + ",size=" + config.Memory.Size + ",prealloc=on"
deviceMemParam := "pc-dimm,id=" + dimmName + ",memdev=" + dimmName numaMemParam := "node,memdev=" + dimmName
config.qemuParams = append(config.qemuParams, "-object") config.qemuParams = append(config.qemuParams, "-object")
config.qemuParams = append(config.qemuParams, objMemParam) config.qemuParams = append(config.qemuParams, objMemParam)
config.qemuParams = append(config.qemuParams, "-device") config.qemuParams = append(config.qemuParams, "-numa")
config.qemuParams = append(config.qemuParams, deviceMemParam) config.qemuParams = append(config.qemuParams, numaMemParam)
} }
} else if config.Knobs.FileBackedMem == true { } else if config.Knobs.FileBackedMem == true {
if config.Memory.Size != "" && config.Memory.Path != "" { if config.Memory.Size != "" && config.Memory.Path != "" {

2
qemu/qemu_test.go
View File

@ -518,7 +518,7 @@ func TestAppendMemoryMemPrealloc(t *testing.T) {
FileBackedMem: true, FileBackedMem: true,
FileBackedMemShared: true, FileBackedMemShared: true,
} }
knobsString := "-object memory-backend-ram,id=dimm1,size=1G,prealloc=on -device pc-dimm,id=dimm1,memdev=dimm1" knobsString := "-object memory-backend-ram,id=dimm1,size=1G,prealloc=on -numa node,memdev=dimm1"
mlockFalseString := "-realtime mlock=off" mlockFalseString := "-realtime mlock=off"
testConfigAppend(conf, knobs, memString+" "+knobsString+" "+mlockFalseString, t) testConfigAppend(conf, knobs, memString+" "+knobsString+" "+mlockFalseString, t)