virtcontainers: support SMP die

CPU topology has changed in QEMU 4.1: socket > die > core > thread. die option must be specified in order to hotplug CPUs on x86_64 Depends-on: github.com/kata-containers/packaging#657 fixes #1913 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Jul 26, 2019 · 7668aeb · 7668aeb
1 parent 104c04d
commit 7668aeb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -1307,16 +1307,18 @@ func (q *qemu) hotplugAddCPUs(amount uint32) (uint32, error) {
 		driver := hc.Type
 		cpuID := fmt.Sprintf("cpu-%d", len(q.state.HotpluggedVCPUs))
 		socketID := fmt.Sprintf("%d", hc.Properties.Socket)
+		dieID := fmt.Sprintf("%d", hc.Properties.Die)
 		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" {
 			socketID = ""
 			threadID = ""
+			dieID = ""
 		}
 
-		if err := q.qmpMonitorCh.qmp.ExecuteCPUDeviceAdd(q.qmpMonitorCh.ctx, driver, cpuID, socketID, coreID, threadID, romFile); err != nil {
+		if err := q.qmpMonitorCh.qmp.ExecuteCPUDeviceAdd(q.qmpMonitorCh.ctx, driver, cpuID, socketID, dieID, coreID, threadID, romFile); err != nil {
 			// don't fail, let's try with other CPU
 			continue
 		}