mirror of
https://github.com/aljazceru/kata-containers.git
synced 2025-12-18 14:54:19 +01:00
qemu: support x86 SMP die
In QEMU 4.1 the CPU topology for x86 will change to: `socket > die > core > thread`. Add `die-id` field to `CPUProperties` and include it in CPU hotplugging Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
@@ -1069,9 +1069,14 @@ func TestQMPCPUDeviceAdd(t *testing.T) {
|
||||
driver := "qemu64-x86_64-cpu"
|
||||
cpuID := "cpu-0"
|
||||
socketID := "0"
|
||||
dieID := "0"
|
||||
coreID := "1"
|
||||
threadID := "0"
|
||||
err := q.ExecuteCPUDeviceAdd(context.Background(), driver, cpuID, socketID, coreID, threadID, "")
|
||||
q.version = &QMPVersion{
|
||||
Major: 4,
|
||||
Minor: 1,
|
||||
}
|
||||
err := q.ExecuteCPUDeviceAdd(context.Background(), driver, cpuID, socketID, dieID, coreID, threadID, "")
|
||||
if err != nil {
|
||||
t.Fatalf("Unexpected error %v", err)
|
||||
}
|
||||
@@ -1090,6 +1095,7 @@ func TestQMPExecuteQueryHotpluggableCPUs(t *testing.T) {
|
||||
Properties: CPUProperties{
|
||||
Node: 1,
|
||||
Socket: 3,
|
||||
Die: 1,
|
||||
Core: 2,
|
||||
Thread: 4,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user