rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity
58112c5e1b
libvirt/suse-qemu-ovmf-paths.patch

87 lines
4.3 KiB
Diff
Raw Normal View History

Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
From 45b03e3c0e3dcf8f75083538b36238e03907e3fb Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Tue, 5 Jul 2022 11:44:36 -0600
Subject: Adjust paths of OVMF firmwares on SUSE distros
Accepting request 514264 from home:jfehlig:branches:Virtualization - Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
2017-08-03 19:28:59 +02:00
Accepting request 908023 from home:jfehlig:branches:Virtualization:ovmf - libxl: ovmf now provides only one firmware for Xen. The firmware is named ovmf-x86_64-xen-4m.bin in the SUSE ovmf package. Adjust the upstream default firmware path to match the SUSE name. - packaging: To improve maintainability, rename suse-ovmf-paths.patch to suse-qemu-ovmf-paths.patch and suse-xen-ovmf-loaders.patch to suse-xen-ovmf-paths.patch OBS-URL: https://build.opensuse.org/request/show/908023 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=898
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.
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
src/qemu/qemu.conf.in | 7 +++----
src/qemu/qemu_conf.c | 7 +++----
src/qemu/test_libvirtd_qemu.aug.in | 7 +++----
src/security/virt-aa-helper.c | 3 ++-
4 files changed, 11 insertions(+), 13 deletions(-)
Index: libvirt-8.7.0/src/qemu/qemu.conf.in
===================================================================
--- libvirt-8.7.0.orig/src/qemu/qemu.conf.in
+++ libvirt-8.7.0/src/qemu/qemu.conf.in
@@ -857,10 +857,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-8.7.0/src/qemu/qemu_conf.c
Accepting request 514264 from home:jfehlig:branches:Virtualization - Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
2017-08-03 19:28:59 +02:00
===================================================================
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
--- libvirt-8.7.0.orig/src/qemu/qemu_conf.c
+++ libvirt-8.7.0/src/qemu/qemu_conf.c
Accepting request 987259 from home:jfehlig:branches:Virtualization - Update to libvirt 8.5.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-5-0-2022-07-01 - Drop downstream-only lxc patches. They received little interest upstream, are difficult to maintain, and are no longer required by the requester (SLE): 0001-Extract-stats-functions-from-the-qemu-driver.patch, 0002-lxc-implement-connectGetAllDomainStats.patch OBS-URL: https://build.opensuse.org/request/show/987259 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=935
2022-07-06 19:18:39 +02:00
@@ -82,10 +82,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
Accepting request 514264 from home:jfehlig:branches:Virtualization - Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
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"
Accepting request 526406 from home:jfehlig:branches:Virtualization - Update to libvirt 3.7.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch, f536b0dd-tests-arch-independent-hash.patch, e4cb8500-avoid-malicious-ssh-hostname-as-args.patch - Support OVMF 4MB firmware images Adjustment to spec file and suse-ovmf-paths.patch - supportconfig plugin: list active networks, interfaces and storage pools OBS-URL: https://build.opensuse.org/request/show/526406 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=619
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:" \
Accepting request 514264 from home:jfehlig:branches:Virtualization - Update to libvirt 3.6.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Fix unit tests on s390x and ppc64 8982f3ab-util-hash-header.patch, 0b1ecf7b-virHashCodeGen-mockable.patch. f536b0dd-tests-arch-independent-hash.patch - Patch cleanup - Renamed libvirtd-defaults.patch to suse-libvirtd-disable-tls.patch - Renamed libvirtd-init-script.patch to suse-libvirtd-sysconfig-settings.patch - Renamed virtlockd-init-script.patch to suse-virtlockd-sysconfig-settings.patch - Renamed virtlogd-init-script.patch to suse-virtlogd-sysconfig-settings.patch - Renamed libvirt-guests-init-script.patch to suse-libvirt-guests-service.patch - Combined suse-libvirtd-service.patch and systemd-service-xen.patch to suse-libvirtd-service-xen.patch since both patches add Xen support to libvirtd service file - Pull OVMF-related changes from suse-qemu-conf.patch into a new suse-ovmf-paths.patch - Add a supportconfig plugin libvirt-supportconfig FATE#323661 OBS-URL: https://build.opensuse.org/request/show/514264 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=615
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
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
Index: libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
Accepting request 614408 from home:jfehlig:branches:Virtualization - spec: use wireshark plugin directory from pkg-config - virt-aa-helper: add SUSE path to OVMF and AAVMF images Adjusted suse-ovmf-paths.patch boo#1095556 - Update to libvirt 4.4.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - CVE-2018-3639 - Dropped patches: 1dbca2ec-CVE-2018-3639.patch, 92673422-CVE-2018-3639.patch - libxl: fix leaking logfile fds 67c56f6e-libxl-logfd-leak-fix.patch bsc#1094480 OBS-URL: https://build.opensuse.org/request/show/614408 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=691
2018-06-06 01:59:32 +02:00
===================================================================
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
--- libvirt-8.7.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-8.7.0/src/qemu/test_libvirtd_qemu.aug.in
Accepting request 852455 from home:jfehlig:branches:Virtualization - Update to libvirt 6.10.0 - jsc#SLE-13688 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html - Dropped patches: f035f53b-virt-guest-shutdown.patch OBS-URL: https://build.opensuse.org/request/show/852455 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=861
2020-12-02 05:12:13 +01:00
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
- Fix 'make check' with all downstream patches applied. Some patches touch config files and needed the corresponding augeaus test files updated. Updated patches: suse-libvirtd-disable-tls.patch, suse-qemu-conf.patch, suse-ovmf-paths.patch, suse-libxl-disable-autoballoon.patch boo#1175574 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=847
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" }
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
Index: libvirt-8.7.0/src/security/virt-aa-helper.c
Accepting request 975882 from home:jfehlig:branches:Virtualization - Update to libvirt 8.3.0 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-3-0-2022-05-02 OBS-URL: https://build.opensuse.org/request/show/975882 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=929
2022-05-09 18:16:57 +02:00
===================================================================
Accepting request 1000754 from home:jfehlig:branches:Virtualization - Update to libvirt 8.7.0 - jsc#PED-620, jsc#PED-1540 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html#v8-7-0-2022-09-01 - Dropped patches: 9493c9b7-lxc-containter-fix-build-with-glibc-2.36.patch, c0d9adf2-virfile-Fix-build-with-glibc-2.36.patch - spec: Suppress error messages about nonexistent or unreadable files from grep OBS-URL: https://build.opensuse.org/request/show/1000754 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=943
2022-09-02 00:07:34 +02:00
--- libvirt-8.7.0.orig/src/security/virt-aa-helper.c
+++ libvirt-8.7.0/src/security/virt-aa-helper.c
@@ -480,7 +480,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[] = {
Copy Permalink