Merge pull request #11085 from kevinzs2048/fix-virtiomem

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

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

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)

tools/packaging/kernel/configs/fragments/arm64/virtio.conf

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

tools/packaging/kernel/kata_config_version

@@ -1 +1 @@
-150
+151