From 42771fa7266f90a75d0516fab7b20f0e0b26b656 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Thu, 16 Dec 2021 14:53:38 +0800 Subject: [PATCH] runtime: don't set socket and thread for arm/virt As this is just a initial vcpu hotplug support, thread and socket has not been supported. So, don't set socket and thread when hotadd cpu for arm/virt. Fixes: #3280 Signed-off-by: Jianyong Wu --- src/runtime/virtcontainers/qemu.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index 0985380d8..242b3645d 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -1840,8 +1840,8 @@ func (q *qemu) hotplugAddCPUs(amount uint32) (uint32, error) { coreID := fmt.Sprintf("%d", hc.Properties.Core) threadID := fmt.Sprintf("%d", hc.Properties.Thread) - // If CPU type is IBM pSeries or Z, we do not set socketID and threadID - if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" { + // If CPU type is IBM pSeries, Z or arm virt, we do not set socketID and threadID + if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" || machine.Type == "virt" { socketID = "" threadID = "" dieID = ""