github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-21 10:51:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1791 from nitkon/fixtest

Browse Source 
vc: Fix TestQemuPPC64leMemoryTopology after qemu version bump
This commit is contained in:
Eric Ernst 2019-06-13 11:40:36 -07:00 committed by GitHub
commit d4c88b2d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/qemu_ppc64le.go
View File

@ -121,7 +121,7 @@ func (q *qemuPPC64le) cpuModel() string {
func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory { func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory {
if qemuMajorVersion >= 2 && qemuMinorVersion >= 10 { if (qemuMajorVersion > 2) || (qemuMajorVersion == 2 && qemuMinorVersion >= 10) {
q.Logger().Debug("Aligning maxmem to multiples of 256MB. Assumption: Kernel Version >= 4.11") q.Logger().Debug("Aligning maxmem to multiples of 256MB. Assumption: Kernel Version >= 4.11")
hostMemoryMb -= (hostMemoryMb % 256) hostMemoryMb -= (hostMemoryMb % 256)
} else { } else {