From 2d8c17a9b61ad298986daffe5373026c3b88c741 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 3 Aug 2023 13:44:24 +0200 Subject: OvmfPkg/PlatformCI: Boot OVMF in SMP mode. Increase the chance that CI finds bugs in MP changes. Signed-off-by: Gerd Hoffmann (cherry picked from commit f92a9dce10281c103b04d6b38283e0ff1d677b91) Reapplying, since the CI (Windows and Linux) use Qemu 8 now, which works with SMP again. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4324 Signed-off-by: Oliver Steffen [ardb: use single-threaded TCG for SMM] --- OvmfPkg/PlatformCI/PlatformBuildLib.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OvmfPkg') diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/PlatformBuildLib.py index c8e805c566..1ada935d3c 100644 --- a/OvmfPkg/PlatformCI/PlatformBuildLib.py +++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py @@ -195,6 +195,7 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager): args = "-debugcon stdio" # write messages to stdio args += " -global isa-debugcon.iobase=0x402" # debug messages out thru virtual io port args += " -net none" # turn off network + args += " -smp 4" args += f" -drive file=fat:rw:{VirtualDrive},format=raw,media=disk" # Mount disk with startup.nsh if (self.env.GetValue("QEMU_HEADLESS").upper() == "TRUE"): @@ -202,6 +203,7 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager): if (self.env.GetBuildValue("SMM_REQUIRE") == "1"): args += " -machine q35,smm=on" #,accel=(tcg|kvm)" + args += " --accel tcg,thread=single" #args += " -m ..." args += " -global driver=cfi.pflash01,property=secure,value=on" args += " -drive if=pflash,format=raw,unit=0,file=" + os.path.join(OutputPath_FV, "OVMF_CODE.fd") + ",readonly=on" -- cgit v1.2.3