QEMU/OVMF improvements #474
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicholasbishop
force-pushed
the
bishop-improve-ovmf-paths
branch
from
caf2690 to
0b14271
Compare
It's alright, they're sometimes even inconsistent across different versions of the same distro 😒 I've gotten used to copying them to the |
In the AArch64 version of OVMF currently used in CI, it crashes if the vars aren't writable. (A newer version that I tested locally doesn't have this problem.) Having vars be writable is a more normal UEFI environment anyway though, so remove the special case for AArch64 and make the vars always writable. Since the vars file might be in some read-only location, or owned by root (e.g. a system package installed to /usr), a temporary copy of the vars file is made before using it. Also add a `PflashMode` enum to make the call sites of `add_pflash_args` a little clearer.
The QEMU installer for Windows does not automatically add the directory containing the QEMU executables to the PATH. Add the default directory to the PATH to make it more likely that QEMU will be found on Windows. The directory is appended, so if a different directory on the PATH already has the QEMU binary this change won't affect anything.
Prior to this commit we assumed that OVMF files for a given guest arch have consistent file names across host operating systems, varying only in the directory path. This turns out not to be a good assumption though; the locations and names of OVMF files installed by system packages very a lot between operating systems. To make it easier to figure out where stuff is, add a number of OS-specific functions that provide the fulls OVMF code and vars paths. For now these functions cover Arch, CentOS, Debian/Ubuntu, Fedora, and Windows. A selection of candidate paths is then collected (one set of paths for Linux, a different set for Windows) and searched. Along with the above changes, the `--ovmf-dir` option has been replaced with separate `--ovmf-code` and `--ovmf-vars` options. When set, these paths will be used instead of searching the candidate paths. The `uefi-test-runner` directory is no longer automatically searched for OVMF files since we no longer assume we know what these files would be named. Hopefully the improved candidate search makes this moot, and the `--ovmf-code`/`--ovmf-vars` options can still be used to search there if desired. CI changes: * The aarch64 job has been simplified a bit since the system location of the files is now sufficient for `cargo xtask run` to work. * The ia32 job now explicitly sets the location of the downloaded OVMF files. Fixes rust-osdev#469
nicholasbishop
force-pushed
the
bishop-improve-ovmf-paths
branch
from
0b14271 to
81f8380
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A few improvements to
cargo xtask runto make it more likely to work well across various Linux distros and Windows.--ovmf-codeand--ovmf-varsoptions rather than--ovmf-dir. This works better because the file names of OVMF can vary a lot. For that reason, theuefi-test-runnerdirectory is no longer automatically searched.PATH. Add the default directory to the search path to make it more likely thatcargo xtask runwill just work without manually modifying thePATH.Fixes #469