From fa5de87d841f2f1f0061776f1855c25bed8b6831 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 29 Apr 2019 14:16:22 -0500 Subject: [PATCH] virtcontainers: fix invalid CPU topology sockets * cores * threads should be equal to maxcpus otherwise a warning is thrown: 'warning: Invalid CPU topology deprecated: sockets * cores * threads != maxcpus' This warning in the future will be an error and won't be possible to run kata containers. fixes #1605 Signed-off-by: Julio Montes --- virtcontainers/qemu_arch_base.go | 2 +- virtcontainers/qemu_arch_base_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/virtcontainers/qemu_arch_base.go b/virtcontainers/qemu_arch_base.go index bf145b43a2..f4a9e69d08 100644 --- a/virtcontainers/qemu_arch_base.go +++ b/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, diff --git a/virtcontainers/qemu_arch_base_test.go b/virtcontainers/qemu_arch_base_test.go index 2d8cba11ea..9865921342 100644 --- a/virtcontainers/qemu_arch_base_test.go +++ b/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,