From 6b4cc5ea6af8eee88a0a774558eef57a40b11cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 12 Jan 2024 15:25:27 +0100 Subject: [PATCH] Revert "qemu: tdx: Workaround SMP issue with TDX 1.5" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d1b54ede290e95762099fff4e0bcdad10f816126. Conflicts: src/runtime/virtcontainers/qemu.go This commit was a hack that was needed in order to get QEMU + TDX to work atop of the stack our CI was running on. As we're moving to "the officially supported by distros" host OS, we need to get rid of this. Signed-off-by: Fabiano Fidêncio --- src/runtime/virtcontainers/qemu.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go index 96b004533e..605ad5b3e6 100644 --- a/src/runtime/virtcontainers/qemu.go +++ b/src/runtime/virtcontainers/qemu.go @@ -629,13 +629,6 @@ func (q *qemu) CreateVM(ctx context.Context, id string, network Network, hypervi // headaches in the future. knobs.FileBackedMem = false knobs.MemShared = false - - // SMP is currently broken with TDX 1.5, and - // we must ensure we use something like: - // `...,sockets=1,cores=numvcpus,threads=1,...` - smp.Sockets = 1 - smp.Cores = q.config.NumVCPUs() - smp.Threads = 1 } }