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

virtcontainers: fix invalid CPU topology

Author: chavafg

virtcontainers/qemu_arch_base.go

@@ -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,

virtcontainers/qemu_arch_base_test.go

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