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

Commit

Permalink
vc: Fix TestQemuPPC64leMemoryTopology after qemu version bump
Browse files Browse the repository at this point in the history
TestQemuPPC64leMemoryTopology fails on ppc64le
as the corect qemu version is not detected.

Fixes: #1790

Signed-off-by: Nitesh Konkar [email protected]
  • Loading branch information
nitkon authored and root committed Jun 12, 2019
1 parent c191abb commit 0fb4396
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion virtcontainers/qemu_ppc64le.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (q *qemuPPC64le) cpuModel() string {

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")
hostMemoryMb -= (hostMemoryMb % 256)
} else {
Expand Down

0 comments on commit 0fb4396

Please sign in to comment.