Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2021-07-29 21:31:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt"
Thu Jul 29 21:31:12 2021 rev:335 rq:908661 version:7.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2021-07-22
22:42:35.527259890 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new.1899/libvirt.changes
2021-07-29 21:31:47.824783399 +0200
@@ -1,0 +2,16 @@
+Tue Jul 27 18:10:29 UTC 2021 - James Fehlig <jfeh...@suse.com>
+
+- spec: Re-exec'ing virt{lock,log}d in posttrans was mistakenly
+ dropped in a previous change. Add it back.
+
+-------------------------------------------------------------------
+Thu Jul 22 22:19:47 UTC 2021 - James Fehlig <jfeh...@suse.com>
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
suse-ovmf-paths.patch
suse-xen-ovmf-loaders.patch
New:
----
suse-qemu-ovmf-paths.patch
suse-xen-ovmf-paths.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.Os6Me2/_old 2021-07-29 21:31:48.880782098 +0200
+++ /var/tmp/diff_new_pack.Os6Me2/_new 2021-07-29 21:31:48.884782093 +0200
@@ -302,13 +302,13 @@
Patch200: suse-libvirtd-disable-tls.patch
Patch201: suse-libvirt-guests-service.patch
Patch202: suse-qemu-conf.patch
-Patch203: suse-ovmf-paths.patch
+Patch203: suse-qemu-ovmf-paths.patch
Patch204: libxl-support-block-script.patch
Patch205: qemu-apparmor-screenshot.patch
Patch206: libvirt-suse-netcontrol.patch
Patch207: lxc-wait-after-eth-del.patch
Patch208: suse-libxl-disable-autoballoon.patch
-Patch209: suse-xen-ovmf-loaders.patch
+Patch209: suse-xen-ovmf-paths.patch
Patch210: virt-create-rootfs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1147,6 +1147,10 @@
%service_del_postun_without_restart libvirtd.service libvirtd.socket
libvirtd-ro.socket libvirt-guests.service libvirtd-admin.socket
libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket
virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
virtproxyd.service virtproxyd.socket virtproxyd-ro.socket
virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
virt-guest-shutdown.target
%posttrans daemon
+# virtlockd and virtlogd must not be restarted, particularly virtlockd since
the
+# locks it uses to protect VM resources would be lost. Both are safe to
re-exec.
+%{_bindir}/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1
|| :
+%{_bindir}/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 ||
:
# The '--listen' option is incompatible with socket activation.
# Check if the existing install uses --listen
listen_mode=no
++++++ suse-qemu-ovmf-paths.patch ++++++
Adjust paths of OVMF firmwares on SUSE distros
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.
Index: libvirt-7.5.0/src/qemu/qemu.conf
===================================================================
--- libvirt-7.5.0.orig/src/qemu/qemu.conf
+++ libvirt-7.5.0/src/qemu/qemu.conf
@@ -858,10 +858,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-7.5.0/src/qemu/qemu_conf.c
===================================================================
--- libvirt-7.5.0.orig/src/qemu/qemu_conf.c
+++ libvirt-7.5.0/src/qemu/qemu_conf.c
@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *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-7.5.0/src/security/virt-aa-helper.c
===================================================================
--- libvirt-7.5.0.orig/src/security/virt-aa-helper.c
+++ libvirt-7.5.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[] = {
Index: libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
===================================================================
--- libvirt-7.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in
+++ libvirt-7.5.0/src/qemu/test_libvirtd_qemu.aug.in
@@ -96,10 +96,9 @@ module Test_libvirtd_qemu =
{ "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" }
++++++ suse-xen-ovmf-paths.patch ++++++
libxl: Use the SUSE ovmf firmware path for Xen
The libxl driver trivially supports firmware autoselection since as of
June 2021 ovmf only supports one firmware for Xen. This patch adjusts
the firmware path to match the one provided by the ovmf package.
Index: libvirt-7.5.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-7.5.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.5.0/src/libxl/libxl_conf.c
@@ -1813,7 +1813,7 @@ libxlDriverConfigNew(void)
cfg->firmwares = g_new0(virFirmware *, 1);
cfg->nfirmwares = 1;
cfg->firmwares[0] = g_new0(virFirmware, 1);
- cfg->firmwares[0]->name = g_strdup(LIBXL_FIRMWARE_DIR "/ovmf.bin");
+ cfg->firmwares[0]->name = g_strdup(DATADIR "/qemu/ovmf-x86_64-xen-4m.bin");
#endif
/* Always add hvmloader to firmwares */
