diff --git a/libvirt.changes b/libvirt.changes index b43c40f..bae6e14 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 5 22:51:48 UTC 2020 - James Fehlig + +- xen: Fix the list of supported ovmf firmwares + suse-xen-ovmf-loaders.patch + bsc#1159793 + ------------------------------------------------------------------- Mon Feb 3 18:32:49 UTC 2020 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index dcdcfd9..d82cc4b 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -368,6 +368,7 @@ Patch210: qemu-apparmor-screenshot.patch Patch211: libvirt-suse-netcontrol.patch Patch212: lxc-wait-after-eth-del.patch Patch213: suse-libxl-disable-autoballoon.patch +Patch214: suse-xen-ovmf-loaders.patch # SLES-Only patches %if ! 0%{?is_opensuse} Patch400: virt-create-rootfs.patch @@ -901,6 +902,7 @@ libvirt plugin for NSS for translating domain names into IP addresses. %patch211 -p1 %patch212 -p1 %patch213 -p1 +%patch214 -p1 %if ! 0%{?is_opensuse} %patch400 -p1 %endif diff --git a/suse-xen-ovmf-loaders.patch b/suse-xen-ovmf-loaders.patch new file mode 100644 index 0000000..a5a0f4c --- /dev/null +++ b/suse-xen-ovmf-loaders.patch @@ -0,0 +1,27 @@ +libxl: Temporarily hardcode paths to ovmf firmwares + +This is a quick, hacky fix for bsc#1159793 until there is time to work on +upstream support for firmware autoselection in the xen driver. Sadly, the +upstream efforts to improve firmware handling in the qemu driver broke +the firmware handling in the xen driver. + +Index: libvirt-6.0.0/src/libxl/libxl_conf.c +=================================================================== +--- libvirt-6.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.0.0/src/libxl/libxl_conf.c +@@ -1776,6 +1776,15 @@ libxlDriverConfigNew(void) + goto error; + } + ++ /* Begin hack --- ++ * bsc#1159793: Until there is time to work on proper upstream support for ++ * firmware autoselection in the xen driver we'll go with this minimal fix. ++ */ ++#define DEFAULT_LOADER_NVRAM "/usr/share/qemu/ovmf-x86_64-ms-4m.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin:/usr/share/qemu/ovmf-x86_64-ms.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" ++ /* ++ * --- End hack ++ */ ++ + #ifdef DEFAULT_LOADER_NVRAM + if (virFirmwareParseList(DEFAULT_LOADER_NVRAM, + &cfg->firmwares,