github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-14 15:44:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1449 from alicefr/thread_id

Browse Source 
s390x: not set socketID and threadID
This commit is contained in:
Julio Montes 2019-04-08 08:01:40 -05:00 committed by GitHub
commit c884f65a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
virtcontainers/qemu.go
View File

@ -1115,8 +1115,8 @@ func (q *qemu) hotplugAddCPUs(amount uint32) (uint32, error) {
coreID := fmt.Sprintf("%d", hc.Properties.Core) coreID := fmt.Sprintf("%d", hc.Properties.Core)
threadID := fmt.Sprintf("%d", hc.Properties.Thread) threadID := fmt.Sprintf("%d", hc.Properties.Thread)
// If CPU type is IBM pSeries, we do not set socketID and threadID // If CPU type is IBM pSeries or Z, we do not set socketID and threadID
if machine.Type == "pseries" { if machine.Type == "pseries" || machine.Type == "s390-ccw-virtio" {
socketID = "" socketID = ""
threadID = "" threadID = ""
} }