github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-02 18:23:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84 from nitkon/master

Browse Source 
qmp: Conditionally pass threadID and socketID when CPU device add
This commit is contained in:
Julio Montes 2019-01-28 10:43:02 -06:00 committed by GitHub
commit 78d079db6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu/qmp.go
View File

@ -1144,14 +1144,21 @@ func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsd
// ExecuteCPUDeviceAdd adds a CPU to a QEMU instance using the device_add command. // ExecuteCPUDeviceAdd adds a CPU to a QEMU instance using the device_add command.
// driver is the CPU model, cpuID must be a unique ID to identify the CPU, socketID is the socket number within // driver is the CPU model, cpuID must be a unique ID to identify the CPU, socketID is the socket number within
// node/board the CPU belongs to, coreID is the core number within socket the CPU belongs to, threadID is the // node/board the CPU belongs to, coreID is the core number within socket the CPU belongs to, threadID is the
// thread number within core the CPU belongs to. // thread number within core the CPU belongs to. Note that socketID and threadID are not a requirement for
// architecures like ppc64le.
func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID, coreID, threadID, romfile string) error { func (q *QMP) ExecuteCPUDeviceAdd(ctx context.Context, driver, cpuID, socketID, coreID, threadID, romfile string) error {
args := map[string]interface{}{ args := map[string]interface{}{
"driver": driver, "driver": driver,
"id": cpuID, "id": cpuID,
"socket-id": socketID,
"core-id": coreID, "core-id": coreID,
"thread-id": threadID, }
if socketID != "" {
args["socket-id"] = socketID
}
if threadID != "" {
args["thread-id"] = threadID
} }
if isVirtioPCI[DeviceDriver(driver)] { if isVirtioPCI[DeviceDriver(driver)] {