mirror of
https://github.com/acidanthera/audk.git
synced 2025-04-08 17:05:09 +02:00
OvmfPkg/PlatformCI VS2019: Disable workaround for cpuhp bugfix
This reverts commit 3beb8c965455f4c1cc3184e36c627ef1d9bfe5f9. Both Windows and Linux CI jobs are now using Qemu 8, this workaround is no longer needed. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4324 Signed-off-by: Oliver Steffen <osteffen@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>
This commit is contained in:
parent
744c42bfd8
commit
bae848ee25
@ -24,7 +24,7 @@ jobs:
|
||||
package: 'OvmfPkg'
|
||||
vm_image: 'windows-2019'
|
||||
should_run: true
|
||||
run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE QEMU_CPUHP_QUIRK=TRUE"
|
||||
run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
|
||||
|
||||
#Use matrix to speed up the build process
|
||||
strategy:
|
||||
|
@ -170,7 +170,6 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager):
|
||||
self.env.SetValue("PRODUCT_NAME", "OVMF", "Platform Hardcoded")
|
||||
self.env.SetValue("MAKE_STARTUP_NSH", "FALSE", "Default to false")
|
||||
self.env.SetValue("QEMU_HEADLESS", "FALSE", "Default to false")
|
||||
self.env.SetValue("QEMU_CPUHP_QUIRK", "FALSE", "Default to false")
|
||||
return 0
|
||||
|
||||
def PlatformPreBuild(self):
|
||||
@ -211,17 +210,6 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager):
|
||||
args += " -pflash " + os.path.join(OutputPath_FV, "OVMF.fd") # path to firmware
|
||||
|
||||
|
||||
###
|
||||
### NOTE This is a temporary workaround to allow platform CI to cope with
|
||||
### a QEMU bug in the CPU hotplug code. Once the CI environment has
|
||||
### been updated to carry a fixed version of QEMU, this can be
|
||||
### removed again
|
||||
###
|
||||
### Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=4250
|
||||
###
|
||||
if (self.env.GetValue("QEMU_CPUHP_QUIRK").upper() == "TRUE"):
|
||||
args += " -fw_cfg name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes"
|
||||
|
||||
if (self.env.GetValue("MAKE_STARTUP_NSH").upper() == "TRUE"):
|
||||
f = open(os.path.join(VirtualDrive, "startup.nsh"), "w")
|
||||
f.write("BOOT SUCCESS !!! \n")
|
||||
|
Loading…
x
Reference in New Issue
Block a user