Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2022-01-21 01:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Fri Jan 21 01:25:01 2022 rev:346 rq:947276 version:8.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2021-12-16 21:19:18.450521130 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.1938/libvirt.changes 2022-01-21 01:25:08.290703182 +0100 @@ -1,0 +2,28 @@ +Tue Jan 18 17:11:13 UTC 2022 - James Fehlig <jfeh...@suse.com> + +- sysconfig files have not been distributed for many months. Add + upstream patches that improve documentation and moves service + default settings to the associated systemd service file. + 3be5ba11-libvirt-guests-install.patch, + 16172741-libvirt-guests-manpage.patch, + 8eb44616-remove-sysconfig-files.patch + +------------------------------------------------------------------- +Tue Jan 18 03:06:25 UTC 2022 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 8.0.0 + - CVE-2021-4147 + - bsc#1191511 + - jsc#SLE-11435, jsc#SLE-18354 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html#v8-0-0-2022-01-14 + - Dropped patches: + 23b51d7b-libxl-disable-death-event.patch, + a4e6fba0-libxl-rename-threadinfo-struct.patch, + e4f7589a-libxl-shutdown-thread-name.patch, + b9a5faea-libxl-handle-death-thread.patch, + 5c5df531-libxl-search-domid-in-thread.patch, + a7a03324-libxl-protect-logger-access.patch, + cbae4eaa-libxl-add-domainGetMessages.patch + +------------------------------------------------------------------- Old: ---- 23b51d7b-libxl-disable-death-event.patch 5c5df531-libxl-search-domid-in-thread.patch a4e6fba0-libxl-rename-threadinfo-struct.patch a7a03324-libxl-protect-logger-access.patch b9a5faea-libxl-handle-death-thread.patch cbae4eaa-libxl-add-domainGetMessages.patch e4f7589a-libxl-shutdown-thread-name.patch libvirt-7.10.0.tar.xz libvirt-7.10.0.tar.xz.asc New: ---- 16172741-libvirt-guests-manpage.patch 3be5ba11-libvirt-guests-install.patch 8eb44616-remove-sysconfig-files.patch libvirt-8.0.0.tar.xz libvirt-8.0.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.506694846 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.514694791 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -138,9 +138,27 @@ %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan %endif +# libvirt no longer distributes sysconfig files. +# If the user has customized a sysconfig file, the RPM upgrade path will rename +# it to .rpmsave since the file is no longer managed by RPM. To prevent a +# regression, we rename it back after the transaction to preserve the user's +# modifications +%define libvirt_sysconfig_pre() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}.rpmsave.old" ; \ + done \ + %{nil} +%define libvirt_sysconfig_posttrans() \ + for sc in %{?*} ; do \ + test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \ + mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}" ; \ + done \ + %{nil} + Name: libvirt URL: http://libvirt.org/ -Version: 7.10.0 +Version: 8.0.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -219,7 +237,6 @@ BuildRequires: ebtables BuildRequires: iptables BuildRequires: polkit >= 0.112 -BuildRequires: radvd # For mount/umount in FS driver BuildRequires: util-linux # For LVM drivers @@ -235,8 +252,6 @@ BuildRequires: parted-devel # For Multipath support BuildRequires: device-mapper-devel -# For XFS reflink clone support -BuildRequires: xfsprogs-devel %if %{with_storage_rbd} BuildRequires: %{with_rbd_lib} %endif @@ -286,13 +301,9 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 23b51d7b-libxl-disable-death-event.patch -Patch1: a4e6fba0-libxl-rename-threadinfo-struct.patch -Patch2: e4f7589a-libxl-shutdown-thread-name.patch -Patch3: b9a5faea-libxl-handle-death-thread.patch -Patch4: 5c5df531-libxl-search-domid-in-thread.patch -Patch5: a7a03324-libxl-protect-logger-access.patch -Patch6: cbae4eaa-libxl-add-domainGetMessages.patch +Patch0: 3be5ba11-libvirt-guests-install.patch +Patch1: 16172741-libvirt-guests-manpage.patch +Patch2: 8eb44616-remove-sysconfig-files.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -345,9 +356,10 @@ Requires: %{name}-libs = %{version}-%{release} -# So remote clients can access libvirt over SSH tunnel -# (client invokes 'nc' against the UNIX socket on the server) -Requires: netcat-openbsd +# netcat is needed on the server side so that clients that have +# libvirt < 6.9.0 can connect, but newer versions will prefer +# virt-ssh-helper +Recommends: netcat-openbsd # for modprobe of pci devices Requires: modutils # for /sbin/ip & /sbin/tc @@ -427,7 +439,6 @@ Requires: %{name}-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: iptables -Requires: radvd %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -1071,17 +1082,6 @@ # init scripts rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtproxyd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtinterfaced -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtnetworkd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtnodedevd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtnwfilterd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtsecretd -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtstoraged -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests # Provide rc symlink backward compatibility ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtproxyd @@ -1096,19 +1096,15 @@ ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirt-guests %if %{with_qemu} -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtqemud ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtqemud %endif %if %{with_lxc} -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtlxcd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlxcd %endif %if %{with_libxl} -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtxend ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtxend %endif %if %{with_vbox} -rm -f %{buildroot}/%{_sysconfdir}/sysconfig/virtvboxd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtvboxd %endif @@ -1136,6 +1132,7 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check %pre daemon +%libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests %service_add_pre 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 %post daemon @@ -1157,64 +1154,20 @@ %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 %posttrans daemon +%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests # 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 -if test -f %{_sysconfdir}/sysconfig/libvirtd; then - if grep -q -E '^LIBVIRTD_ARGS=.*--listen' %{_sysconfdir}/sysconfig/libvirtd; then - listen_mode=yes - fi - # A benefit of socket activation is libvirtd doesn't need to be running - # when unused. If sockets are enabled, set a timeout value if it doesn't - # already exist - if test "$listen_mode" = no && \ - %{_bindir}/systemctl -q is-enabled libvirtd.socket; then - awk -i inplace " - /^LIBVIRTD_ARGS=/ { - gsub(\"^LIBVIRTD_ARGS=\", \"\") - gsub(\"^['\\\"]\", \"\") - gsub(\"['\\\"]$\", \"\") - printf \"LIBVIRTD_ARGS='\" - num = split(\$0, values) - got_timeout = 0 - for ( i = 1; i <= num ; i++) { - if (values[i] ~ /^--timeout=/) - got_timeout = 1 - if (values[i] ~ /^--timeout$/) { - if (i < num) { - got_timeout = 1 - printf \"%%s \",values[i] - i++ - } else { - continue - } - } - printf \"%%s\",values[i] - if (i >= 1 && i < num) - printf \" \" - } - if (got_timeout == 0) - if (num == 0) - printf \"--timeout 120\" - else - printf \" --timeout 120\" - printf \"'\n\" - next - } - { print } " "%{_sysconfdir}/sysconfig/libvirtd" || : - fi -fi # All connection drivers should be installed post transaction. # Time to restart the daemon test -f %{_sysconfdir}/sysconfig/services -a \ -z "$DISABLE_RESTART_ON_UPDATE" && . %{_sysconfdir}/sysconfig/services if test "$DISABLE_RESTART_ON_UPDATE" != yes -a \ "$DISABLE_RESTART_ON_UPDATE" != 1; then - if test "$listen_mode" = yes; then + # See if user has previously modified their install to + # tell libvirtd to use --listen + if grep -q -E '^LIBVIRTD_ARGS=.*--listen' %{_sysconfdir}/sysconfig/libvirtd; then # Keep honouring --listen and *not* use systemd socket activation. # Switching things might confuse management tools that expect the old # style libvirtd @@ -1450,6 +1403,8 @@ %attr(0755, root, root) %{_bindir}/virt-ssh-helper %doc %{_mandir}/man1/virt-admin.1* %doc %{_mandir}/man1/virt-host-validate.1* +%doc %{_mandir}/man8/virt-ssh-helper.8* +%doc %{_mandir}/man8/libvirt-guests.8* %doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlockd.8* @@ -1630,6 +1585,7 @@ %files daemon-driver-qemu %config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud +%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug %{_unitdir}/virtqemud.service @@ -1747,6 +1703,7 @@ %files client %doc %{_mandir}/man1/virsh.1* %doc %{_mandir}/man1/virt-xml-validate.1* +%doc %{_mandir}/man1/virt-pki-query-dn.1* %doc %{_mandir}/man1/virt-pki-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.550694545 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.554694517 +0100 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-7.10.0/src/conf/domain_stats.c +Index: libvirt-8.0.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-7.10.0/src/conf/domain_stats.c ++++ libvirt-8.0.0/src/conf/domain_stats.c @@ -0,0 +1,117 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -140,10 +140,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-7.10.0/src/conf/domain_stats.h +Index: libvirt-8.0.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-7.10.0/src/conf/domain_stats.h ++++ libvirt-8.0.0/src/conf/domain_stats.h @@ -0,0 +1,60 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -205,11 +205,11 @@ + virTypedParamList *params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-7.10.0/src/libvirt_private.syms +Index: libvirt-8.0.0/src/libvirt_private.syms =================================================================== ---- libvirt-7.10.0.orig/src/libvirt_private.syms -+++ libvirt-7.10.0/src/libvirt_private.syms -@@ -770,6 +770,11 @@ virDomainConfNWFilterTeardown; +--- libvirt-8.0.0.orig/src/libvirt_private.syms ++++ libvirt-8.0.0/src/libvirt_private.syms +@@ -772,6 +772,11 @@ virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -221,7 +221,7 @@ # conf/domain_validate.h virDomainActualNetDefValidate; virDomainDefValidate; -@@ -1950,6 +1955,7 @@ virCgroupGetMemoryUsage; +@@ -1942,6 +1947,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -229,10 +229,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-7.10.0/src/qemu/qemu_driver.c +Index: libvirt-8.0.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/qemu/qemu_driver.c -+++ libvirt-7.10.0/src/qemu/qemu_driver.c +--- libvirt-8.0.0.orig/src/qemu/qemu_driver.c ++++ libvirt-8.0.0/src/qemu/qemu_driver.c @@ -68,6 +68,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -241,7 +241,7 @@ #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -17530,13 +17531,7 @@ qemuDomainGetStatsState(virQEMUDriver *d +@@ -17407,13 +17408,7 @@ qemuDomainGetStatsState(virQEMUDriver *d virTypedParamList *params, unsigned int privflags G_GNUC_UNUSED) { @@ -256,7 +256,7 @@ } -@@ -17828,25 +17823,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -17705,25 +17700,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj virTypedParamList *params) { qemuDomainObjPrivate *priv = dom->privateData; @@ -283,7 +283,7 @@ } static int -@@ -18039,76 +18020,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr +@@ -17916,76 +17897,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr return ret; } @@ -361,11 +361,11 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-7.10.0/src/util/vircgroup.c +Index: libvirt-8.0.0/src/util/vircgroup.c =================================================================== ---- libvirt-7.10.0.orig/src/util/vircgroup.c -+++ libvirt-7.10.0/src/util/vircgroup.c -@@ -3033,6 +3033,31 @@ virCgroupGetInode(virCgroup *cgroup) +--- libvirt-8.0.0.orig/src/util/vircgroup.c ++++ libvirt-8.0.0/src/util/vircgroup.c +@@ -3022,6 +3022,31 @@ virCgroupGetInode(virCgroup *cgroup) return st.st_ino; } @@ -397,7 +397,7 @@ #else /* !__linux__ */ bool -@@ -3042,6 +3067,14 @@ virCgroupAvailable(void) +@@ -3031,6 +3056,14 @@ virCgroupAvailable(void) } @@ -412,10 +412,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-7.10.0/src/util/vircgroup.h +Index: libvirt-8.0.0/src/util/vircgroup.h =================================================================== ---- libvirt-7.10.0.orig/src/util/vircgroup.h -+++ libvirt-7.10.0/src/util/vircgroup.h +--- libvirt-8.0.0.orig/src/util/vircgroup.h ++++ libvirt-8.0.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -432,10 +432,10 @@ + virTypedParamList *params); + int virCgroupGetInode(virCgroup *cgroup); -Index: libvirt-7.10.0/src/conf/meson.build +Index: libvirt-8.0.0/src/conf/meson.build =================================================================== ---- libvirt-7.10.0.orig/src/conf/meson.build -+++ libvirt-7.10.0/src/conf/meson.build +--- libvirt-8.0.0.orig/src/conf/meson.build ++++ libvirt-8.0.0/src/conf/meson.build @@ -15,6 +15,7 @@ domain_conf_sources = [ 'domain_conf.c', 'domain_nwfilter.c', ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.566694435 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.566694435 +0100 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-7.10.0/src/libxl/libxl_driver.c +Index: libvirt-8.0.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.10.0/src/libxl/libxl_driver.c -@@ -5254,6 +5254,95 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-8.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.0.0/src/libxl/libxl_driver.c +@@ -5241,6 +5241,95 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -119,7 +119,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6575,6 +6664,7 @@ static virHypervisorDriver libxlHypervis +@@ -6554,6 +6643,7 @@ static virHypervisorDriver libxlHypervis .domainGetNumaParameters = libxlDomainGetNumaParameters, /* 1.1.1 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ @@ -127,10 +127,10 @@ .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ -Index: libvirt-7.10.0/src/libxl/libxl_api_wrapper.h +Index: libvirt-8.0.0/src/libxl/libxl_api_wrapper.h =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_api_wrapper.h -+++ libvirt-7.10.0/src/libxl/libxl_api_wrapper.h +--- libvirt-8.0.0.orig/src/libxl/libxl_api_wrapper.h ++++ libvirt-8.0.0/src/libxl/libxl_api_wrapper.h @@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c return ret; ++++++ 0001-util-Don-t-spawn-pkttyagent-when-stdin-is-not-a-tty.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.574694380 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.578694352 +0100 @@ -18,10 +18,10 @@ src/util/virpolkit.c | 3 +++ 1 file changed, 3 insertions(+) -Index: libvirt-7.10.0/src/util/virpolkit.c +Index: libvirt-8.0.0/src/util/virpolkit.c =================================================================== ---- libvirt-7.10.0.orig/src/util/virpolkit.c -+++ libvirt-7.10.0/src/util/virpolkit.c +--- libvirt-8.0.0.orig/src/util/virpolkit.c ++++ libvirt-8.0.0/src/util/virpolkit.c @@ -237,6 +237,9 @@ virPolkitAgentAvailable(void) const char *termid = ctermid(NULL); VIR_AUTOCLOSE fd = -1; ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.586694298 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.590694271 +0100 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-7.10.0/src/lxc/lxc_driver.c +Index: libvirt-8.0.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.10.0/src/lxc/lxc_driver.c +--- libvirt-8.0.0.orig/src/lxc/lxc_driver.c ++++ libvirt-8.0.0/src/lxc/lxc_driver.c @@ -74,6 +74,8 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" @@ -22,7 +22,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5075,6 +5077,128 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5036,6 +5038,128 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -151,7 +151,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5172,6 +5296,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5133,6 +5257,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ 16172741-libvirt-guests-manpage.patch ++++++ commit 161727417a91bdddf8f3167cf70c3de2829be81c Author: Jim Fehlig <jfeh...@suse.com> Date: Fri Jan 7 14:35:10 2022 -0700 docs: Add man page for libvirt-guests Signed-off-by: Jim Fehlig <jfeh...@suse.com> Reviewed-by: Andrea Bolognani <abolo...@redhat.com> Index: libvirt-8.0.0/docs/manpages/index.rst =================================================================== --- libvirt-8.0.0.orig/docs/manpages/index.rst +++ libvirt-8.0.0/docs/manpages/index.rst @@ -41,6 +41,7 @@ Tools * `virt-admin(1) <virt-admin.html>`__ - daemon administration interface * `virsh(1) <virsh.html>`__ - management user interface * `virt-qemu-run(1) <virt-qemu-run.html>`__ - run standalone QEMU instances +* `libvirt-guests(8) <libvirt-guests.html>`__ - suspend/resume running libvirt guests Key codes ========= Index: libvirt-8.0.0/docs/manpages/libvirt-guests.rst =================================================================== --- /dev/null +++ libvirt-8.0.0/docs/manpages/libvirt-guests.rst @@ -0,0 +1,151 @@ +============== +libvirt-guests +============== + +------------------------------------- +suspend/resume running libvirt guests +------------------------------------- + +:Manual section: 8 +:Manual group: Virtualization Support + +.. contents:: + +SYNOPSIS +======== + +``libvirt-guests`` *COMMAND* + + +DESCRIPTION +=========== + +``libvirt-guests`` is a service that can be used to coordinate guest and host +lifecyle actions. By default, ``libvirt-guests`` will suspend running guests +when the host shuts down, and restore them to their pre-shutdown state when +the host reboots. + +``libvirt-guests`` is typically under control of systemd. When +``libvirt-guests.service`` is enabled, systemd will call ``libvirt-guests`` +with the ``start`` *COMMAND* when the host boots. Conversely, systemd will call +``libvirt-guests`` with the ``stop`` *COMMAND* when the host shuts down. + +``libvirt-guests`` can be used directly. In addition to the ``start`` and +``stop`` *COMMAND*\s, it also supports ``status``, ``restart``, ``condrestart``, +``try-restart``, ``reload``, ``force-reload``, ``gueststatus``, and +``shutdown`` *COMMAND*\s. + + +FILES +===== + +``libvirt-guests`` defines several variables to control service behavior. +The default vaule of these variables can be overridden in: + +* ``@SYSCONFDIR@/sysconfig/libvirt-guests`` + +The following variables are supported: + +- URIS=default + + URIs to check for running guests. Example: + ``URIS='default xen:///system xen+tcp://host/system lxc:///system'`` + +- ON_BOOT=start + + Action taken on host boot + + * start + + All guests which were running on shutdown are started on boot regardless + of their autostart settings + + * ignore + + ``libvirt-guests`` won't start any guest on boot, however, guests marked + as autostart will still be automatically started by libvirtd + +- START_DELAY=0 + + Number of seconds to wait between each guest start. Set to 0 to allow parallel + startup. + +- ON_SHUTDOWN=suspend + + Action taken on host shutdown + + * suspend + + All running guests are suspended using virsh managedsave + + * shutdown + + All running guests are asked to shutdown. Please be careful with this + settings since there is no way to distinguish between a guest which is + stuck or ignores shutdown requests and a guest which just needs a long + time to shutdown. When setting ON_SHUTDOWN=shutdown, you must also set + SHUTDOWN_TIMEOUT to a value suitable for your guests. + +- PARALLEL_SHUTDOWN=0 + + Number of guests will be shutdown concurrently, taking effect when + "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be shutdown one + after another. Number of guests on shutdown at any time will not exceed number + set in this variable. + +- SHUTDOWN_TIMEOUT=300 + + Number of seconds we're willing to wait for a guest to shut down. If parallel + shutdown is enabled, this timeout applies as a timeout for shutting down all + guests on a single URI defined in the variable URIS. If this is 0, then there + is no time out (use with caution, as guests might not respond to a shutdown + request). The default value is 300 seconds (5 minutes). + +- BYPASS_CACHE=0 + + If non-zero, try to bypass the file system cache when saving and + restoring guests, even though this may give slower operation for + some file systems. + +- SYNC_TIME=0 + + If non-zero, try to sync guest time on domain resume. Be aware, that + this requires guest agent with support for time synchronization + running in the guest. By default, this functionality is turned off. + + +BUGS +==== + +Please report all bugs you discover. This should be done via either: + +#. the mailing list + + `https://libvirt.org/contact.html <https://libvirt.org/contact.html>`_ + +#. the bug tracker + + `https://libvirt.org/bugs.html <https://libvirt.org/bugs.html>`_ + +Alternatively, you may report bugs to your software distributor / vendor. + + +AUTHORS +======= + +Please refer to the AUTHORS file distributed with libvirt. + + +LICENSE +======= + +``libvirt-guests`` is distributed under the terms of the GNU LGPL v2.1+. +This is free software; see the source for copying conditions. There +is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE + + +SEE ALSO +======== + +libvirtd(8), `https://libvirt.org/ <https://libvirt.org/>`_ Index: libvirt-8.0.0/docs/manpages/meson.build =================================================================== --- libvirt-8.0.0.orig/docs/manpages/meson.build +++ libvirt-8.0.0/docs/manpages/meson.build @@ -21,6 +21,7 @@ docs_man_files = [ { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, + { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, { 'name': 'virt-ssh-helper', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, Index: libvirt-8.0.0/libvirt.spec.in =================================================================== --- libvirt-8.0.0.orig/libvirt.spec.in +++ libvirt-8.0.0/libvirt.spec.in @@ -1694,6 +1694,7 @@ exit 0 %{_mandir}/man1/virt-admin.1* %{_mandir}/man1/virt-host-validate.1* %{_mandir}/man8/virt-ssh-helper.8* +%{_mandir}/man8/libvirt-guests.8* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* Index: libvirt-8.0.0/tools/libvirt-guests.service.in =================================================================== --- libvirt-8.0.0.orig/tools/libvirt-guests.service.in +++ libvirt-8.0.0/tools/libvirt-guests.service.in @@ -6,7 +6,7 @@ After=network.target After=time-sync.target After=libvirtd.service After=virt-guest-shutdown.target -Documentation=man:libvirtd(8) +Documentation=man:libvirt-guests(8) Documentation=https://libvirt.org [Service] ++++++ 3be5ba11-libvirt-guests-install.patch ++++++ commit 3be5ba11a2c6fcb2dfdffa03ab4f847113f36b85 Author: Jim Fehlig <jfeh...@suse.com> Date: Mon Jan 10 11:42:58 2022 -0700 build: Only install libvirt-guests when building libvirtd libvirt-guests was already moved to the libvirt daemon package in commit d800c50349. It only needs to be installed when building libvirtd. Signed-off-by: Jim Fehlig <jfeh...@suse.com> Reviewed-by: Andrea Bolognani <abolo...@redhat.com> Index: libvirt-8.0.0/tools/meson.build =================================================================== --- libvirt-8.0.0.orig/tools/meson.build +++ libvirt-8.0.0/tools/meson.build @@ -297,29 +297,31 @@ if conf.has('WITH_SANLOCK') ) endif -configure_file( - input: 'libvirt-guests.sh.in', - output: '@BASENAME@', - configuration: tools_conf, - install: true, - install_dir: libexecdir, - install_mode: 'rwxrwxr-x', -) - -if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', - install_dir: sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) - +if conf.has('WITH_LIBVIRTD') configure_file( - input: 'libvirt-guests.service.in', + input: 'libvirt-guests.sh.in', output: '@BASENAME@', configuration: tools_conf, install: true, - install_dir: prefix / 'lib' / 'systemd' / 'system', + install_dir: libexecdir, + install_mode: 'rwxrwxr-x', ) + + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', + install_dir: sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) + + configure_file( + input: 'libvirt-guests.service.in', + output: '@BASENAME@', + configuration: tools_conf, + install: true, + install_dir: prefix / 'lib' / 'systemd' / 'system', + ) + endif endif if bash_completion_dep.found() ++++++ 8eb44616-remove-sysconfig-files.patch ++++++ ++++ 1035 lines (skipped) ++++++ libvirt-7.10.0.tar.xz -> libvirt-8.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-7.10.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.1938/libvirt-8.0.0.tar.xz differ: char 26, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.674693695 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.674693695 +0100 @@ -2,10 +2,10 @@ From: <r...@suse.de> -Index: libvirt-7.10.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-8.0.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-7.10.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-7.10.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-8.0.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-8.0.0/src/cpu_map/ppc64_POWER8.xml @@ -4,5 +4,7 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.702693502 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.706693475 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.10.0/tools/virsh.c +Index: libvirt-8.0.0/tools/virsh.c =================================================================== ---- libvirt-7.10.0.orig/tools/virsh.c -+++ libvirt-7.10.0/tools/virsh.c +--- libvirt-8.0.0.orig/tools/virsh.c ++++ libvirt-8.0.0/tools/virsh.c @@ -552,6 +552,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -11,10 +11,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-7.10.0/src/interface/interface_backend_netcf.c +Index: libvirt-8.0.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-7.10.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-7.10.0/src/interface/interface_backend_netcf.c +--- libvirt-8.0.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-8.0.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -126,10 +126,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-7.10.0/src/interface/interface_driver.c +Index: libvirt-8.0.0/src/interface/interface_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/interface/interface_driver.c -+++ libvirt-7.10.0/src/interface/interface_driver.c +--- libvirt-8.0.0.orig/src/interface/interface_driver.c ++++ libvirt-8.0.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,11 +147,11 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-7.10.0/meson.build +Index: libvirt-8.0.0/meson.build =================================================================== ---- libvirt-7.10.0.orig/meson.build -+++ libvirt-7.10.0/meson.build -@@ -1116,6 +1116,12 @@ else +--- libvirt-8.0.0.orig/meson.build ++++ libvirt-8.0.0/meson.build +@@ -1098,6 +1098,12 @@ else netcf_dep = dependency('', required: false) endif @@ -164,7 +164,7 @@ have_gnu_gettext_tools = false if not get_option('nls').disabled() have_gettext = cc.has_function('gettext') -@@ -1512,10 +1518,10 @@ elif get_option('driver_hyperv').enabled +@@ -1505,10 +1511,10 @@ elif get_option('driver_hyperv').enabled error('openwsman is required for the Hyper-V driver') endif @@ -177,7 +177,7 @@ endif if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') -@@ -2352,6 +2358,7 @@ libs_summary = { +@@ -2345,6 +2351,7 @@ libs_summary = { 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), 'netcf': conf.has('WITH_NETCF'), @@ -185,10 +185,10 @@ 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), -Index: libvirt-7.10.0/src/interface/meson.build +Index: libvirt-8.0.0/src/interface/meson.build =================================================================== ---- libvirt-7.10.0.orig/src/interface/meson.build -+++ libvirt-7.10.0/src/interface/meson.build +--- libvirt-8.0.0.orig/src/interface/meson.build ++++ libvirt-8.0.0/src/interface/meson.build @@ -2,7 +2,7 @@ interface_driver_sources = [ 'interface_driver.c', ] @@ -206,10 +206,10 @@ udev_dep, ], 'link_args': [ -Index: libvirt-7.10.0/meson_options.txt +Index: libvirt-8.0.0/meson_options.txt =================================================================== ---- libvirt-7.10.0.orig/meson_options.txt -+++ libvirt-7.10.0/meson_options.txt +--- libvirt-8.0.0.orig/meson_options.txt ++++ libvirt-8.0.0/meson_options.txt @@ -29,6 +29,7 @@ option('libpcap', type: 'feature', value option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.750693173 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.754693146 +0100 @@ -8,11 +8,11 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-7.10.0/src/libxl/libxl_driver.c +Index: libvirt-8.0.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.10.0/src/libxl/libxl_driver.c -@@ -1340,6 +1340,63 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-8.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.0.0/src/libxl/libxl_driver.c +@@ -1338,6 +1338,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -76,7 +76,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6453,6 +6510,7 @@ static virHypervisorDriver libxlHypervis +@@ -6432,6 +6489,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.762693091 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.766693063 +0100 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-7.10.0/src/libxl/libxl_conf.c +Index: libvirt-8.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.10.0/src/libxl/libxl_conf.c +--- libvirt-8.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.0.0/src/libxl/libxl_conf.c @@ -941,6 +941,28 @@ libxlDiskSetDiscard(libxl_device_disk *x } } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.778692982 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.782692954 +0100 @@ -16,21 +16,19 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-7.10.0/docs/manpages/virsh.rst +Index: libvirt-8.0.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-7.10.0.orig/docs/manpages/virsh.rst -+++ libvirt-7.10.0/docs/manpages/virsh.rst -@@ -3175,7 +3175,8 @@ migrate - [--postcopy-bandwidth bandwidth] +--- libvirt-8.0.0.orig/docs/manpages/virsh.rst ++++ libvirt-8.0.0/docs/manpages/virsh.rst +@@ -3237,6 +3237,7 @@ migrate [--parallel [--parallel-connections connections]] [--bandwidth bandwidth] [--tls-destination hostname] -- [--disks-uri URI] -+ [--disks-uri URI] [--max_iters num] -+ [--min_remaining num] [--abort_if_busy] + [--disks-uri URI] [--copy-storage-synchronous-writes] ++ [--max_iters num] [--min_remaining num] [--abort_if_busy] Migrate domain to another host. Add *--live* for live migration; <--p2p> for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled* -@@ -3281,6 +3282,12 @@ parallel connections. The number of such +@@ -3354,6 +3355,12 @@ parallel connections. The number of such network link between the source and the target and thus speeding up the migration. @@ -43,11 +41,11 @@ Running migration can be canceled by interrupting virsh (usually using ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. -Index: libvirt-7.10.0/include/libvirt/libvirt-domain.h +Index: libvirt-8.0.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-7.10.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-7.10.0/include/libvirt/libvirt-domain.h -@@ -1079,6 +1079,25 @@ typedef enum { +--- libvirt-8.0.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-8.0.0/include/libvirt/libvirt-domain.h +@@ -1089,6 +1089,25 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -73,11 +71,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-7.10.0/src/libxl/libxl_driver.c +Index: libvirt-8.0.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.10.0/src/libxl/libxl_driver.c -@@ -5994,6 +5994,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-8.0.0.orig/src/libxl/libxl_driver.c ++++ libvirt-8.0.0/src/libxl/libxl_driver.c +@@ -5973,6 +5973,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -87,7 +85,7 @@ #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6010,6 +6013,15 @@ libxlDomainMigratePerform3Params(virDoma +@@ -5989,6 +5992,15 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -103,7 +101,7 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6024,11 +6036,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6003,11 +6015,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -117,10 +115,10 @@ goto cleanup; } -Index: libvirt-7.10.0/src/libxl/libxl_migration.c +Index: libvirt-8.0.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_migration.c -+++ libvirt-7.10.0/src/libxl/libxl_migration.c +--- libvirt-8.0.0.orig/src/libxl/libxl_migration.c ++++ libvirt-8.0.0/src/libxl/libxl_migration.c @@ -334,18 +334,38 @@ libxlMigrateDstReceive(virNetSocket *soc static int libxlDoMigrateSrcSend(libxlDriverPrivate *driver, @@ -162,7 +160,7 @@ if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -885,7 +905,7 @@ struct libxlTunnelControl { +@@ -884,7 +904,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, virDomainObj *vm, @@ -171,7 +169,7 @@ virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -918,7 +938,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -917,7 +937,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -180,7 +178,7 @@ virObjectLock(vm); /* libxlMigrationSrcStopTunnel will be called in libxlDoMigrateSrcP2P -@@ -953,7 +973,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -952,7 +972,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -189,7 +187,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -998,11 +1018,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -997,11 +1017,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perspective. */ @@ -203,7 +201,7 @@ if (!(st = virStreamNew(dconn, 0))) goto confirm; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1016,7 +1036,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1015,7 +1035,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate if (ret == -1) goto confirm; @@ -212,7 +210,7 @@ if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1031,11 +1051,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1030,11 +1050,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -227,7 +225,7 @@ if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1070,7 +1090,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1069,7 +1089,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate confirm: if (notify_source) { VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -236,7 +234,7 @@ if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -1078,7 +1098,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate +@@ -1077,7 +1097,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } cleanup: @@ -245,7 +243,7 @@ libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1122,7 +1142,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1121,7 +1141,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str G_GNUC_UNUSED, const char *dname, @@ -254,7 +252,7 @@ { int ret = -1; int useParams; -@@ -1159,7 +1179,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1155,7 +1175,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -263,7 +261,7 @@ if (ret < 0) { /* -@@ -1186,7 +1206,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1182,7 +1202,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri G_GNUC_UNUSED, const char *uri_str, const char *dname G_GNUC_UNUSED, @@ -272,7 +270,7 @@ { libxlDomainObjPrivate *priv = vm->privateData; char *hostname = NULL; -@@ -1222,7 +1242,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1218,7 +1238,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -281,10 +279,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-7.10.0/src/libxl/libxl_migration.h +Index: libvirt-8.0.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_migration.h -+++ libvirt-7.10.0/src/libxl/libxl_migration.h +--- libvirt-8.0.0.orig/src/libxl/libxl_migration.h ++++ libvirt-8.0.0/src/libxl/libxl_migration.h @@ -35,6 +35,9 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -327,11 +325,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-7.10.0/tools/virsh-domain.c +Index: libvirt-8.0.0/tools/virsh-domain.c =================================================================== ---- libvirt-7.10.0.orig/tools/virsh-domain.c -+++ libvirt-7.10.0/tools/virsh-domain.c -@@ -10683,6 +10683,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-8.0.0.orig/tools/virsh-domain.c ++++ libvirt-8.0.0/tools/virsh-domain.c +@@ -10841,6 +10841,18 @@ static const vshCmdOptDef opts_migrate[] .completer = virshCompleteEmpty, .help = N_("override the destination host name used for TLS verification") }, @@ -350,7 +348,7 @@ {.name = NULL} }; -@@ -10703,6 +10715,7 @@ doMigrate(void *opaque) +@@ -10861,6 +10873,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -358,7 +356,7 @@ #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10833,6 +10846,22 @@ doMigrate(void *opaque) +@@ -10991,6 +11004,22 @@ doMigrate(void *opaque) goto save_error; } ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.790692899 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.794692872 +0100 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-7.10.0/src/libxl/libxl_conf.c +Index: libvirt-8.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.10.0/src/libxl/libxl_conf.c +--- libvirt-8.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.0.0/src/libxl/libxl_conf.c @@ -942,6 +942,20 @@ libxlDiskSetDiscard(libxl_device_disk *x } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.802692817 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.806692789 +0100 @@ -13,11 +13,11 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-7.10.0/src/lxc/lxc_controller.c +Index: libvirt-8.0.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-7.10.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.10.0/src/lxc/lxc_controller.c -@@ -2012,6 +2012,7 @@ static int virLXCControllerDeleteInterfa +--- libvirt-8.0.0.orig/src/lxc/lxc_controller.c ++++ libvirt-8.0.0/src/lxc/lxc_controller.c +@@ -2006,6 +2006,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-7.10.0/src/lxc/lxc_driver.c +Index: libvirt-8.0.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.10.0/src/lxc/lxc_driver.c +--- libvirt-8.0.0.orig/src/lxc/lxc_driver.c ++++ libvirt-8.0.0/src/lxc/lxc_driver.c @@ -67,6 +67,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -37,7 +37,7 @@ #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -3539,6 +3540,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive +@@ -3508,6 +3509,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -45,7 +45,7 @@ break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -3978,6 +3980,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -3947,6 +3949,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -53,10 +53,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-7.10.0/src/lxc/lxc_process.c +Index: libvirt-8.0.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-7.10.0.orig/src/lxc/lxc_process.c -+++ libvirt-7.10.0/src/lxc/lxc_process.c +--- libvirt-8.0.0.orig/src/lxc/lxc_process.c ++++ libvirt-8.0.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "virstring.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.818692708 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.822692680 +0100 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-7.10.0/src/network/bridge_driver.c +Index: libvirt-8.0.0/src/network/bridge_driver.c =================================================================== ---- libvirt-7.10.0.orig/src/network/bridge_driver.c -+++ libvirt-7.10.0/src/network/bridge_driver.c -@@ -1449,7 +1449,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-8.0.0.orig/src/network/bridge_driver.c ++++ libvirt-8.0.0/src/network/bridge_driver.c +@@ -1347,7 +1347,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { virBufferAddLit(&configbuf, "dhcp-no-override\n"); @@ -37,10 +37,10 @@ } if (ipdef->tftproot) { -Index: libvirt-7.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-8.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-7.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-7.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-8.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-8.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.830692625 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.834692598 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-7.10.0/src/util/virarch.c +Index: libvirt-8.0.0/src/util/virarch.c =================================================================== ---- libvirt-7.10.0.orig/src/util/virarch.c -+++ libvirt-7.10.0/src/util/virarch.c +--- libvirt-8.0.0.orig/src/util/virarch.c ++++ libvirt-8.0.0/src/util/virarch.c @@ -222,6 +222,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_X86_64; } else if (STREQ(ut.machine, "arm64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.846692515 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.850692488 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.10.0/src/security/apparmor/libvirt-qemu +Index: libvirt-8.0.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.10.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.10.0/src/security/apparmor/libvirt-qemu +--- libvirt-8.0.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-8.0.0/src/security/apparmor/libvirt-qemu @@ -248,3 +248,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.858692433 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.862692405 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-7.10.0/tools/libvirt-guests.sh.in +Index: libvirt-8.0.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-7.10.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-7.10.0/tools/libvirt-guests.sh.in +--- libvirt-8.0.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-8.0.0/tools/libvirt-guests.sh.in @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" libvirtd="@sbindir@"/libvirtd ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.870692351 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.874692324 +0100 @@ -3,10 +3,10 @@ On SUSE distros, the default is for libvirtd to listen only on the Unix Domain Socket. The libvirt client still provides remote access via a SSH tunnel. -Index: libvirt-7.10.0/src/remote/remote_daemon_config.c +Index: libvirt-8.0.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-7.10.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-7.10.0/src/remote/remote_daemon_config.c +--- libvirt-8.0.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-8.0.0/src/remote/remote_daemon_config.c @@ -98,7 +98,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP @@ -16,10 +16,10 @@ # else /* ! LIBVIRTD */ data->listen_tls = false; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-7.10.0/src/remote/libvirtd.conf.in +Index: libvirt-8.0.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-7.10.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-7.10.0/src/remote/libvirtd.conf.in +--- libvirt-8.0.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-8.0.0/src/remote/libvirtd.conf.in @@ -17,8 +17,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -31,10 +31,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to -Index: libvirt-7.10.0/src/remote/test_libvirtd.aug.in +Index: libvirt-8.0.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-7.10.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-7.10.0/src/remote/test_libvirtd.aug.in +--- libvirt-8.0.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-8.0.0/src/remote/test_libvirtd.aug.in @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = test @DAEMON_NAME_UC@.lns get conf = ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.882692269 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.886692241 +0100 @@ -6,10 +6,10 @@ by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-7.10.0/src/libxl/libxl.conf +Index: libvirt-8.0.0/src/libxl/libxl.conf =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl.conf -+++ libvirt-7.10.0/src/libxl/libxl.conf +--- libvirt-8.0.0.orig/src/libxl/libxl.conf ++++ libvirt-8.0.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,10 +27,10 @@ # In order to prevent accidentally starting two domains that -Index: libvirt-7.10.0/src/libxl/libxl_conf.c +Index: libvirt-8.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.10.0/src/libxl/libxl_conf.c +--- libvirt-8.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.0.0/src/libxl/libxl_conf.c @@ -1746,15 +1746,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified @@ -66,10 +66,10 @@ return 0; } -Index: libvirt-7.10.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-8.0.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-7.10.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-7.10.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-8.0.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-8.0.0/src/libxl/test_libvirtd_libxl.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd_libxl = @CONFIG@ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.894692186 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.898692159 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-7.10.0/src/qemu/qemu.conf +Index: libvirt-8.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.10.0.orig/src/qemu/qemu.conf -+++ libvirt-7.10.0/src/qemu/qemu.conf +--- libvirt-8.0.0.orig/src/qemu/qemu.conf ++++ libvirt-8.0.0/src/qemu/qemu.conf @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ # #lock_manager = "lockd" -Index: libvirt-7.10.0/src/qemu/qemu_conf.c +Index: libvirt-8.0.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.10.0/src/qemu/qemu_conf.c +--- libvirt-8.0.0.orig/src/qemu/qemu_conf.c ++++ libvirt-8.0.0/src/qemu/qemu_conf.c @@ -272,7 +272,7 @@ virQEMUDriverConfig *virQEMUDriverConfig cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); @@ -73,10 +73,10 @@ cfg->securityRequireConfined = false; cfg->keepAliveInterval = 5; -Index: libvirt-7.10.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.10.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in @@ -45,6 +45,7 @@ module Test_libvirtd_qemu = { "remote_websocket_port_min" = "5700" } { "remote_websocket_port_max" = "65535" } ++++++ suse-qemu-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.918692022 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.918692022 +0100 @@ -5,10 +5,10 @@ removes the old DEFAULT_LOADER_NVRAM approach and associated code, this patch will stay. -Index: libvirt-7.10.0/src/qemu/qemu.conf +Index: libvirt-8.0.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.10.0.orig/src/qemu/qemu.conf -+++ libvirt-7.10.0/src/qemu/qemu.conf +--- libvirt-8.0.0.orig/src/qemu/qemu.conf ++++ libvirt-8.0.0/src/qemu/qemu.conf @@ -857,10 +857,9 @@ # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. @@ -23,10 +23,10 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-7.10.0/src/qemu/qemu_conf.c +Index: libvirt-8.0.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.10.0/src/qemu/qemu_conf.c +--- libvirt-8.0.0.orig/src/qemu/qemu_conf.c ++++ libvirt-8.0.0/src/qemu/qemu_conf.c @@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver) #ifndef DEFAULT_LOADER_NVRAM @@ -41,10 +41,10 @@ #endif -Index: libvirt-7.10.0/src/security/virt-aa-helper.c +Index: libvirt-8.0.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-7.10.0.orig/src/security/virt-aa-helper.c -+++ libvirt-7.10.0/src/security/virt-aa-helper.c +--- libvirt-8.0.0.orig/src/security/virt-aa-helper.c ++++ libvirt-8.0.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 */ @@ -55,10 +55,10 @@ }; /* override the above with these */ const char * const override[] = { -Index: libvirt-7.10.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.10.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-8.0.0/src/qemu/test_libvirtd_qemu.aug.in @@ -96,10 +96,9 @@ module Test_libvirtd_qemu = { "migration_port_max" = "49215" } { "log_timestamp" = "0" } ++++++ suse-xen-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.930691939 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.930691939 +0100 @@ -5,10 +5,10 @@ the firmware path to match the one provided by the ovmf package. -Index: libvirt-7.10.0/src/libxl/libxl_conf.c +Index: libvirt-8.0.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.10.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.10.0/src/libxl/libxl_conf.c +--- libvirt-8.0.0.orig/src/libxl/libxl_conf.c ++++ libvirt-8.0.0/src/libxl/libxl_conf.c @@ -1797,7 +1797,7 @@ libxlDriverConfigNew(void) cfg->firmwares = g_new0(virFirmware *, 1); cfg->nfirmwares = 1; ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.0QW15g/_old 2022-01-21 01:25:09.942691857 +0100 +++ /var/tmp/diff_new_pack.0QW15g/_new 2022-01-21 01:25:09.946691829 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.10.0/tools/virt-create-rootfs +Index: libvirt-8.0.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-7.10.0/tools/virt-create-rootfs ++++ libvirt-8.0.0/tools/virt-create-rootfs @@ -0,0 +1,236 @@ +#!/bin/sh +set -e @@ -239,10 +239,10 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-7.10.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-8.0.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-7.10.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-8.0.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs @@ -332,22 +332,22 @@ +======== + +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_ -Index: libvirt-7.10.0/docs/manpages/meson.build +Index: libvirt-8.0.0/docs/manpages/meson.build =================================================================== ---- libvirt-7.10.0.orig/docs/manpages/meson.build -+++ libvirt-7.10.0/docs/manpages/meson.build -@@ -19,6 +19,7 @@ docs_man_files = [ +--- libvirt-8.0.0.orig/docs/manpages/meson.build ++++ libvirt-8.0.0/docs/manpages/meson.build +@@ -20,6 +20,7 @@ docs_man_files = [ { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, { 'name': 'virt-xml-validate', 'section': '1', 'install': true }, + { 'name': 'virt-create-rootfs', 'section': '1', 'install': true }, + { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, - { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, -Index: libvirt-7.10.0/tools/meson.build +Index: libvirt-8.0.0/tools/meson.build =================================================================== ---- libvirt-7.10.0.orig/tools/meson.build -+++ libvirt-7.10.0/tools/meson.build +--- libvirt-8.0.0.orig/tools/meson.build ++++ libvirt-8.0.0/tools/meson.build @@ -154,6 +154,8 @@ else virsh_icon_res = [] endif
