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

virtcontainers: fix invalid CPU topology
This commit is contained in:
Salvador Fuentes
2019-05-07 10:13:27 -05:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

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,

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,