Skip to content

xtask: Upgrade OVMF prebuilt #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2023
Merged

xtask: Upgrade OVMF prebuilt #1027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions xtask/src/qemu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ use ureq::Agent;
use {std::fs::Permissions, std::os::unix::fs::PermissionsExt};

/// Name of the ovmf-prebuilt release tag.
const OVMF_PREBUILT_TAG: &str = "edk2-stable202211-r1";
const OVMF_PREBUILT_TAG: &str = "edk2-stable202311-r2";

/// SHA-256 hash of the release tarball.
const OVMF_PREBUILT_HASH: &str = "b085cfe18fd674bf70a31af1dc3e991bcd25cb882981c6d3523d81260f1e0d12";
const OVMF_PREBUILT_HASH: &str = "4a7d01b7dc6b0fdbf3a0e17dacd364b772fb5b712aaf64ecf328273584185ca0";

/// Directory into which the prebuilts will be download (relative to the repo root).
const OVMF_PREBUILT_DIR: &str = "target/ovmf";
Expand All @@ -45,7 +45,7 @@ fn download_url(url: &str) -> Result<Vec<u8>> {
.build();

// Limit the size of the download.
let max_size_in_bytes = 4 * 1024 * 1024;
let max_size_in_bytes = 5 * 1024 * 1024;

// Download the file.
println!("downloading {url}");
Expand Down Expand Up @@ -480,6 +480,18 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
// favor of a hardcoded default timeout.
cmd.args(["-boot", "menu=on,splash-time=0"]);

// Enable workaround for a bug in old versions of QEMU (including the
// version installed on Github Actions runners). This allows us to use
// modern releases of edk2 (anything newer than edk2-stable202211) without
// requiring QEMU 8+. See also https://github.com/tianocore/edk2/pull/3935.
//
// Enabling this on versions of QEMU that don't require the fix does not
// cause a problem, so do it unconditionally.
cmd.args([
"-fw_cfg",
"name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes",
]);

match arch {
UefiArch::AArch64 => {
// Use a generic ARM environment. Sadly qemu can't emulate a
Expand Down