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-06-05 23:31:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Sat Jun 5 23:31:08 2021 rev:330 rq:896745 version:7.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2021-04-08 21:02:01.385891407 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new.1898/libvirt.changes 2021-06-05 23:31:39.804451666 +0200 @@ -1,0 +2,23 @@ +Tue Jun 1 15:06:44 UTC 2021 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 7.4.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + ee890f25-libxl-mock-funcs.patch + +------------------------------------------------------------------- +Mon May 3 22:14:22 UTC 2021 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 7.3.0 + - libvirt-admin package merged with libvirt-daemon + - libvirt-bash-completion package merged with libvirt-client and + libvirt-daemon packages + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + suse-bump-xen-version.patch + - Added patches: + ee890f25-libxl-mock-funcs.patch + +------------------------------------------------------------------- Old: ---- libvirt-7.2.0.tar.xz libvirt-7.2.0.tar.xz.asc suse-bump-xen-version.patch New: ---- libvirt-7.4.0.tar.xz libvirt-7.4.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.564458204 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.568458211 +0200 @@ -141,7 +141,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 7.2.0 +Version: 7.4.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -316,8 +316,7 @@ Patch211: lxc-wait-after-eth-del.patch Patch212: suse-libxl-disable-autoballoon.patch Patch213: suse-xen-ovmf-loaders.patch -Patch214: suse-bump-xen-version.patch -Patch215: virt-create-rootfs.patch +Patch214: virt-create-rootfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -368,6 +367,8 @@ # libvirtd depends on 'messagebus' service Requires: dbus-1 Requires: group(libvirt) +# Needed by libvirt-guests init script. +Requires: gettext-runtime # A KVM or Xen libvirt stack really does need UEFI firmware these days %ifarch x86_64 @@ -380,6 +381,11 @@ Requires: apparmor-abstractions %endif +# Ensure smooth upgrades +Obsoletes: libvirt-admin < 7.3.0 +Provides: libvirt-admin = %{version} +Obsoletes: libvirt-bash-completion < 7.3.0 + %description daemon Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM @@ -746,12 +752,12 @@ Summary: Client side utilities of the libvirt library Group: System/Management Requires: %{name}-libs = %{version}-%{release} -# Needed by libvirt-guests init script. -Requires: gettext-runtime # Needed by virt-pki-validate script. Requires: cyrus-sasl Requires: gnutls -Recommends: %{name}-bash-completion = %{version}-%{release} + +# Ensure smooth upgrades +Obsoletes: libvirt-bash-completion < 7.3.0 %description client The client binaries needed to access the virtualization @@ -767,24 +773,6 @@ %description libs Shared libraries for accessing the libvirt daemon. -%package admin -Summary: Set of tools to control libvirt daemon -Group: System/Management -Requires: %{name}-libs = %{version}-%{release} -Recommends: %{name}-bash-completion = %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - -%package bash-completion -Summary: Bash completion script -Group: System/Shells -BuildArch: noarch -Requires: bash-completion >= 2.0 - -%description bash-completion -Bash completion script stub. - %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries/C and C++ @@ -1141,18 +1129,20 @@ VIR_TEST_DEBUG=1 %meson_test -t 5 --no-suite syntax-check %pre daemon -%service_add_pre libvirtd.service libvirtd.socket libvirtd-ro.socket 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 +%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 virt-guest-shutdown.target %post daemon /sbin/ldconfig %if %{with_apparmor} %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd %endif -%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket 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 +%service_add_post 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 %{fillup_only -n libvirtd} +%{fillup_only -n libvirt-guests} %{fillup_only -n virtlockd} %{fillup_only -n virtproxyd} %{fillup_only -n virtlogd} + # The '--listen' option is incompatible with socket activation. # We need to forcibly remove it from /etc/sysconfig/libvirtd. # Also add the --timeout option to be consistent with upstream. @@ -1163,12 +1153,15 @@ fi %preun daemon -%service_del_preun libvirtd.service libvirtd.socket libvirtd-ro.socket 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 +%service_del_preun 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 +if [ $1 = 0 ]; then + rm -f /var/lib/%{name}/libvirt-guests +fi %postun daemon /sbin/ldconfig # Handle restart/reload in posttrans -%service_del_postun_without_restart libvirtd.service libvirtd.socket libvirtd-ro.socket 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 +%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 @@ -1322,22 +1315,6 @@ %postun daemon-driver-libxl %service_del_postun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket -%pre client -%service_add_pre libvirt-guests.service - -%post client -%service_add_post libvirt-guests.service -%{fillup_only -n libvirt-guests} - -%preun client -%service_del_preun libvirt-guests.service -if [ $1 = 0 ]; then - rm -f /var/lib/%{name}/libvirt-guests -fi - -%postun client -%service_del_postun_without_restart libvirt-guests.service - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -1354,15 +1331,18 @@ %{_sbindir}/virtlogd %{_sbindir}/virtlockd %dir %{_libdir}/%{name} +%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks %{_fillupdir}/sysconfig.libvirtd +%{_fillupdir}/sysconfig.libvirt-guests %{_fillupdir}/sysconfig.virtproxyd %{_fillupdir}/sysconfig.virtlogd %{_fillupdir}/sysconfig.virtlockd %{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.socket %{_unitdir}/libvirtd-ro.socket +%{_unitdir}/libvirt-guests.service %{_unitdir}/libvirtd-admin.socket %{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tls.socket @@ -1380,9 +1360,12 @@ %{_unitdir}/virtlockd.socket %{_unitdir}/virtlockd-admin.socket %{_sbindir}/rclibvirtd +%{_sbindir}/rclibvirt-guests %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd %{_sbindir}/rcvirtproxyd +%{_bindir}/virt-admin +%{_bindir}/virt-host-validate %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf %config(noreplace) %{_sysconfdir}/%{name}/virtproxyd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1403,11 +1386,7 @@ %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug -%{_datadir}/systemtap/tapset/libvirt_probes*.stp -%{_datadir}/systemtap/tapset/libvirt_functions.stp -%if %{with_qemu} -%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp -%endif +%{_datadir}/bash-completion/completions/virt-admin %dir %{_localstatedir}/lib/%{name}/ %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/%{name}/filesystems/ @@ -1423,6 +1402,8 @@ %{_datadir}/polkit-1/actions/org.libvirt.api.policy %attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper %attr(0755, root, root) %{_bindir}/virt-ssh-helper +%doc %{_mandir}/man1/virt-admin.1* +%doc %{_mandir}/man1/virt-host-validate.1* %doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlockd.8* @@ -1729,17 +1710,11 @@ %doc %{_mandir}/man1/virsh.1* %doc %{_mandir}/man1/virt-xml-validate.1* %doc %{_mandir}/man1/virt-pki-validate.1* -%doc %{_mandir}/man1/virt-host-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate -%{_bindir}/virt-host-validate %{_datadir}/bash-completion/completions/virsh %dir %{_libdir}/%{name} -%attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh -%{_fillupdir}/sysconfig.libvirt-guests -%{_unitdir}/libvirt-guests.service -%{_sbindir}/rclibvirt-guests %files libs -f %{name}.lang %config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf @@ -1752,19 +1727,15 @@ %dir %{_datadir}/%{name}/schemas/ %dir %{_datadir}/%{name}/cpu_map/ %dir %attr(0755, root, root) %{_localstatedir}/lib/%{name}/ - +%{_datadir}/systemtap/tapset/libvirt_probes*.stp +%{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif %{_datadir}/%{name}/schemas/*.rng %{_datadir}/%{name}/cpu_map/*.xml %{_datadir}/%{name}/test-screenshot.png -%files admin -%doc %{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - -%files bash-completion -%{_datadir}/bash-completion/completions/vsh - %files devel %{_libdir}/libvirt.so %{_libdir}/libvirt-admin.so ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.604458274 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.608458280 +0200 @@ -18,11 +18,11 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-7.2.0/src/conf/domain_stats.c +Index: libvirt-7.4.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-7.2.0/src/conf/domain_stats.c -@@ -0,0 +1,119 @@ ++++ libvirt-7.4.0/src/conf/domain_stats.c +@@ -0,0 +1,117 @@ +/* + * domain_stats.c: domain stats extraction helpers + * @@ -43,8 +43,6 @@ + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. -+ * -+ * Author: Daniel P. Berrange <berra...@redhat.com> + */ + +#include <config.h> @@ -62,8 +60,8 @@ +VIR_LOG_INIT("conf.domain_stats"); + +int -+virDomainStatsGetState(virDomainObjPtr dom, -+ virTypedParamListPtr params) ++virDomainStatsGetState(virDomainObj *dom, ++ virTypedParamList *params) +{ + if (virTypedParamListAddInt(params, dom->state.state, "state.state") < 0) + return -1; @@ -80,8 +78,8 @@ + return -1; + +int -+virDomainStatsGetInterface(virDomainObjPtr dom, -+ virTypedParamListPtr params) ++virDomainStatsGetInterface(virDomainObj *dom, ++ virTypedParamList *params) +{ + size_t i; + struct _virDomainInterfaceStats tmp; @@ -94,7 +92,7 @@ + + /* Check the path is one of the domain's network interfaces. */ + for (i = 0; i < dom->def->nnets; i++) { -+ virDomainNetDefPtr net = dom->def->nets[i]; ++ virDomainNetDef *net = dom->def->nets[i]; + virDomainNetType actualType; + + if (!net->ifname) @@ -142,11 +140,11 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-7.2.0/src/conf/domain_stats.h +Index: libvirt-7.4.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-7.2.0/src/conf/domain_stats.h -@@ -0,0 +1,62 @@ ++++ libvirt-7.4.0/src/conf/domain_stats.h +@@ -0,0 +1,60 @@ +/* + * domain_stats.h: domain stats extraction helpers + * @@ -167,8 +165,6 @@ + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. -+ * -+ * Author: Daniel P. Berrange <berra...@redhat.com> + */ +#ifndef __DOMAIN_STATS_H +# define __DOMAIN_STATS_H @@ -202,18 +198,18 @@ + goto cleanup; \ +} while (0) + -+int virDomainStatsGetState(virDomainObjPtr dom, -+ virTypedParamListPtr params); ++int virDomainStatsGetState(virDomainObj *dom, ++ virTypedParamList *params); + -+int virDomainStatsGetInterface(virDomainObjPtr dom, -+ virTypedParamListPtr params); ++int virDomainStatsGetInterface(virDomainObj *dom, ++ virTypedParamList *params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-7.2.0/src/libvirt_private.syms +Index: libvirt-7.4.0/src/libvirt_private.syms =================================================================== ---- libvirt-7.2.0.orig/src/libvirt_private.syms -+++ libvirt-7.2.0/src/libvirt_private.syms -@@ -752,12 +752,16 @@ virDomainConfNWFilterTeardown; +--- libvirt-7.4.0.orig/src/libvirt_private.syms ++++ libvirt-7.4.0/src/libvirt_private.syms +@@ -756,12 +756,16 @@ virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -231,7 +227,7 @@ # conf/interface_conf.h virInterfaceDefFormat; virInterfaceDefFree; -@@ -1908,6 +1912,7 @@ virCgroupGetMemoryUsage; +@@ -1918,6 +1922,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -239,10 +235,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-7.2.0/src/qemu/qemu_driver.c +Index: libvirt-7.4.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/qemu/qemu_driver.c -+++ libvirt-7.2.0/src/qemu/qemu_driver.c +--- libvirt-7.4.0.orig/src/qemu/qemu_driver.c ++++ libvirt-7.4.0/src/qemu/qemu_driver.c @@ -67,6 +67,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -251,8 +247,8 @@ #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -17552,13 +17553,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr - virTypedParamListPtr params, +@@ -17537,13 +17538,7 @@ qemuDomainGetStatsState(virQEMUDriver *d + virTypedParamList *params, unsigned int privflags G_GNUC_UNUSED) { - if (virTypedParamListAddInt(params, dom->state.state, "state.state") < 0) @@ -266,10 +262,10 @@ } -@@ -17852,25 +17847,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj - virTypedParamListPtr params) +@@ -17836,25 +17831,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj + virTypedParamList *params) { - qemuDomainObjPrivatePtr priv = dom->privateData; + qemuDomainObjPrivate *priv = dom->privateData; - unsigned long long cpu_time = 0; - unsigned long long user_time = 0; - unsigned long long sys_time = 0; @@ -293,7 +289,7 @@ } -@@ -18043,76 +18024,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -18027,76 +18008,15 @@ qemuDomainGetStatsVcpu(virQEMUDriver *dr return ret; } @@ -303,9 +299,9 @@ - return -1; - static int - qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED, - virDomainObjPtr dom, - virTypedParamListPtr params, + qemuDomainGetStatsInterface(virQEMUDriver *driver G_GNUC_UNUSED, + virDomainObj *dom, + virTypedParamList *params, unsigned int privflags G_GNUC_UNUSED) { - size_t i; @@ -319,7 +315,7 @@ - - /* Check the path is one of the domain's network interfaces. */ - for (i = 0; i < dom->def->nnets; i++) { -- virDomainNetDefPtr net = dom->def->nets[i]; +- virDomainNetDef *net = dom->def->nets[i]; - virDomainNetType actualType; - - if (!net->ifname) @@ -371,17 +367,17 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-7.2.0/src/util/vircgroup.c +Index: libvirt-7.4.0/src/util/vircgroup.c =================================================================== ---- libvirt-7.2.0.orig/src/util/vircgroup.c -+++ libvirt-7.2.0/src/util/vircgroup.c -@@ -2981,6 +2981,31 @@ virCgroupControllerAvailable(int control +--- libvirt-7.4.0.orig/src/util/vircgroup.c ++++ libvirt-7.4.0/src/util/vircgroup.c +@@ -3002,6 +3002,31 @@ virCgroupControllerAvailable(int control return virCgroupHasController(cgroup, controller); } +int -+virCgroupGetStatsCpu(virCgroupPtr cgroup, -+ virTypedParamListPtr params) ++virCgroupGetStatsCpu(virCgroup *cgroup, ++ virTypedParamList *params) +{ + unsigned long long cpu_time = 0; + unsigned long long user_time = 0; @@ -407,13 +403,13 @@ #else /* !__linux__ */ bool -@@ -2990,6 +3015,14 @@ virCgroupAvailable(void) +@@ -3011,6 +3036,14 @@ virCgroupAvailable(void) } +int -+virCgroupGetStatsCpu(virCgroupPtr cgroup, -+ virTypedParamListPtr params) ++virCgroupGetStatsCpu(virCgroup *cgroup, ++ virTypedParamList *params) +{ + return 0; +} @@ -422,10 +418,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-7.2.0/src/util/vircgroup.h +Index: libvirt-7.4.0/src/util/vircgroup.h =================================================================== ---- libvirt-7.2.0.orig/src/util/vircgroup.h -+++ libvirt-7.2.0/src/util/vircgroup.h +--- libvirt-7.4.0.orig/src/util/vircgroup.h ++++ libvirt-7.4.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -434,17 +430,17 @@ struct _virCgroup; typedef struct _virCgroup virCgroup; -@@ -284,3 +285,6 @@ int virCgroupSetOwner(virCgroupPtr cgrou - int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); +@@ -283,3 +284,6 @@ int virCgroupSetOwner(virCgroup *cgroup, + int virCgroupHasEmptyTasks(virCgroup *cgroup, int controller); bool virCgroupControllerAvailable(int controller); + -+int virCgroupGetStatsCpu(virCgroupPtr cgroup, -+ virTypedParamListPtr params); -Index: libvirt-7.2.0/src/conf/meson.build ++int virCgroupGetStatsCpu(virCgroup *cgroup, ++ virTypedParamList *params); +Index: libvirt-7.4.0/src/conf/meson.build =================================================================== ---- libvirt-7.2.0.orig/src/conf/meson.build -+++ libvirt-7.2.0/src/conf/meson.build +--- libvirt-7.4.0.orig/src/conf/meson.build ++++ libvirt-7.4.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.WcufYg/_old 2021-06-05 23:31:43.616458294 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.616458294 +0200 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-7.2.0/src/libxl/libxl_driver.c +Index: libvirt-7.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.2.0/src/libxl/libxl_driver.c -@@ -5307,6 +5307,96 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-7.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.4.0/src/libxl/libxl_driver.c +@@ -5310,6 +5310,97 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -39,11 +39,11 @@ + unsigned long long size, + unsigned int flags) +{ -+ libxlDriverPrivatePtr driver = dom->conn->privateData; -+ libxlDriverConfigPtr cfg; -+ virDomainObjPtr vm; ++ libxlDriverPrivate *driver = dom->conn->privateData; ++ libxlDriverConfig *cfg; ++ virDomainObj *vm; + int ret = -1; -+ virDomainDiskDefPtr disk = NULL; ++ virDomainDiskDef *disk = NULL; + char *moncmd = NULL; + char *monreply = NULL; + @@ -97,7 +97,8 @@ + + moncmd = g_strdup_printf("block_resize %s %lluB", disk->dst, size); + -+ if (libxl_qemu_monitor_command(cfg->ctx, vm->def->id, moncmd, &monreply) != 0) { ++ if (libxlQemuMonitorCommandWrapper(cfg->ctx, vm->def->id, ++ moncmd, &monreply) != 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("block_resize command failed for device '%s' on domain '%d'"), + disk->dst, vm->def->id); @@ -120,7 +121,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6607,6 +6697,7 @@ static virHypervisorDriver libxlHypervis +@@ -6610,6 +6701,7 @@ static virHypervisorDriver libxlHypervis #endif .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ @@ -128,3 +129,26 @@ .domainGetJobInfo = libxlDomainGetJobInfo, /* 1.3.1 */ .domainGetJobStats = libxlDomainGetJobStats, /* 1.3.1 */ .domainMemoryStats = libxlDomainMemoryStats, /* 1.3.0 */ +Index: libvirt-7.4.0/src/libxl/libxl_api_wrapper.h +=================================================================== +--- libvirt-7.4.0.orig/src/libxl/libxl_api_wrapper.h ++++ libvirt-7.4.0/src/libxl/libxl_api_wrapper.h +@@ -215,3 +215,18 @@ libxlSetMemoryTargetWrapper(libxl_ctx *c + + return ret; + } ++ ++static inline int ++libxlQemuMonitorCommandWrapper(libxl_ctx *ctx, uint32_t domid, ++ const char *command_line, char **output) ++{ ++ int ret; ++ ++#if LIBXL_API_VERSION < 0x041300 ++ ret = libxl_qemu_monitor_command(ctx, domid, command_line, output); ++#else ++ ret = libxl_qemu_monitor_command(ctx, domid, command_line, output, NULL); ++#endif ++ ++ return ret; ++} ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.624458309 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.624458309 +0200 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-7.2.0/src/lxc/lxc_driver.c +Index: libvirt-7.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.2.0/src/lxc/lxc_driver.c +--- libvirt-7.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.4.0/src/lxc/lxc_driver.c @@ -74,6 +74,8 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" @@ -22,21 +22,21 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5068,6 +5070,128 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5064,6 +5066,128 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } +static int -+lxcDomainGetStatsCpu(virDomainObjPtr dom, -+ virTypedParamListPtr params) ++lxcDomainGetStatsCpu(virDomainObj *dom, ++ virTypedParamList *params) +{ -+ virLXCDomainObjPrivatePtr priv = dom->privateData; ++ virLXCDomainObjPrivate *priv = dom->privateData; + return virCgroupGetStatsCpu(priv->cgroup, params); +} + +typedef int -+(*lxcDomainGetStatsFunc)(virDomainObjPtr dom, -+ virTypedParamListPtr params); ++(*lxcDomainGetStatsFunc)(virDomainObj *dom, ++ virTypedParamList *params); + + +struct lxcDomainGetStatsWorker { @@ -53,7 +53,7 @@ + +static int +lxcDomainGetStats(virConnectPtr conn, -+ virDomainObjPtr dom, ++ virDomainObj *dom, + unsigned int stats, + virDomainStatsRecordPtr *record) +{ @@ -85,9 +85,9 @@ + virDomainStatsRecordPtr **retStats, + unsigned int flags) +{ -+ virLXCDriverPtr driver = conn->privateData; -+ virDomainObjPtr *vms = NULL; -+ virDomainObjPtr vm; ++ virLXCDriver *driver = conn->privateData; ++ virDomainObj **vms = NULL; ++ virDomainObj *vm; + size_t nvms; + virDomainStatsRecordPtr *tmpstats = NULL; + int nstats = 0; @@ -151,7 +151,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5165,6 +5289,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5161,6 +5285,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ libvirt-7.2.0.tar.xz -> libvirt-7.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-7.2.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.1898/libvirt-7.4.0.tar.xz differ: char 26, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.664458378 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.664458378 +0200 @@ -2,10 +2,10 @@ From: <r...@suse.de> -Index: libvirt-7.2.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-7.4.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-7.2.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-7.2.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-7.4.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-7.4.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.WcufYg/_old 2021-06-05 23:31:43.688458420 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.692458427 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-7.2.0/tools/virsh.c +Index: libvirt-7.4.0/tools/virsh.c =================================================================== ---- libvirt-7.2.0.orig/tools/virsh.c -+++ libvirt-7.2.0/tools/virsh.c -@@ -543,6 +543,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ +--- libvirt-7.4.0.orig/tools/virsh.c ++++ libvirt-7.4.0/tools/virsh.c +@@ -542,6 +542,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -11,10 +11,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-7.2.0/src/interface/interface_backend_netcf.c +Index: libvirt-7.4.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-7.2.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-7.2.0/src/interface/interface_backend_netcf.c +--- libvirt-7.4.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-7.4.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.2.0/src/interface/interface_driver.c +Index: libvirt-7.4.0/src/interface/interface_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/interface/interface_driver.c -+++ libvirt-7.2.0/src/interface/interface_driver.c +--- libvirt-7.4.0.orig/src/interface/interface_driver.c ++++ libvirt-7.4.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.2.0/meson.build +Index: libvirt-7.4.0/meson.build =================================================================== ---- libvirt-7.2.0.orig/meson.build -+++ libvirt-7.2.0/meson.build -@@ -1165,6 +1165,12 @@ if not get_option('netcf').disabled() +--- libvirt-7.4.0.orig/meson.build ++++ libvirt-7.4.0/meson.build +@@ -1070,6 +1070,12 @@ if not get_option('netcf').disabled() endif endif @@ -164,7 +164,7 @@ have_gnu_gettext_tools = false if not get_option('nls').disabled() have_gettext = cc.has_function('gettext') -@@ -1556,10 +1562,10 @@ elif get_option('driver_hyperv').enabled +@@ -1465,10 +1471,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') -@@ -2363,6 +2369,7 @@ libs_summary = { +@@ -2277,6 +2283,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.2.0/src/interface/meson.build +Index: libvirt-7.4.0/src/interface/meson.build =================================================================== ---- libvirt-7.2.0.orig/src/interface/meson.build -+++ libvirt-7.2.0/src/interface/meson.build +--- libvirt-7.4.0.orig/src/interface/meson.build ++++ libvirt-7.4.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.2.0/meson_options.txt +Index: libvirt-7.4.0/meson_options.txt =================================================================== ---- libvirt-7.2.0.orig/meson_options.txt -+++ libvirt-7.2.0/meson_options.txt +--- libvirt-7.4.0.orig/meson_options.txt ++++ libvirt-7.4.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.WcufYg/_old 2021-06-05 23:31:43.736458503 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.736458503 +0200 @@ -8,19 +8,19 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-7.2.0/src/libxl/libxl_driver.c +Index: libvirt-7.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.2.0/src/libxl/libxl_driver.c -@@ -1372,6 +1372,61 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-7.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.4.0/src/libxl/libxl_driver.c +@@ -1367,6 +1367,63 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int +libxlDomainReset(virDomainPtr dom, unsigned int flags) +{ -+ libxlDriverPrivatePtr driver = dom->conn->privateData; -+ libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); -+ virDomainObjPtr vm; ++ libxlDriverPrivate *driver = dom->conn->privateData; ++ libxlDriverConfig *cfg = libxlDriverConfigGet(driver); ++ virDomainObj *vm; + int ret = -1; + + virCheckFlags(0, -1); @@ -28,6 +28,8 @@ + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + ++ LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); ++ + if (virDomainResetEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + @@ -74,7 +76,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6485,6 +6540,7 @@ static virHypervisorDriver libxlHypervis +@@ -6486,6 +6543,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.WcufYg/_old 2021-06-05 23:31:43.748458524 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.748458524 +0200 @@ -3,11 +3,11 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-7.2.0/src/libxl/libxl_conf.c +Index: libvirt-7.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.2.0/src/libxl/libxl_conf.c -@@ -916,6 +916,30 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-7.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.4.0/src/libxl/libxl_conf.c +@@ -965,6 +965,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -36,9 +36,9 @@ +} + static char * - libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, + libxlMakeNetworkDiskSrcStr(virStorageSource *src, const char *username, -@@ -1158,6 +1182,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1209,6 +1233,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.756458538 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.756458538 +0200 @@ -16,11 +16,11 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-7.2.0/docs/manpages/virsh.rst +Index: libvirt-7.4.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-7.2.0.orig/docs/manpages/virsh.rst -+++ libvirt-7.2.0/docs/manpages/virsh.rst -@@ -3178,7 +3178,8 @@ migrate +--- libvirt-7.4.0.orig/docs/manpages/virsh.rst ++++ libvirt-7.4.0/docs/manpages/virsh.rst +@@ -3180,7 +3180,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] [--bandwidth bandwidth] [--tls-destination hostname] @@ -30,7 +30,7 @@ Migrate domain to another host. Add *--live* for live migration; <--p2p> for peer-2-peer migration; *--direct* for direct migration; or *--tunnelled* -@@ -3284,6 +3285,12 @@ parallel connections. The number of such +@@ -3286,6 +3287,12 @@ parallel connections. The number of such network link between the source and the target and thus speeding up the migration. @@ -43,11 +43,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.2.0/include/libvirt/libvirt-domain.h +Index: libvirt-7.4.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-7.2.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-7.2.0/include/libvirt/libvirt-domain.h -@@ -1078,6 +1078,25 @@ typedef enum { +--- libvirt-7.4.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-7.4.0/include/libvirt/libvirt-domain.h +@@ -1079,6 +1079,25 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -73,11 +73,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-7.2.0/src/libxl/libxl_driver.c +Index: libvirt-7.4.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.2.0/src/libxl/libxl_driver.c -@@ -6047,6 +6047,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-7.4.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.4.0/src/libxl/libxl_driver.c +@@ -6050,6 +6050,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -87,7 +87,7 @@ #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6063,6 +6066,15 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6066,6 +6069,15 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -103,7 +103,7 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6077,11 +6089,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6080,11 +6092,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -117,19 +117,19 @@ goto cleanup; } -Index: libvirt-7.2.0/src/libxl/libxl_migration.c +Index: libvirt-7.4.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_migration.c -+++ libvirt-7.2.0/src/libxl/libxl_migration.c -@@ -340,18 +340,38 @@ libxlMigrateDstReceive(virNetSocketPtr s +--- libvirt-7.4.0.orig/src/libxl/libxl_migration.c ++++ libvirt-7.4.0/src/libxl/libxl_migration.c +@@ -340,18 +340,38 @@ libxlMigrateDstReceive(virNetSocket *soc static int - libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, + libxlDoMigrateSrcSend(libxlDriverPrivate *driver, + virDomainObj *vm, - unsigned long flags, + const libxlDomainMigrationProps *props, int sockfd) { - libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDriverConfig *cfg = libxlDriverConfigGet(driver); +#ifdef LIBXL_HAVE_DOMAIN_SUSPEND_SUSE + libxl_domain_suspend_suse_properties libxl_props = { + .flags = 0, @@ -164,8 +164,8 @@ _("Failed to send migration data to destination host")); @@ -898,7 +918,7 @@ struct libxlTunnelControl { static int - libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, + libxlMigrationSrcStartTunnel(libxlDriverPrivate *driver, + virDomainObj *vm, - unsigned long flags, + const libxlDomainMigrationProps *props, virStreamPtr st, @@ -180,7 +180,7 @@ virObjectLock(vm); out: -@@ -967,7 +987,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -967,7 +987,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -189,7 +189,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1012,11 +1032,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1012,11 +1032,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 +203,7 @@ if (!(st = virStreamNew(dconn, 0))) goto confirm; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1030,7 +1050,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1030,7 +1050,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate if (ret == -1) goto confirm; @@ -212,7 +212,7 @@ if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1045,11 +1065,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1045,11 +1065,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -227,7 +227,7 @@ if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1084,7 +1104,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1084,7 +1104,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate confirm: if (notify_source) { VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -236,7 +236,7 @@ if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -1092,7 +1112,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1092,7 +1112,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivate } cleanup: @@ -270,7 +270,7 @@ - unsigned int flags) + const libxlDomainMigrationProps *props) { - libxlDomainObjPrivatePtr priv = vm->privateData; + libxlDomainObjPrivate *priv = vm->privateData; char *hostname = NULL; @@ -1236,7 +1256,7 @@ libxlDomainMigrationSrcPerform(libxlDriv @@ -281,10 +281,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-7.2.0/src/libxl/libxl_migration.h +Index: libvirt-7.4.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_migration.h -+++ libvirt-7.2.0/src/libxl/libxl_migration.h +--- libvirt-7.4.0.orig/src/libxl/libxl_migration.h ++++ libvirt-7.4.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, \ @@ -307,8 +307,8 @@ +} libxlDomainMigrationProps; + int - libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, + libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate *driver, + virDomainObj *vm, @@ -74,7 +84,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str, @@ -317,7 +317,7 @@ + const libxlDomainMigrationProps *props); int - libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, + libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver, @@ -83,7 +93,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri, const char *uri_str, @@ -327,11 +327,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-7.2.0/tools/virsh-domain.c +Index: libvirt-7.4.0/tools/virsh-domain.c =================================================================== ---- libvirt-7.2.0.orig/tools/virsh-domain.c -+++ libvirt-7.2.0/tools/virsh-domain.c -@@ -10691,6 +10691,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-7.4.0.orig/tools/virsh-domain.c ++++ libvirt-7.4.0/tools/virsh-domain.c +@@ -10685,6 +10685,18 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_STRING, .help = N_("override the destination host name used for TLS verification") }, @@ -350,7 +350,7 @@ {.name = NULL} }; -@@ -10711,6 +10723,7 @@ doMigrate(void *opaque) +@@ -10705,6 +10717,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -358,7 +358,7 @@ #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10841,6 +10854,22 @@ doMigrate(void *opaque) +@@ -10835,6 +10848,22 @@ doMigrate(void *opaque) goto save_error; } ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.764458552 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.768458559 +0200 @@ -7,11 +7,11 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-7.2.0/src/libxl/libxl_conf.c +Index: libvirt-7.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.2.0/src/libxl/libxl_conf.c -@@ -916,6 +916,22 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-7.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.4.0/src/libxl/libxl_conf.c +@@ -965,6 +965,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -34,15 +34,15 @@ static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -1057,6 +1073,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1110,6 +1126,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int - libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) + libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk) { + const char *src = virDomainDiskGetSource(l_disk); const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1072,7 +1089,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1123,7 +1140,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -51,7 +51,7 @@ } x_disk->vdev = g_strdup(l_disk->dst); -@@ -1183,6 +1200,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1234,6 +1251,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; libxlDiskSetCacheMode(x_disk, l_disk->cachemode); ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.776458573 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.776458573 +0200 @@ -13,11 +13,11 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-7.2.0/src/lxc/lxc_controller.c +Index: libvirt-7.4.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-7.2.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.2.0/src/lxc/lxc_controller.c -@@ -2005,6 +2005,7 @@ static int virLXCControllerDeleteInterfa +--- libvirt-7.4.0.orig/src/lxc/lxc_controller.c ++++ libvirt-7.4.0/src/lxc/lxc_controller.c +@@ -2013,6 +2013,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-7.2.0/src/lxc/lxc_driver.c +Index: libvirt-7.4.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.2.0/src/lxc/lxc_driver.c +--- libvirt-7.4.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.4.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" -@@ -3546,6 +3547,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive +@@ -3542,6 +3543,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: -@@ -3985,6 +3987,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -3981,6 +3983,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.2.0/src/lxc/lxc_process.c +Index: libvirt-7.4.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-7.2.0.orig/src/lxc/lxc_process.c -+++ libvirt-7.2.0/src/lxc/lxc_process.c +--- libvirt-7.4.0.orig/src/lxc/lxc_process.c ++++ libvirt-7.4.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.WcufYg/_old 2021-06-05 23:31:43.784458586 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.784458586 +0200 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-7.2.0/src/network/bridge_driver.c +Index: libvirt-7.4.0/src/network/bridge_driver.c =================================================================== ---- libvirt-7.2.0.orig/src/network/bridge_driver.c -+++ libvirt-7.2.0/src/network/bridge_driver.c -@@ -1483,7 +1483,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-7.4.0.orig/src/network/bridge_driver.c ++++ libvirt-7.4.0/src/network/bridge_driver.c +@@ -1482,7 +1482,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.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-7.4.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-7.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-7.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-7.4.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-7.4.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.WcufYg/_old 2021-06-05 23:31:43.792458600 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.792458600 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-7.2.0/src/util/virarch.c +Index: libvirt-7.4.0/src/util/virarch.c =================================================================== ---- libvirt-7.2.0.orig/src/util/virarch.c -+++ libvirt-7.2.0/src/util/virarch.c +--- libvirt-7.4.0.orig/src/util/virarch.c ++++ libvirt-7.4.0/src/util/virarch.c @@ -220,6 +220,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.800458614 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.800458614 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-7.2.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.4.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.2.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.2.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.4.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.4.0/src/security/apparmor/libvirt-qemu @@ -244,3 +244,6 @@ # /sys/bus/nd/devices / r, # harmless on any lsb compliant system ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.808458629 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.812458635 +0200 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-7.2.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.4.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.2.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.2.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.4.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.4.0/src/security/apparmor/libvirt-qemu @@ -64,6 +64,7 @@ #/dev/fb* rw, @@ -20,10 +20,10 @@ @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-7.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-7.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== ---- libvirt-7.2.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ libvirt-7.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +--- libvirt-7.4.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-7.4.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -19,7 +19,7 @@ profile virt-aa-helper @libexecdir@/virt # Used when internally running another command (namely apparmor_parser) @{PROC}/@{pid}/fd/ r, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.816458643 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.820458649 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-7.2.0/tools/libvirt-guests.sh.in +Index: libvirt-7.4.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-7.2.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-7.2.0/tools/libvirt-guests.sh.in +--- libvirt-7.4.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-7.4.0/tools/libvirt-guests.sh.in @@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" libvirtd="@sbindir@"/libvirtd @@ -28,10 +28,10 @@ RETVAL=0 -Index: libvirt-7.2.0/tools/libvirt-guests.sysconf +Index: libvirt-7.4.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-7.2.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-7.2.0/tools/libvirt-guests.sysconf +--- libvirt-7.4.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-7.4.0/tools/libvirt-guests.sysconf @@ -1,9 +1,14 @@ +## Path: System/Virtualization/libvirt-guests # Customizations for the libvirt-guests.service systemd unit ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.828458663 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.828458663 +0200 @@ -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.2.0/src/remote/remote_daemon_config.c +Index: libvirt-7.4.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-7.2.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-7.2.0/src/remote/remote_daemon_config.c +--- libvirt-7.4.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-7.4.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.2.0/src/remote/libvirtd.conf.in +Index: libvirt-7.4.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-7.2.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-7.2.0/src/remote/libvirtd.conf.in +--- libvirt-7.4.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-7.4.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.2.0/src/remote/test_libvirtd.aug.in +Index: libvirt-7.4.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-7.2.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-7.2.0/src/remote/test_libvirtd.aug.in +--- libvirt-7.4.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-7.4.0/src/remote/test_libvirtd.aug.in @@ -3,7 +3,7 @@ module Test_@DAEMON_NAME@ = test @DAEMON_NAME_UC@.lns get conf = ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.836458677 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.840458684 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-7.2.0/src/remote/libvirtd.sysconf +Index: libvirt-7.4.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-7.2.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-7.2.0/src/remote/libvirtd.sysconf +--- libvirt-7.4.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-7.4.0/src/remote/libvirtd.sysconf @@ -1,5 +1,8 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.848458698 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.848458698 +0200 @@ -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.2.0/src/libxl/libxl.conf +Index: libvirt-7.4.0/src/libxl/libxl.conf =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl.conf -+++ libvirt-7.2.0/src/libxl/libxl.conf +--- libvirt-7.4.0.orig/src/libxl/libxl.conf ++++ libvirt-7.4.0/src/libxl/libxl.conf @@ -4,12 +4,11 @@ # Enable autoballooning of domain0 @@ -27,11 +27,11 @@ # In order to prevent accidentally starting two domains that -Index: libvirt-7.2.0/src/libxl/libxl_conf.c +Index: libvirt-7.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.2.0/src/libxl/libxl_conf.c -@@ -1743,15 +1743,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa +--- libvirt-7.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.4.0/src/libxl/libxl_conf.c +@@ -1786,15 +1786,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified * setting in libxl.conf first. If not specified, autoballooning @@ -40,15 +40,15 @@ + * is disabled. */ static int - libxlGetAutoballoonConf(libxlDriverConfigPtr cfg, - virConfPtr conf) + libxlGetAutoballoonConf(libxlDriverConfig *cfg, + virConf *conf) { - g_autoptr(GRegex) regex = NULL; - g_autoptr(GError) err = NULL; int res; res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); -@@ -1760,15 +1757,8 @@ libxlGetAutoballoonConf(libxlDriverConfi +@@ -1803,15 +1800,8 @@ libxlGetAutoballoonConf(libxlDriverConfi else if (res == 1) return 0; @@ -66,10 +66,10 @@ return 0; } -Index: libvirt-7.2.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-7.4.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-7.2.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-7.2.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-7.4.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-7.4.0/src/libxl/test_libvirtd_libxl.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd_libxl = @CONFIG@ ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.856458712 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.856458712 +0200 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-7.2.0/src/qemu/qemu.conf +Index: libvirt-7.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.2.0.orig/src/qemu/qemu.conf -+++ libvirt-7.2.0/src/qemu/qemu.conf +--- libvirt-7.4.0.orig/src/qemu/qemu.conf ++++ libvirt-7.4.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. @@ -18,11 +18,11 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-7.2.0/src/qemu/qemu_conf.c +Index: libvirt-7.4.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.2.0/src/qemu/qemu_conf.c -@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver +--- libvirt-7.4.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.4.0/src/qemu/qemu_conf.c +@@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriver *driver) #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ @@ -36,10 +36,10 @@ #endif -Index: libvirt-7.2.0/src/security/virt-aa-helper.c +Index: libvirt-7.4.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-7.2.0.orig/src/security/virt-aa-helper.c -+++ libvirt-7.2.0/src/security/virt-aa-helper.c +--- libvirt-7.4.0.orig/src/security/virt-aa-helper.c ++++ libvirt-7.4.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 */ @@ -50,10 +50,10 @@ }; /* override the above with these */ const char * const override[] = { -Index: libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.4.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.4.0/src/qemu/test_libvirtd_qemu.aug.in @@ -96,10 +96,9 @@ module Test_libvirtd_qemu = { "migration_port_max" = "49215" } { "log_timestamp" = "0" } ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.864458726 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.864458726 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-7.2.0/src/qemu/qemu.conf +Index: libvirt-7.4.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.2.0.orig/src/qemu/qemu.conf -+++ libvirt-7.2.0/src/qemu/qemu.conf +--- libvirt-7.4.0.orig/src/qemu/qemu.conf ++++ libvirt-7.4.0/src/qemu/qemu.conf @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,11 +60,11 @@ # #lock_manager = "lockd" -Index: libvirt-7.2.0/src/qemu/qemu_conf.c +Index: libvirt-7.4.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.2.0/src/qemu/qemu_conf.c -@@ -272,7 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf +--- libvirt-7.4.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.4.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.2.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.4.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.2.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.4.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-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.888458767 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.888458767 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-7.2.0/src/locking/virtlockd.sysconf +Index: libvirt-7.4.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-7.2.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-7.2.0/src/locking/virtlockd.sysconf +--- libvirt-7.4.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-7.4.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.900458788 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.900458788 +0200 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-7.2.0/src/logging/virtlogd.sysconf +Index: libvirt-7.4.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-7.2.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-7.2.0/src/logging/virtlogd.sysconf +--- libvirt-7.4.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-7.4.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ suse-xen-ovmf-loaders.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.912458809 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.912458809 +0200 @@ -5,11 +5,11 @@ upstream efforts to improve firmware handling in the qemu driver broke the firmware handling in the xen driver. -Index: libvirt-7.2.0/src/libxl/libxl_conf.c +Index: libvirt-7.4.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.2.0/src/libxl/libxl_conf.c -@@ -1783,6 +1783,15 @@ libxlDriverConfigNew(void) +--- libvirt-7.4.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.4.0/src/libxl/libxl_conf.c +@@ -1826,6 +1826,15 @@ libxlDriverConfigNew(void) cfg->autoDumpDir = g_strdup(LIBXL_DUMP_DIR); cfg->channelDir = g_strdup(LIBXL_CHANNEL_DIR); ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.WcufYg/_old 2021-06-05 23:31:43.924458830 +0200 +++ /var/tmp/diff_new_pack.WcufYg/_new 2021-06-05 23:31:43.924458830 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-7.2.0/tools/virt-create-rootfs +Index: libvirt-7.4.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-7.2.0/tools/virt-create-rootfs ++++ libvirt-7.4.0/tools/virt-create-rootfs @@ -0,0 +1,231 @@ +#!/bin/sh +set -e @@ -234,10 +234,10 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-7.2.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-7.4.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-7.2.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-7.4.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs @@ -327,10 +327,10 @@ +======== + +virsh(1), `https://libvirt.org/ <https://libvirt.org/>`_ -Index: libvirt-7.2.0/docs/manpages/meson.build +Index: libvirt-7.4.0/docs/manpages/meson.build =================================================================== ---- libvirt-7.2.0.orig/docs/manpages/meson.build -+++ libvirt-7.2.0/docs/manpages/meson.build +--- libvirt-7.4.0.orig/docs/manpages/meson.build ++++ libvirt-7.4.0/docs/manpages/meson.build @@ -19,6 +19,7 @@ docs_man_files = [ { 'name': 'virt-pki-validate', 'section': '1', 'install': true }, { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') }, @@ -339,10 +339,10 @@ { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') }, { 'name': 'virt-sanlock-cleanup', 'section': '8', 'install': conf.has('WITH_SANLOCK') }, -Index: libvirt-7.2.0/tools/meson.build +Index: libvirt-7.4.0/tools/meson.build =================================================================== ---- libvirt-7.2.0.orig/tools/meson.build -+++ libvirt-7.2.0/tools/meson.build +--- libvirt-7.4.0.orig/tools/meson.build ++++ libvirt-7.4.0/tools/meson.build @@ -149,6 +149,8 @@ else virsh_icon_res = [] endif
