diff options
author | Cole Robinson <crobinso@redhat.com> | 2021-02-15 13:36:40 -0500 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2021-02-15 13:39:16 -0500 |
commit | d304a9b2057aa958a2ae92386102fb6f82240fe0 (patch) | |
tree | 35e1b512ca96bcf7d86a266a012f04ca3832af6c /virtinst | |
parent | 1bcd442bfd9f6061d8d13ddd87c139d3d219c9c4 (diff) | |
download | virt-manager-d304a9b2057aa958a2ae92386102fb6f82240fe0.tar.gz |
tests: More bhyve UEFI testing
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'virtinst')
-rw-r--r-- | virtinst/domcapabilities.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py index 7f81e5e8..b90942b4 100644 --- a/virtinst/domcapabilities.py +++ b/virtinst/domcapabilities.py @@ -211,20 +211,17 @@ class DomainCapabilities(XMLBuilder): if not self.arch_can_uefi(): return # pragma: no cover + firmware_files = [f.value for f in self.os.loader.values] if self.conn.is_bhyve(): - firmware_files = [f.value for f in self.os.loader.values] - if not firmware_files: - return - for firmware_file in firmware_files: if 'BHYVE_UEFI.fd' in firmware_file: return firmware_file - - return firmware_files[0] + return (firmware_files and + firmware_files[0] or None) # pragma: no cover patterns = self._uefi_arch_patterns.get(self.arch) for pattern in patterns: - for path in [v.value for v in self.os.loader.values]: + for path in firmware_files: if re.match(pattern, path): return path |