From 49be8ee21c1a4b3d12b02d8575597acd3f49ac62 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Fri, 29 Mar 2019 13:51:44 +0100 Subject: [PATCH] s390x: not set socketID and threadID For cpu hotplug, the options socketID and threadID are not used. Fixes: #1448 Signed-off-by: Alice Frosi --- virtcontainers/qemu.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index 8258be2fb..9a46dc84c 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -1109,8 +1109,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, we do not set socketID and threadID - if machine.Type == "pseries" { + // If CPU type is IBM pSeries or Z, we do not set socketID and threadID + if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" { socketID = "" threadID = "" }