forked from pool/libvirt
94803fa053
- Update to libvirt 6.0.0
- jsc#SLE-6997, jsc#SLE-6998
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
0a65cba4-news-fix.patch 07aaced4-Add-TAA-No.patch,
f411b7ef6-Add-TSX-CTRL.patch, 50d7465f-qemu-firmware1.patch,
57f9067c-qemu-firmware2.patch, 7c5264d2-qemu-firmware3.patch,
8e1804f9-qemu-firmware4.patch, 8fcee478-qemu-firmware5.patch
OBS-URL: https://build.opensuse.org/request/show/764822
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=796
53 lines
2.6 KiB
Diff
53 lines
2.6 KiB
Diff
Adjust paths of OVMF firmwares on SUSE distros
|
|
|
|
Index: libvirt-6.0.0/src/qemu/qemu.conf
|
|
===================================================================
|
|
--- libvirt-6.0.0.orig/src/qemu/qemu.conf
|
|
+++ libvirt-6.0.0/src/qemu/qemu.conf
|
|
@@ -788,10 +788,9 @@
|
|
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
|
|
# follows this scheme.
|
|
#nvram = [
|
|
-# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
|
|
-# "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd",
|
|
-# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd",
|
|
-# "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin",
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin",
|
|
+# "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
|
|
#]
|
|
|
|
# The backend to use for handling stdout/stderr output from
|
|
Index: libvirt-6.0.0/src/qemu/qemu_conf.c
|
|
===================================================================
|
|
--- libvirt-6.0.0.orig/src/qemu/qemu_conf.c
|
|
+++ libvirt-6.0.0/src/qemu/qemu_conf.c
|
|
@@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
|
|
|
|
#ifndef DEFAULT_LOADER_NVRAM
|
|
# define DEFAULT_LOADER_NVRAM \
|
|
- "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
|
|
- "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
|
|
- "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd:" \
|
|
- "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
|
|
+ "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin:" \
|
|
+ "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin:" \
|
|
+ "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin"
|
|
#endif
|
|
|
|
|
|
Index: libvirt-6.0.0/src/security/virt-aa-helper.c
|
|
===================================================================
|
|
--- libvirt-6.0.0.orig/src/security/virt-aa-helper.c
|
|
+++ libvirt-6.0.0/src/security/virt-aa-helper.c
|
|
@@ -489,7 +489,8 @@ valid_path(const char *path, const bool
|
|
"/usr/share/ovmf/", /* for OVMF images */
|
|
"/usr/share/AAVMF/", /* for AAVMF images */
|
|
"/usr/share/qemu-efi/", /* for AAVMF images */
|
|
- "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */
|
|
+ "/usr/share/qemu-efi-aarch64/", /* for AAVMF images */
|
|
+ "/usr/share/qemu/" /* SUSE path for OVMF and AAVMF images */
|
|
};
|
|
/* override the above with these */
|
|
const char * const override[] = {
|