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

Merge pull request #11085 from kevinzs2048/fix-virtiomem

Browse Source 
runtime-go: qemu: Fix sandbox start failing with virtio-mem enable on arm64
This commit is contained in:
Zvonko Kaiser
2025-03-31 17:09:43 -04:00
committed by GitHub
parent e5c4cfb8a1 211a36559c
commit d81a1747bd
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/virtcontainers/qemu_arm64.go
View File

@@ -161,3 +161,7 @@ func (q *qemuArm64) appendProtectionDevice(devices []govmmQemu.Device, firmware,
}
return devices, firmware, err
}
func (q *qemuArm64) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory {
return genericMemoryTopology(memoryMb, hostMemoryMb, slots, q.memoryOffset)
}

3
src/runtime/virtcontainers/qemu_arm64_test.go
View File

@@ -43,6 +43,7 @@ func TestQemuArm64CPUModel(t *testing.T) {
func TestQemuArm64MemoryTopology(t *testing.T) {
assert := assert.New(t)
arm64 := newTestQemu(assert, QemuVirt)
memoryOffset := uint64(1024)
hostMem := uint64(4096)
mem := uint64(1024)
@@ -50,7 +51,7 @@ func TestQemuArm64MemoryTopology(t *testing.T) {
expectedMemory := govmmQemu.Memory{
Size: fmt.Sprintf("%dM", mem),
Slots: slots,
MaxMem: fmt.Sprintf("%dM", hostMem),
MaxMem: fmt.Sprintf("%dM", hostMem+memoryOffset),
}
m := arm64.memoryTopology(mem, hostMem, slots)