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
|
2017-08-03 19:28:59 +02:00
|
|
|
|
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.
|
|
|
|
|
|
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(-)
|
|
|
|
|
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
Index: libvirt-9.1.0/src/qemu/qemu.conf.in
|
2022-09-02 00:07:34 +02:00
|
|
|
===================================================================
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
--- libvirt-9.1.0.orig/src/qemu/qemu.conf.in
|
|
|
|
|
+++ libvirt-9.1.0/src/qemu/qemu.conf.in
|
2022-09-02 00:07:34 +02:00
|
|
|
@@ -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
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
Index: libvirt-9.1.0/src/qemu/qemu_conf.c
|
2017-08-03 19:28:59 +02:00
|
|
|
===================================================================
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
--- libvirt-9.1.0.orig/src/qemu/qemu_conf.c
|
|
|
|
|
+++ libvirt-9.1.0/src/qemu/qemu_conf.c
|
2022-11-02 20:46:59 +01:00
|
|
|
@@ -90,10 +90,9 @@ VIR_ONCE_GLOBAL_INIT(virQEMUConfig);
|
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
|
|
|
|
|
|
|
|
|
|
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
Index: libvirt-9.1.0/src/qemu/test_libvirtd_qemu.aug.in
|
2018-06-06 01:59:32 +02:00
|
|
|
===================================================================
|
Accepting request 1068569 from home:jfehlig:branches:Virtualization
- Update to libvirt 9.1.0
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html#v9-1-0-2023-03-01
- spec: Remove obsolete Groups tag
- spec: Integrate upstream spec file changes that split the
libvirt-daemon package, allowing more modular, customized
installations
- spec: New subpackages libvirt-daemon-common, libvirt-daemon-lock,
libvirt-daemon-log, libvirt-daemon-proxy, and
libvirt-daemon-plugin-lockd
- spec: Renamed subpackage libvirt-lock-sanlock to
libvirt-daemon-plugin-sanlock
- Dropped patches:
ef482951-apparmor-Allow-umount-dev.patch,
d6a8b9ee-qemu-Fix-managed-no-when-creating-ethdev.patch,
c3f16cea-qemu-cleanup-label-on-umount-failure.patch,
697c16e3-qemu_process-better-debug-message.patch,
5155ab4b-qemu_namespace-nested-mounts-when-umount.patch
OBS-URL: https://build.opensuse.org/request/show/1068569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=968
2023-03-02 01:49:27 +01:00
|
|
|
--- libvirt-9.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
|
|
+++ libvirt-9.1.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" }
|