2017-08-03 19:28:59 +02:00
|
|
|
Adjust paths of OVMF firmwares on SUSE distros
|
|
|
|
|
|
2021-07-23 23:27:33 +02:00
|
|
|
Note: SLE15 SP2 and newer support automatic firmware selection. Firmwares
|
|
|
|
|
advertised and used by libvirt are automatically detected. Until upstream
|
|
|
|
|
removes the old DEFAULT_LOADER_NVRAM approach and associated code, this
|
|
|
|
|
patch will stay.
|
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/qemu/qemu.conf
|
2017-08-03 19:28:59 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/qemu/qemu.conf
|
|
|
|
|
+++ libvirt-7.7.0/src/qemu/qemu.conf
|
2020-12-02 05:12:13 +01:00
|
|
|
@@ -858,10 +858,9 @@
|
2017-08-03 19:28:59 +02:00
|
|
|
# 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"
|
2017-09-15 19:11:37 +02:00
|
|
|
+# "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin",
|
2017-08-03 19:28:59 +02:00
|
|
|
+# "/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
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/qemu/qemu_conf.c
|
2017-08-03 19:28:59 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/qemu/qemu_conf.c
|
|
|
|
|
+++ libvirt-7.7.0/src/qemu/qemu_conf.c
|
2021-05-18 00:14:02 +02:00
|
|
|
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver)
|
2017-08-03 19:28:59 +02:00
|
|
|
|
|
|
|
|
#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"
|
2017-09-15 19:11:37 +02:00
|
|
|
+ "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin:" \
|
2017-08-03 19:28:59 +02:00
|
|
|
+ "/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
|
|
|
|
|
|
|
|
|
|
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/security/virt-aa-helper.c
|
2018-06-06 01:59:32 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/security/virt-aa-helper.c
|
|
|
|
|
+++ libvirt-7.7.0/src/security/virt-aa-helper.c
|
2021-03-02 01:57:27 +01:00
|
|
|
@@ -480,7 +480,8 @@ valid_path(const char *path, const bool
|
2018-06-06 01:59:32 +02:00
|
|
|
"/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[] = {
|
2021-09-01 18:17:27 +02:00
|
|
|
Index: libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
|
2020-10-14 18:48:18 +02:00
|
|
|
===================================================================
|
2021-09-01 18:17:27 +02:00
|
|
|
--- libvirt-7.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
|
|
+++ libvirt-7.7.0/src/qemu/test_libvirtd_qemu.aug.in
|
2020-12-02 05:12:13 +01:00
|
|
|
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
|
2020-10-14 18:48:18 +02:00
|
|
|
{ "migration_port_max" = "49215" }
|
|
|
|
|
{ "log_timestamp" = "0" }
|
|
|
|
|
{ "nvram"
|
|
|
|
|
- { "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
|
|
- { "2" = "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd" }
|
|
|
|
|
- { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
|
|
|
|
|
- { "4" = "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" }
|
|
|
|
|
+ { "1" = "/usr/share/qemu/ovmf-x86_64-ms-4m-code.bin:/usr/share/qemu/ovmf-x86_64-ms-4m-vars.bin" }
|
|
|
|
|
+ { "2" = "/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" }
|
|
|
|
|
+ { "3" = "/usr/share/qemu/aavmf-aarch64-code.bin:/usr/share/qemu/aavmf-aarch64-vars.bin" }
|
|
|
|
|
}
|
|
|
|
|
{ "stdio_handler" = "logd" }
|
|
|
|
|
{ "gluster_debug_level" = "9" }
|
