diff options
| author | Oliver Steffen <osteffen@redhat.com> | 2023-08-03 13:44:23 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <workofard@gmail.com> | 2023-08-04 16:36:04 +0200 |
| commit | bae848ee2504a4558eb17f02d2ffe3dadbaa119f (patch) | |
| tree | cc9fbc23ae2050bd4bbce59f5272b3f3f01aef70 | |
| parent | 744c42bfd81e572a81e5f8327e4194a52f46df46 (diff) | |
| download | edk2-bae848ee2504a4558eb17f02d2ffe3dadbaa119f.tar.gz edk2-bae848ee2504a4558eb17f02d2ffe3dadbaa119f.tar.bz2 edk2-bae848ee2504a4558eb17f02d2ffe3dadbaa119f.zip | |
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>
| -rw-r--r-- | OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 | ||||
| -rw-r--r-- | OvmfPkg/PlatformCI/PlatformBuildLib.py | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml index f7cba193d7..cada810235 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -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:
diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/PlatformBuildLib.py index 64fca48a7d..c8e805c566 100644 --- a/OvmfPkg/PlatformCI/PlatformBuildLib.py +++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py @@ -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")
|