diff --git a/src/runtime/virtcontainers/qemu_arm64.go b/src/runtime/virtcontainers/qemu_arm64.go index a9b803f732..373321d2bb 100644 --- a/src/runtime/virtcontainers/qemu_arm64.go +++ b/src/runtime/virtcontainers/qemu_arm64.go @@ -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) +} diff --git a/src/runtime/virtcontainers/qemu_arm64_test.go b/src/runtime/virtcontainers/qemu_arm64_test.go index 07e67ac8c1..924dd32ba0 100644 --- a/src/runtime/virtcontainers/qemu_arm64_test.go +++ b/src/runtime/virtcontainers/qemu_arm64_test.go @@ -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) diff --git a/tools/packaging/kernel/configs/fragments/arm64/virtio.conf b/tools/packaging/kernel/configs/fragments/arm64/virtio.conf new file mode 100644 index 0000000000..93481cd505 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/arm64/virtio.conf @@ -0,0 +1 @@ +CONFIG_VIRTIO_MEM=y diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index fa8f08cb6f..1b9cba4ae5 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -150 +151