aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-18 06:44:23 +01:00
Code Issues Packages 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
parent f3e45a09b7 a429677a0b
commit c2d92fe208
2 changed files with 4 additions and 4 deletions
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 != "" {
dimmName := "dimm1"
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, objMemParam)
config.qemuParams = append(config.qemuParams, "-device")
config.qemuParams = append(config.qemuParams, deviceMemParam)
config.qemuParams = append(config.qemuParams, "-numa")
config.qemuParams = append(config.qemuParams, numaMemParam)
}
} else if config.Knobs.FileBackedMem == true {
if config.Memory.Size != "" && config.Memory.Path != "" {