refactor: Move UEFI detection to utils_misc #3849
Open
Conversation
This file contains 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
Previously, the UEFI guest detection functions were part of the specific VMCheck classes (`LinuxVMCheck` and `WindowsVMCheck`) in the `virttest/utils_v2v.py` file. This commit refactors and relocates these functions to the more generic `virttest/utils_misc.py` file. Motivation: - The `is_uefi_guest` function, previously defined in the `VMCheck` classes, had dependencies that were not universally available across different architectures (e.g., ovrit on s390x). - To enhance code reusability the UEFI guest detection functions are moved to the utils_misc module. Updated Functions: - `is_linux_uefi_guest(runner)`: Check if a Linux guest is a UEFI guest. - `is_windows_uefi_guest(runner)`: Check if a Windows guest is a UEFI guest. These changes improve the code reusability in the codebase and make the UEFI guest detection functionality more accessible for various scenarios.
smitterl
suggested changes
Feb 27, 2024
smitterl
reviewed
Feb 27, 2024
smitterl
reviewed
Feb 27, 2024
smitterl
suggested changes
Mar 12, 2024
There was a problem hiding this comment.
Thank you for this. Your commits are missing the "Signed-off-by" line, you can add this with git commit --amend -s after configuring user name and email e.g. via git config --edit --global.
There are two lines too much in the windows function, IMO, please check the comment.
virttest/utils_misc.py
Outdated
| cmd = 'findstr /c:"%s" %s' % (search_str, target_file) | ||
| status, output = runner(cmd) | ||
| if 'BIOS' in output: | ||
| return False |
There was a problem hiding this comment.
These lines are not necessary, you already return 'EFI' in output. Please, remove them. Also, you don't use status, so please change to _, output = runner(cmd).
…efi guest for clarity Signed-off-by: Walter Herold Veedla <walterheroldv@gmail.com>
veedlaw
force-pushed
the
refactor-is_uefi_guest-from-utils_v2v-to-utils_misc
branch
from
40566f9
to
37a91ac
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.
Previously, the UEFI guest detection functions were part of the specific VMCheck classes (
LinuxVMCheckandWindowsVMCheck) in thevirttest/utils_v2v.pyfile. This commit refactors and relocates these functions to the more genericvirttest/utils_misc.pyfile.Motivation:
is_uefi_guestfunction, previously defined in theVMCheckclasses, had dependencies that were not universally available across different architectures (e.g., ovrit on s390x).Updated Functions:
is_linux_uefi_guest(runner): Check if a Linux guest is a UEFI guest.is_windows_uefi_guest(runner): Check if a Windows guest is a UEFI guest.These changes improve the code reusability in the codebase and make the UEFI guest detection functionality more accessible for various scenarios.