1
0
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-11 09:55:58 +00:00

runtime-go: qemu: Fix sandbox start failing with virtio-mem enable on arm64

Also add CONFIG_VIRTIO_MEM to arm64 platform

Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
This commit is contained in:
Kevin Zhao 2025-03-26 22:07:40 +08:00
parent ae5c587efc
commit 211a36559c
4 changed files with 8 additions and 2 deletions
src/runtime/virtcontainers
tools/packaging/kernel
configs/fragments/arm64
kata_config_version

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)
}

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)

View File

@ -0,0 +1 @@
CONFIG_VIRTIO_MEM=y

View File

@ -1 +1 @@
150
151