rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

Accepting request 770410 from home:jfehlig:branches:Virtualization

Browse Source 
- xen: Fix the list of supported ovmf firmwares
  suse-xen-ovmf-loaders.patch
  bsc#1159793

OBS-URL: https://build.opensuse.org/request/show/770410
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=805
This commit is contained in:
James Fehlig 2020-02-05 23:52:51 +00:00 committed by Git OBS Bridge
parent 2e80a01b56
commit 13d77271a1
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 5 22:51:48 UTC 2020 - James Fehlig <jfehlig@suse.com>
- 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 <jfehlig@suse.com> Mon Feb 3 18:32:49 UTC 2020 - James Fehlig <jfehlig@suse.com>

2
libvirt.spec
View File

@ -368,6 +368,7 @@ Patch210: qemu-apparmor-screenshot.patch
Patch211: libvirt-suse-netcontrol.patch Patch211: libvirt-suse-netcontrol.patch
Patch212: lxc-wait-after-eth-del.patch Patch212: lxc-wait-after-eth-del.patch
Patch213: suse-libxl-disable-autoballoon.patch Patch213: suse-libxl-disable-autoballoon.patch
Patch214: suse-xen-ovmf-loaders.patch
# SLES-Only patches # SLES-Only patches
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
Patch400: virt-create-rootfs.patch Patch400: virt-create-rootfs.patch
@ -901,6 +902,7 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch211 -p1 %patch211 -p1
%patch212 -p1 %patch212 -p1
%patch213 -p1 %patch213 -p1
%patch214 -p1
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%patch400 -p1 %patch400 -p1
%endif %endif

27
suse-xen-ovmf-loaders.patch Normal file
View File

@ -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,