From fa824af2349ae664abb00512b0b034156f563984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Mon, 21 Aug 2023 15:21:34 +0200
Subject: [PATCH] qemu: tdx: Workaround SMP issue with TDX 1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`...,sockets=1,cores=numvcpus,threads=1,...` must be used.

Fixes: #7770

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
(cherry picked from commit d1b54ede290e95762099fff4e0bcdad10f816126)
Signed-off-by: Greg Kurz <groug@kaod.org>
---
 src/runtime/virtcontainers/qemu.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go
index f4de0d0d2..a3c14b25c 100644
--- a/src/runtime/virtcontainers/qemu.go
+++ b/src/runtime/virtcontainers/qemu.go
@@ -618,6 +618,13 @@ 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
 		}
 	}