From 7e424300deec6995dc41a7d0eebf26c64d407969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 1 Nov 2024 14:14:15 +0100
Subject: [PATCH] Fix OVMF path in libvirt xml config

Libvirt 9.2.0+ no longer ignores specific value of the <loader/>
element for UEFI variant. Fix it to the proper OVMF firmware path.

QubesOS/qubes-issues#8625
---
 templates/libvirt/xen.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml
index a9ce7c1db..5204e8a35 100644
--- a/templates/libvirt/xen.xml
+++ b/templates/libvirt/xen.xml
@@ -42,7 +42,11 @@
                      and SeaBIOS based on the loader type. This has nothing to
                      do with the hvmloader binary.
                 -->
-                <loader type="{{ "pflash" if vm.features.check_with_template('uefi', False) else "rom" }}">hvmloader</loader>
+                {% if vm.features.check_with_template('uefi', False) -%}
+                <loader type="pflash">/usr/share/edk2/xen/OVMF.fd</loader>
+                {% else -%}
+                <loader type="rom">hvmloader</loader>
+                {% endif -%}
                 <boot dev="cdrom" />
                 <boot dev="hd" />
             {% else %}