[virt-manager][PATCH] domcapabilities: Whitelist upstream qemu edk2 paths

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

Upstream qemu installs
/usr/share/qemu/edk2-$ARCH-(?secure-)code.fd FW images. Whitelist
them too.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---

This can be verified by running the following:

qemu.git $ git clean -fxd; \
           ./configure --prefix=/usr && \
           mkdir _install && \
           make -j10 install DESTDIR=${PWD}/_install && \
           find _install -name "*code.fd"

 virtinst/domcapabilities.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/virtinst/domcapabilities.py b/virtinst/domcapabilities.py
index 0582c567..861ba375 100644
--- a/virtinst/domcapabilities.py
+++ b/virtinst/domcapabilities.py
@@ -177,9 +177,11 @@ class DomainCapabilities(XMLBuilder):
     # validate anything the user explicitly enters.
     _uefi_arch_patterns = {
         "i686": [
+            r".*edk2-i386-.*\.fd",  # upstream qemu
             r".*ovmf-ia32.*",  # fedora, gerd's firmware repo
         ],
         "x86_64": [
+            r".*edk2-x86_64-.*\.fd",  # upstream qemu
             r".*OVMF_CODE\.fd",  # RHEL
             r".*ovmf-x64/OVMF.*\.fd",  # gerd's firmware repo
             r".*ovmf-x86_64-.*",  # SUSE
@@ -189,9 +191,11 @@ class DomainCapabilities(XMLBuilder):
             r".*AAVMF_CODE\.fd",  # RHEL
             r".*aarch64/QEMU_EFI.*",  # gerd's firmware repo
             r".*aarch64.*",  # generic attempt at a catchall
+            r".*edk2-aarch64-code\.fd",  # upstream qemu
         ],
         "armv7l": [
             r".*arm/QEMU_EFI.*",  # fedora, gerd's firmware repo
+            r".*edk2-arm-code\.fd"  # upstream qemu
         ],
     }
 
-- 
2.23.0

_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list