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

Merge pull request #1606 from devimc/topic/virtcontainers/fixCpuTopology

Browse Source 
virtcontainers: fix invalid CPU topology
This commit is contained in:
Salvador Fuentes 2019-05-07 10:13:27 -05:00 committed by GitHub
commit 4c5527f8a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/qemu_arch_base.go
View File

@ -257,7 +257,7 @@ func (q *qemuArchBase) bridges(number uint32) []types.PCIBridge {
func (q *qemuArchBase) cpuTopology(vcpus, maxvcpus uint32) govmmQemu.SMP {
smp := govmmQemu.SMP{
CPUs: vcpus,
Sockets: vcpus,
Sockets: maxvcpus,
Cores: defaultCores,
Threads: defaultThreads,
MaxCPUs: maxvcpus,

2
virtcontainers/qemu_arch_base_test.go
View File

@ -165,7 +165,7 @@ func TestQemuArchBaseCPUTopology(t *testing.T) {
expectedSMP := govmmQemu.SMP{
CPUs: vcpus,
Sockets: vcpus,
Sockets: defaultMaxQemuVCPUs,
Cores: defaultCores,
Threads: defaultThreads,
MaxCPUs: defaultMaxQemuVCPUs,