Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2020-05-09 19:50:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Sat May 9 19:50:42 2020 rev:305 rq:801297 version:6.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2020-04-22 20:43:48.974314366 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new.2738/libvirt.changes 2020-05-09 19:50:58.608660447 +0200 @@ -1,0 +2,32 @@ +Wed May 6 20:43:16 UTC 2020 - James Fehlig <[email protected]> + +- Xen: Fix connection when host uses modular daemons + d677de9d-libxl-fix-driver-name-check.patch, + d218a9c2-libxl-xen-driver-tables.patch, + 836ea91d-libxl-xenlight-internal.patch, + 57687260-xen-doc-improvements.patch + boo#1171113 + +------------------------------------------------------------------- +Wed May 6 01:40:32 UTC 2020 - James Fehlig <[email protected]> + +- Update to libvirt 6.3.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - Dropped patches: + 88011ed2-libxl-driver-crash-fix.patch, + 8e669b38-conf-add-event-channels.patch, + a93f55c5-libxl-add-event-channels.patch, + 967f4eeb-xenconfig-event-channels.patch, + 93b15ba0-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch, + b7d6648d-conf-add-e820-host.patch, + 5749395b-libxl-e820-host.patch, + f3ef7daf-xenconfig-e820-host.patch, + 34077c1b-tests-check-e820-host.patch, + fadbaa23-conf-add-passthrough.patch, + 9529e007-libxl-passthrough.patch, + 9cb8bc6f-xenconfig-refactor-features.patch, + b523e225-xenconfig-passthrough.patch, + bed32525-tests-check-passthrough.patch + +------------------------------------------------------------------- Old: ---- 34077c1b-tests-check-e820-host.patch 5749395b-libxl-e820-host.patch 88011ed2-libxl-driver-crash-fix.patch 8e669b38-conf-add-event-channels.patch 93b15ba0-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch 9529e007-libxl-passthrough.patch 967f4eeb-xenconfig-event-channels.patch 9cb8bc6f-xenconfig-refactor-features.patch a93f55c5-libxl-add-event-channels.patch b523e225-xenconfig-passthrough.patch b7d6648d-conf-add-e820-host.patch bed32525-tests-check-passthrough.patch f3ef7daf-xenconfig-e820-host.patch fadbaa23-conf-add-passthrough.patch libvirt-6.2.0.tar.xz libvirt-6.2.0.tar.xz.asc New: ---- 57687260-xen-doc-improvements.patch 836ea91d-libxl-xenlight-internal.patch d218a9c2-libxl-xen-driver-tables.patch d677de9d-libxl-fix-driver-name-check.patch libvirt-6.3.0.tar.xz libvirt-6.3.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.300672666 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.304672674 +0200 @@ -185,7 +185,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 6.2.0 +Version: 6.3.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -338,20 +338,10 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 88011ed2-libxl-driver-crash-fix.patch -Patch1: 8e669b38-conf-add-event-channels.patch -Patch2: a93f55c5-libxl-add-event-channels.patch -Patch3: 967f4eeb-xenconfig-event-channels.patch -Patch4: 93b15ba0-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch -Patch5: b7d6648d-conf-add-e820-host.patch -Patch6: 5749395b-libxl-e820-host.patch -Patch7: f3ef7daf-xenconfig-e820-host.patch -Patch8: 34077c1b-tests-check-e820-host.patch -Patch9: fadbaa23-conf-add-passthrough.patch -Patch10: 9529e007-libxl-passthrough.patch -Patch11: 9cb8bc6f-xenconfig-refactor-features.patch -Patch12: b523e225-xenconfig-passthrough.patch -Patch13: bed32525-tests-check-passthrough.patch +Patch0: d677de9d-libxl-fix-driver-name-check.patch +Patch1: d218a9c2-libxl-xen-driver-tables.patch +Patch2: 836ea91d-libxl-xenlight-internal.patch +Patch3: 57687260-xen-doc-improvements.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -891,16 +881,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -1151,12 +1131,6 @@ mkdir -p %{buildroot}/%{_localstatedir}/lib/%{name} mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/hooks %find_lang %{name} -# Add a README to the libvirt package with a note about the empty -# file list -cat > %{buildroot}/%{_docdir}/%{name}/libvirt.README << 'EOF' -The libvirt package no longer contains any files. It exists now -only to fulfill its 'Provides' contract. -EOF install -d -m 0755 %{buildroot}/%{_localstatedir}/lib/%{name}/dnsmasq/ install -d -m 0755 %{buildroot}/%{_datadir}/%{name}/networks/ cp %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/default.xml \ @@ -1165,40 +1139,18 @@ rm -f %{buildroot}/%{_sysconfdir}/%{name}/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "/<uuid>/d" %{buildroot}/%{_datadir}/%{name}/networks/default.xml -%if %{with_lxc} -cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-lxc.README << 'EOF' -Any empty package encapsulating requirements for a libvirtd capable -of managing LXC. -EOF -%else +%if ! %{with_lxc} rm -rf %{buildroot}/%{_sysconfdir}/%{name}/lxc.conf rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_lxc.aug rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.lxc %endif -%if %{with_qemu} -cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-qemu.README << 'EOF' -Any empty package encapsulating requirements for a libvirtd capable -of managing QEMU/KVM. -EOF -%else +%if ! %{with_qemu} rm -rf %{buildroot}/%{_sysconfdir}/%{name}/qemu.conf rm -f %{buildroot}/%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug rm -rf %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.qemu %endif -%if %{with_vbox} -cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-vbox.README << 'EOF' -Any empty package encapsulating requirements for a libvirtd capable -of managing VirtualBox. -EOF -%endif -%if %{with_libxl} -cat > %{buildroot}/%{_docdir}/%{name}/libvirt-daemon-xen.README << 'EOF' -Any empty package encapsulating requirements for a libvirtd capable -of managing Xen. -EOF -%endif %if ! %{with_libxl} rm -f %{buildroot}/%{_sysconfdir}/%{name}/libxl.conf rm -f %{buildroot}/%{_sysconfdir}/logrotate.d/libvirtd.libxl @@ -1214,15 +1166,46 @@ mkdir -p %{buildroot}/%{_fillupdir} rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_fillupdir}/sysconfig.libvirtd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtproxyd %{buildroot}/%{_fillupdir}/sysconfig.virtproxyd mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_fillupdir}/sysconfig.virtlogd mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_fillupdir}/sysconfig.virtlockd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtinterfaced %{buildroot}/%{_fillupdir}/sysconfig.virtinterfaced +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtnetworkd %{buildroot}/%{_fillupdir}/sysconfig.virtnetworkd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtnodedevd %{buildroot}/%{_fillupdir}/sysconfig.virtnodedevd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtnwfilterd %{buildroot}/%{_fillupdir}/sysconfig.virtnwfilterd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtsecretd %{buildroot}/%{_fillupdir}/sysconfig.virtsecretd +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtstoraged %{buildroot}/%{_fillupdir}/sysconfig.virtstoraged mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_fillupdir}/sysconfig.libvirt-guests # Provide rc symlink backward compatibility ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtproxyd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlockd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtinterfaced +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnetworkd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnodedevd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtnwfilterd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtsecretd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtstoraged ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirt-guests +%if %{with_qemu} +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtqemud %{buildroot}/%{_fillupdir}/sysconfig.virtqemud +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtqemud +%endif +%if %{with_lxc} +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlxcd %{buildroot}/%{_fillupdir}/sysconfig.virtlxcd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlxcd +%endif +%if %{with_libxl} +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtxend %{buildroot}/%{_fillupdir}/sysconfig.virtxend +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtxend +%endif +%if %{with_vbox} +mv %{buildroot}/%{_sysconfdir}/sysconfig/virtvboxd %{buildroot}/%{_fillupdir}/sysconfig.virtvboxd +ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtvboxd +%endif + # install firewall services for migration ports mkdir -p %{buildroot}/%{_fwdefdir} %if %{with_firewalld} @@ -1283,6 +1266,7 @@ %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 %{fillup_only -n libvirtd} %{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. @@ -1485,7 +1469,6 @@ %postun nss -p /sbin/ldconfig %files -%doc %{_docdir}/%{name}/libvirt.README %files daemon %{_sbindir}/libvirtd @@ -1496,6 +1479,7 @@ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/hooks %{_fillupdir}/sysconfig.libvirtd +%{_fillupdir}/sysconfig.virtproxyd %{_fillupdir}/sysconfig.virtlogd %{_fillupdir}/sysconfig.virtlockd %{_unitdir}/libvirtd.service @@ -1520,6 +1504,7 @@ %{_sbindir}/rclibvirtd %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd +%{_sbindir}/rcvirtproxyd %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf %config(noreplace) %{_sysconfdir}/%{name}/virtproxyd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd @@ -1600,6 +1585,7 @@ %config %{_sysconfdir}/%{name}/nwfilter/*.xml %files daemon-driver-interface +%{_fillupdir}/sysconfig.virtinterfaced %config(noreplace) %{_sysconfdir}/%{name}/virtinterfaced.conf %{_datadir}/augeas/lenses/virtinterfaced.aug %{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug @@ -1608,10 +1594,12 @@ %{_unitdir}/virtinterfaced-ro.socket %{_unitdir}/virtinterfaced-admin.socket %{_sbindir}/virtinterfaced +%{_sbindir}/rcvirtinterfaced %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %files daemon-driver-network +%{_fillupdir}/sysconfig.virtnetworkd %config(noreplace) %{_sysconfdir}/%{name}/virtnetworkd.conf %{_datadir}/augeas/lenses/virtnetworkd.aug %{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug @@ -1620,6 +1608,7 @@ %{_unitdir}/virtnetworkd-ro.socket %{_unitdir}/virtnetworkd-admin.socket %{_sbindir}/virtnetworkd +%{_sbindir}/rcvirtnetworkd %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart @@ -1634,6 +1623,7 @@ %endif %files daemon-driver-nodedev +%{_fillupdir}/sysconfig.virtnodedevd %config(noreplace) %{_sysconfdir}/%{name}/virtnodedevd.conf %{_datadir}/augeas/lenses/virtnodedevd.aug %{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug @@ -1642,10 +1632,12 @@ %{_unitdir}/virtnodedevd-ro.socket %{_unitdir}/virtnodedevd-admin.socket %{_sbindir}/virtnodedevd +%{_sbindir}/rcvirtnodedevd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %files daemon-driver-nwfilter +%{_fillupdir}/sysconfig.virtnwfilterd %config(noreplace) %{_sysconfdir}/%{name}/virtnwfilterd.conf %{_datadir}/augeas/lenses/virtnwfilterd.aug %{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug @@ -1654,11 +1646,13 @@ %{_unitdir}/virtnwfilterd-ro.socket %{_unitdir}/virtnwfilterd-admin.socket %{_sbindir}/virtnwfilterd +%{_sbindir}/rcvirtnwfilterd %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %files daemon-driver-secret +%{_fillupdir}/sysconfig.virtsecretd %config(noreplace) %{_sysconfdir}/%{name}/virtsecretd.conf %{_datadir}/augeas/lenses/virtsecretd.aug %{_datadir}/augeas/lenses/tests/test_virtsecretd.aug @@ -1667,12 +1661,14 @@ %{_unitdir}/virtsecretd-ro.socket %{_unitdir}/virtsecretd-admin.socket %{_sbindir}/virtsecretd +%{_sbindir}/rcvirtsecretd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %files daemon-driver-storage %files daemon-driver-storage-core +%{_fillupdir}/sysconfig.virtstoraged %config(noreplace) %{_sysconfdir}/%{name}/virtstoraged.conf %{_datadir}/augeas/lenses/virtstoraged.aug %{_datadir}/augeas/lenses/tests/test_virtstoraged.aug @@ -1681,6 +1677,7 @@ %{_unitdir}/virtstoraged-ro.socket %{_unitdir}/virtstoraged-admin.socket %{_sbindir}/virtstoraged +%{_sbindir}/rcvirtstoraged %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so @@ -1728,6 +1725,7 @@ %if %{with_qemu} %files daemon-driver-qemu +%{_fillupdir}/sysconfig.virtqemud %config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug @@ -1736,6 +1734,7 @@ %{_unitdir}/virtqemud-ro.socket %{_unitdir}/virtqemud-admin.socket %{_sbindir}/virtqemud +%{_sbindir}/rcvirtqemud %config(noreplace) %{_sysconfdir}/%{name}/qemu.conf %config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu @@ -1757,6 +1756,7 @@ %if %{with_lxc} %files daemon-driver-lxc +%{_fillupdir}/sysconfig.virtlxcd %config(noreplace) %{_sysconfdir}/%{name}/virtlxcd.conf %{_datadir}/augeas/lenses/virtlxcd.aug %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug @@ -1765,6 +1765,7 @@ %{_unitdir}/virtlxcd-ro.socket %{_unitdir}/virtlxcd-admin.socket %{_sbindir}/virtlxcd +%{_sbindir}/rcvirtlxcd %config(noreplace) %{_sysconfdir}/%{name}/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/lxc/ @@ -1784,6 +1785,7 @@ %if %{with_libxl} %files daemon-driver-libxl +%{_fillupdir}/sysconfig.virtxend %config(noreplace) %{_sysconfdir}/%{name}/virtxend.conf %{_datadir}/augeas/lenses/virtxend.aug %{_datadir}/augeas/lenses/tests/test_virtxend.aug @@ -1792,6 +1794,7 @@ %{_unitdir}/virtxend-ro.socket %{_unitdir}/virtxend-admin.socket %{_sbindir}/virtxend +%{_sbindir}/rcvirtxend %config(noreplace) %{_sysconfdir}/%{name}/libxl.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/%{name}/libxl-lockd.conf @@ -1806,6 +1809,7 @@ %if %{with_vbox} %files daemon-driver-vbox +%{_fillupdir}/sysconfig.virtvboxd %config(noreplace) %{_sysconfdir}/%{name}/virtvboxd.conf %{_datadir}/augeas/lenses/virtvboxd.aug %{_datadir}/augeas/lenses/tests/test_virtvboxd.aug @@ -1814,31 +1818,28 @@ %{_unitdir}/virtvboxd-ro.socket %{_unitdir}/virtvboxd-admin.socket %{_sbindir}/virtvboxd +%{_sbindir}/rcvirtvboxd %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %endif %if %{with_qemu} %files daemon-qemu -%doc %{_docdir}/%{name}/libvirt-daemon-qemu.README %endif %if %{with_lxc} %files daemon-lxc -%doc %{_docdir}/%{name}/libvirt-daemon-lxc.README %endif %if %{with_libxl} %files daemon-xen -%doc %{_docdir}/%{name}/libvirt-daemon-xen.README %endif %if %{with_vbox} %files daemon-vbox -%doc %{_docdir}/%{name}/libvirt-daemon-vbox.README %endif %files client @@ -1925,23 +1926,12 @@ %{_datadir}/%{name}/api/libvirt-lxc-api.xml %files doc -%doc AUTHORS NEWS README README.md +%doc AUTHORS NEWS README README.rst %license COPYING COPYING.LESSER %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/*.png -%doc %{_docdir}/%{name}/*.html -%doc %{_docdir}/%{name}/*.gif -%doc %{_docdir}/%{name}/*.css -%doc %{_docdir}/%{name}/html -%doc %{_docdir}/%{name}/internals -%doc %{_docdir}/%{name}/kbase -%doc %{_docdir}/%{name}/logos -%doc %{_docdir}/%{name}/fonts -%doc %{_docdir}/%{name}/js -%doc %{_docdir}/%{name}/manpages +%doc %{_docdir}/%{name}/* %dir %{_datadir}/doc/%{name} -%dir %{_datadir}/doc/%{name}/examples -%doc %{_datadir}/doc/%{name}/examples/* +%doc %{_datadir}/doc/%{name}/* %if %{with_sanlock} ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.340672751 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.340672751 +0200 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-6.2.0/src/conf/domain_stats.c +Index: libvirt-6.3.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-6.2.0/src/conf/domain_stats.c ++++ libvirt-6.3.0/src/conf/domain_stats.c @@ -0,0 +1,119 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -142,10 +142,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-6.2.0/src/conf/domain_stats.h +Index: libvirt-6.3.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-6.2.0/src/conf/domain_stats.h ++++ libvirt-6.3.0/src/conf/domain_stats.h @@ -0,0 +1,62 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -209,11 +209,11 @@ + virTypedParamListPtr params); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-6.2.0/src/libvirt_private.syms +Index: libvirt-6.3.0/src/libvirt_private.syms =================================================================== ---- libvirt-6.2.0.orig/src/libvirt_private.syms -+++ libvirt-6.2.0/src/libvirt_private.syms -@@ -727,6 +727,9 @@ virDomainConfNWFilterInstantiate; +--- libvirt-6.3.0.orig/src/libvirt_private.syms ++++ libvirt-6.3.0/src/libvirt_private.syms +@@ -732,6 +732,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -223,7 +223,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1753,6 +1756,7 @@ virCgroupGetMemoryUsage; +@@ -1763,6 +1766,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -231,10 +231,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-6.2.0/src/qemu/qemu_driver.c +Index: libvirt-6.3.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/qemu/qemu_driver.c -+++ libvirt-6.2.0/src/qemu/qemu_driver.c +--- libvirt-6.3.0.orig/src/qemu/qemu_driver.c ++++ libvirt-6.3.0/src/qemu/qemu_driver.c @@ -64,6 +64,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -243,7 +243,7 @@ #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -20642,13 +20643,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -20636,13 +20637,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -258,7 +258,7 @@ } -@@ -20951,17 +20946,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -20945,17 +20940,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj if (!priv->cgroup) return 0; @@ -277,7 +277,7 @@ } -@@ -21129,76 +21114,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -21123,76 +21108,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -355,10 +355,10 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-6.2.0/src/util/vircgroup.c +Index: libvirt-6.3.0/src/util/vircgroup.c =================================================================== ---- libvirt-6.2.0.orig/src/util/vircgroup.c -+++ libvirt-6.2.0/src/util/vircgroup.c +--- libvirt-6.3.0.orig/src/util/vircgroup.c ++++ libvirt-6.3.0/src/util/vircgroup.c @@ -2779,6 +2779,31 @@ virCgroupControllerAvailable(int control return ret; } @@ -406,10 +406,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-6.2.0/src/util/vircgroup.h +Index: libvirt-6.3.0/src/util/vircgroup.h =================================================================== ---- libvirt-6.2.0.orig/src/util/vircgroup.h -+++ libvirt-6.2.0/src/util/vircgroup.h +--- libvirt-6.3.0.orig/src/util/vircgroup.h ++++ libvirt-6.3.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -425,10 +425,10 @@ + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-6.2.0/src/conf/Makefile.inc.am +Index: libvirt-6.3.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-6.2.0.orig/src/conf/Makefile.inc.am -+++ libvirt-6.2.0/src/conf/Makefile.inc.am +--- libvirt-6.3.0.orig/src/conf/Makefile.inc.am ++++ libvirt-6.3.0/src/conf/Makefile.inc.am @@ -28,6 +28,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.348672769 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.348672769 +0200 @@ -19,10 +19,10 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-6.2.0/src/libxl/libxl_driver.c +Index: libvirt-6.3.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.2.0/src/libxl/libxl_driver.c +--- libvirt-6.3.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.3.0/src/libxl/libxl_driver.c @@ -5287,6 +5287,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.356672786 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.356672786 +0200 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-6.2.0/src/lxc/lxc_driver.c +Index: libvirt-6.3.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-6.2.0/src/lxc/lxc_driver.c +--- libvirt-6.3.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.3.0/src/lxc/lxc_driver.c @@ -74,6 +74,7 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" @@ -21,7 +21,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5077,6 +5078,135 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5078,6 +5079,135 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -157,7 +157,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5174,6 +5304,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5175,6 +5305,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ 57687260-xen-doc-improvements.patch ++++++ commit 5768726093a86028b517975afc6762bf57edbf4a Author: Jim Fehlig <[email protected]> Date: Mon May 4 15:52:34 2020 -0600 docs: Xen improvements In formatdomain, using 'libxl' and 'xen' is redundant since they now both refer to the same driver. 'xen' predates 'libxl' and unambiguously identifies the Xen hypervisor, so drop the use of 'libxl'. In aclpolkit, the connection URI was erroneously identified as 'libxl' and the name 'xenlight'. Change the URI to 'xen' and driver name to 'Xen'. Signed-off-by: Jim Fehlig <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Index: libvirt-6.3.0/docs/aclpolkit.html.in =================================================================== --- libvirt-6.3.0.orig/docs/aclpolkit.html.in +++ libvirt-6.3.0/docs/aclpolkit.html.in @@ -342,8 +342,8 @@ <td>interface</td> </tr> <tr> - <td>libxl</td> - <td>xenlight</td> + <td>xen</td> + <td>Xen</td> </tr> <tr> <td>lxc</td> Index: libvirt-6.3.0/docs/formatdomain.html.in =================================================================== --- libvirt-6.3.0.orig/docs/formatdomain.html.in +++ libvirt-6.3.0/docs/formatdomain.html.in @@ -2533,8 +2533,8 @@ The <code>name</code> attribute selects which timer is being modified, and can be one of "platform" (currently unsupported), - "hpet" (libxl, xen, qemu, lxc), "kvmclock" (qemu), - "pit" (qemu), "rtc" (qemu, lxc), "tsc" (libxl, qemu - + "hpet" (xen, qemu, lxc), "kvmclock" (qemu), + "pit" (qemu), "rtc" (qemu, lxc), "tsc" (xen, qemu - <span class="since">since 3.2.0</span>), "hypervclock" (qemu - <span class="since">since 1.2.2</span>) or "armvtimer" (qemu - <span class="since">since 6.1.0</span>). @@ -7518,7 +7518,7 @@ qemu-kvm -net nic,model=? /dev/null <p> You can provide the amount of video memory in kibibytes (blocks of 1024 bytes) using <code>vram</code>. This is supported only for guest - type of "libxl", "vz", "qemu", "vbox", "vmx" and "xen". If no + type of "vz", "qemu", "vbox", "vmx" and "xen". If no value is provided the default is used. If the size is not a power of two it will be rounded to closest one. </p> ++++++ 836ea91d-libxl-xenlight-internal.patch ++++++ commit 836ea91d4ed174f2bb65ef894a8d6daf0675e743 Author: Jim Fehlig <[email protected]> Date: Mon May 4 15:20:37 2020 -0600 libxl: Clarify that 'xenlight' should only be used internally The libxl driver has suffered an identity crisis since its introduction. It took on the name 'libxl' since at the time libvirt already contained a 'xen' driver for the old Xen toolstack implementation. 'libxl' is short for libxenlight, which is often called xenlight. Unfortunately all forms of the name are used in the libxl driver. The only remaining use of the 'xenlight' form is when interacting with the host device manager, which is difficult to change since it would cause problems when upgrading the driver. Rename the #define to make it clear the 'xenlight' form is internal and add a comment describing why the name exists and that its use should be discouraged. Signed-off-by: Jim Fehlig <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Index: libvirt-6.3.0/src/libxl/libxl_conf.h =================================================================== --- libvirt-6.3.0.orig/src/libxl/libxl_conf.h +++ libvirt-6.3.0/src/libxl/libxl_conf.h @@ -39,7 +39,12 @@ #include "libxl_logger.h" #define LIBXL_DRIVER_EXTERNAL_NAME "Xen" -#define LIBXL_DRIVER_NAME "xenlight" +/* + * We are stuck with the 'xenlight' name since it is used by the hostdev + * manager. Changing it would break management of any host devices previously + * managed under the name 'xenlight'. + */ +#define LIBXL_DRIVER_INTERNAL_NAME "xenlight" #define LIBXL_VNC_PORT_MIN 5900 #define LIBXL_VNC_PORT_MAX 65535 Index: libvirt-6.3.0/src/libxl/libxl_domain.c =================================================================== --- libvirt-6.3.0.orig/src/libxl/libxl_domain.c +++ libvirt-6.3.0/src/libxl/libxl_domain.c @@ -873,7 +873,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr VIR_FREE(xml); } - virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def, hostdev_flags, NULL); VIR_FREE(priv->lockState); @@ -1370,7 +1370,7 @@ libxlDomainStart(libxlDriverPrivatePtr d if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) goto cleanup_dom; - if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def, hostdev_flags) < 0) goto cleanup_dom; Index: libvirt-6.3.0/src/libxl/libxl_driver.c =================================================================== --- libvirt-6.3.0.orig/src/libxl/libxl_driver.c +++ libvirt-6.3.0/src/libxl/libxl_driver.c @@ -431,7 +431,7 @@ libxlReconnectDomain(virDomainObjPtr vm, libxlLoggerOpenFile(cfg->logger, vm->def->id, vm->def->name, NULL); /* Update hostdev state */ - if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def, hostdev_flags) < 0) goto error; @@ -3127,7 +3127,7 @@ libxlDomainAttachHostPCIDevice(libxlDriv if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) goto cleanup; - if (virHostdevPreparePCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + if (virHostdevPreparePCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, vm->def->uuid, &hostdev, 1, 0) < 0) goto cleanup; @@ -3149,7 +3149,7 @@ libxlDomainAttachHostPCIDevice(libxlDriv goto cleanup; error: - virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1, NULL); cleanup: @@ -3264,7 +3264,7 @@ libxlDomainAttachHostUSBDevice(libxlDriv if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) goto cleanup; - if (virHostdevPrepareUSBDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + if (virHostdevPrepareUSBDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1, 0) < 0) goto cleanup; @@ -3284,7 +3284,7 @@ libxlDomainAttachHostUSBDevice(libxlDriv goto cleanup; reattach: - virHostdevReAttachUSBDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + virHostdevReAttachUSBDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1); cleanup: @@ -3689,7 +3689,7 @@ libxlDomainDetachHostPCIDevice(libxlDriv virDomainHostdevRemove(vm->def, idx); - virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1, NULL); ret = 0; @@ -3811,7 +3811,7 @@ libxlDomainDetachHostUSBDevice(libxlDriv virDomainHostdevRemove(vm->def, idx); - virHostdevReAttachUSBDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + virHostdevReAttachUSBDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME, vm->def->name, &hostdev, 1); ret = 0; ++++++ d218a9c2-libxl-xen-driver-tables.patch ++++++ commit d218a9c263190681aa8ee7f0ec5f3c298339d635 Author: Jim Fehlig <[email protected]> Date: Mon May 4 14:51:32 2020 -0600 libxl: Use the name 'Xen' in driver tables The libxl driver declares its name as 'Xen' through the public virConnectGetType() API. In the virHypervisorDriver table the name is set to 'xenlight'. To add more confusion, the name is set to 'LIBXL' in the virStateDriver. For consistency, use the same name in the driver tables as reported in the public virConnectGetType() API. Signed-off-by: Jim Fehlig <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Index: libvirt-6.3.0/src/libxl/libxl_conf.h =================================================================== --- libvirt-6.3.0.orig/src/libxl/libxl_conf.h +++ libvirt-6.3.0/src/libxl/libxl_conf.h @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "libxl_logger.h" +#define LIBXL_DRIVER_EXTERNAL_NAME "Xen" #define LIBXL_DRIVER_NAME "xenlight" #define LIBXL_VNC_PORT_MIN 5900 #define LIBXL_VNC_PORT_MAX 65535 Index: libvirt-6.3.0/src/libxl/libxl_driver.c =================================================================== --- libvirt-6.3.0.orig/src/libxl/libxl_driver.c +++ libvirt-6.3.0/src/libxl/libxl_driver.c @@ -911,7 +911,7 @@ libxlConnectGetType(virConnectPtr conn) if (virConnectGetTypeEnsureACL(conn) < 0) return NULL; - return "Xen"; + return LIBXL_DRIVER_EXTERNAL_NAME; } static int @@ -6608,7 +6608,7 @@ libxlDomainGetMetadata(virDomainPtr dom, } static virHypervisorDriver libxlHypervisorDriver = { - .name = LIBXL_DRIVER_NAME, + .name = LIBXL_DRIVER_EXTERNAL_NAME, .connectURIProbe = libxlConnectURIProbe, .connectOpen = libxlConnectOpen, /* 0.9.0 */ .connectClose = libxlConnectClose, /* 0.9.0 */ @@ -6732,7 +6732,7 @@ static virConnectDriver libxlConnectDriv }; static virStateDriver libxlStateDriver = { - .name = "LIBXL", + .name = LIBXL_DRIVER_EXTERNAL_NAME, .stateInitialize = libxlStateInitialize, .stateCleanup = libxlStateCleanup, .stateReload = libxlStateReload, ++++++ d677de9d-libxl-fix-driver-name-check.patch ++++++ commit d677de9d567e3e87be295b91723457b461345caa Author: Daniel P. Berrangé <[email protected]> Date: Mon May 4 17:41:46 2020 +0100 remote: fix driver name check for libxl driver The virConnectGetType() returns "Xen" for libxl, not "LIBXL". This prevents users opening a connection to the libxl driver when using the modular daemons. Reviewed-by: Jim Fehlig <[email protected]> Signed-off-by: Daniel P. Berrangé <[email protected]> Index: libvirt-6.3.0/src/remote/remote_daemon_dispatch.c =================================================================== --- libvirt-6.3.0.orig/src/remote/remote_daemon_dispatch.c +++ libvirt-6.3.0/src/remote/remote_daemon_dispatch.c @@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPt VIR_DEBUG("Primary driver type is '%s'", type); if (STREQ(type, "QEMU") || - STREQ(type, "LIBXL") || + STREQ(type, "Xen") || STREQ(type, "LXC") || STREQ(type, "VBOX") || STREQ(type, "bhyve") || ++++++ disable-multipath-pr-tests.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.400672880 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.400672880 +0200 @@ -3,10 +3,10 @@ The new multipath PR tests are failing in a build root env. Disable them for now until discussing a solution with upstream. -Index: libvirt-6.2.0/tests/qemuhotplugtest.c +Index: libvirt-6.3.0/tests/qemuhotplugtest.c =================================================================== ---- libvirt-6.2.0.orig/tests/qemuhotplugtest.c -+++ libvirt-6.2.0/tests/qemuhotplugtest.c +--- libvirt-6.3.0.orig/tests/qemuhotplugtest.c ++++ libvirt-6.3.0/tests/qemuhotplugtest.c @@ -87,8 +87,6 @@ qemuHotplugCreateObjects(virDomainXMLOpt virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE); @@ -16,7 +16,7 @@ if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0) return -1; -@@ -757,17 +755,6 @@ mymain(void) +@@ -755,17 +753,6 @@ mymain(void) "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK, "human-monitor-command", HMP("")); @@ -25,11 +25,11 @@ - "human-monitor-command", HMP("OK\\r\\n"), - "device_add", QMP_OK); - DO_TEST_DETACH("base-live", "disk-scsi-multipath", true, true, -- "device_del", QMP_OK, -- "human-monitor-command", HMP("")); +- "device_del", QMP_OK); - DO_TEST_DETACH("base-live", "disk-scsi-multipath", false, false, - "device_del", QMP_DEVICE_DELETED("scsi0-0-0-0") QMP_OK, -- "human-monitor-command", HMP("")); +- "human-monitor-command", HMP(""), +- "object-del", QMP_OK); - DO_TEST_ATTACH("base-live", "qemu-agent", false, true, "chardev-add", QMP_OK, ++++++ libvirt-6.2.0.tar.xz -> libvirt-6.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-6.2.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.2738/libvirt-6.3.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.424672932 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.424672932 +0200 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-6.2.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-6.3.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-6.2.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-6.2.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-6.3.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-6.3.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.KX8OFn/_old 2020-05-09 19:51:04.448672983 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.448672983 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-6.2.0/configure.ac +Index: libvirt-6.3.0/configure.ac =================================================================== ---- libvirt-6.2.0.orig/configure.ac -+++ libvirt-6.2.0/configure.ac +--- libvirt-6.3.0.orig/configure.ac ++++ libvirt-6.3.0/configure.ac @@ -278,6 +278,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-6.2.0/tools/virsh.c +Index: libvirt-6.3.0/tools/virsh.c =================================================================== ---- libvirt-6.2.0.orig/tools/virsh.c -+++ libvirt-6.2.0/tools/virsh.c +--- libvirt-6.3.0.orig/tools/virsh.c ++++ libvirt-6.3.0/tools/virsh.c @@ -547,6 +547,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-6.2.0/src/interface/interface_backend_netcf.c +Index: libvirt-6.3.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-6.2.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-6.2.0/src/interface/interface_backend_netcf.c +--- libvirt-6.3.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-6.3.0/src/interface/interface_backend_netcf.c @@ -21,7 +21,12 @@ #include <config.h> @@ -154,10 +154,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-6.2.0/src/interface/interface_driver.c +Index: libvirt-6.3.0/src/interface/interface_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/interface/interface_driver.c -+++ libvirt-6.2.0/src/interface/interface_driver.c +--- libvirt-6.3.0.orig/src/interface/interface_driver.c ++++ libvirt-6.3.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -175,10 +175,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-6.2.0/m4/virt-netcontrol.m4 +Index: libvirt-6.3.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-6.2.0/m4/virt-netcontrol.m4 ++++ libvirt-6.3.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -219,10 +219,10 @@ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-6.2.0/src/interface/Makefile.inc.am +Index: libvirt-6.3.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-6.2.0.orig/src/interface/Makefile.inc.am -+++ libvirt-6.2.0/src/interface/Makefile.inc.am +--- libvirt-6.3.0.orig/src/interface/Makefile.inc.am ++++ libvirt-6.3.0/src/interface/Makefile.inc.am @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.488673069 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.488673069 +0200 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-6.2.0/src/libxl/libxl_driver.c +Index: libvirt-6.3.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.2.0/src/libxl/libxl_driver.c +--- libvirt-6.3.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.3.0/src/libxl/libxl_driver.c @@ -1371,6 +1371,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.496673086 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.496673086 +0200 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-6.2.0/src/libxl/libxl_conf.c +Index: libvirt-6.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.2.0/src/libxl/libxl_conf.c +--- libvirt-6.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.3.0/src/libxl/libxl_conf.c @@ -905,6 +905,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.504673103 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.504673103 +0200 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-6.2.0/include/libvirt/libvirt-domain.h +Index: libvirt-6.3.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-6.2.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-6.2.0/include/libvirt/libvirt-domain.h +--- libvirt-6.3.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-6.3.0/include/libvirt/libvirt-domain.h @@ -1065,6 +1065,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_TLS_DESTINATION "tls.destination" @@ -52,10 +52,10 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-6.2.0/src/libxl/libxl_driver.c +Index: libvirt-6.3.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-6.2.0/src/libxl/libxl_driver.c +--- libvirt-6.3.0.orig/src/libxl/libxl_driver.c ++++ libvirt-6.3.0/src/libxl/libxl_driver.c @@ -6196,6 +6196,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-6.2.0/src/libxl/libxl_migration.c +Index: libvirt-6.3.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_migration.c -+++ libvirt-6.2.0/src/libxl/libxl_migration.c +--- libvirt-6.3.0.orig/src/libxl/libxl_migration.c ++++ libvirt-6.3.0/src/libxl/libxl_migration.c @@ -345,18 +345,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -264,10 +264,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-6.2.0/src/libxl/libxl_migration.h +Index: libvirt-6.3.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_migration.h -+++ libvirt-6.2.0/src/libxl/libxl_migration.h +--- libvirt-6.3.0.orig/src/libxl/libxl_migration.h ++++ libvirt-6.3.0/src/libxl/libxl_migration.h @@ -35,6 +35,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -312,11 +312,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-6.2.0/tools/virsh-domain.c +Index: libvirt-6.3.0/tools/virsh-domain.c =================================================================== ---- libvirt-6.2.0.orig/tools/virsh-domain.c -+++ libvirt-6.2.0/tools/virsh-domain.c -@@ -10716,6 +10716,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-6.3.0.orig/tools/virsh-domain.c ++++ libvirt-6.3.0/tools/virsh-domain.c +@@ -10721,6 +10721,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_STRING, .help = N_("override the destination host name used for TLS verification") }, @@ -339,7 +339,7 @@ {.name = NULL} }; -@@ -10738,6 +10754,7 @@ doMigrate(void *opaque) +@@ -10742,6 +10758,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -347,7 +347,7 @@ #ifndef WIN32 sigset_t sigmask, oldsigmask; -@@ -10860,6 +10877,27 @@ doMigrate(void *opaque) +@@ -10864,6 +10881,27 @@ doMigrate(void *opaque) goto save_error; } @@ -375,10 +375,10 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-6.2.0/docs/manpages/virsh.rst +Index: libvirt-6.3.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-6.2.0.orig/docs/manpages/virsh.rst -+++ libvirt-6.2.0/docs/manpages/virsh.rst +--- libvirt-6.3.0.orig/docs/manpages/virsh.rst ++++ libvirt-6.3.0/docs/manpages/virsh.rst @@ -3093,6 +3093,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.512673120 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.512673120 +0200 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-6.2.0/src/libxl/libxl_conf.c +Index: libvirt-6.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.2.0/src/libxl/libxl_conf.c +--- libvirt-6.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.3.0/src/libxl/libxl_conf.c @@ -905,6 +905,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.520673138 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.520673138 +0200 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-6.2.0/src/lxc/lxc_controller.c +Index: libvirt-6.3.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-6.2.0.orig/src/lxc/lxc_controller.c -+++ libvirt-6.2.0/src/lxc/lxc_controller.c +--- libvirt-6.3.0.orig/src/lxc/lxc_controller.c ++++ libvirt-6.3.0/src/lxc/lxc_controller.c @@ -2056,6 +2056,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-6.2.0/src/lxc/lxc_driver.c +Index: libvirt-6.3.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-6.2.0/src/lxc/lxc_driver.c +--- libvirt-6.3.0.orig/src/lxc/lxc_driver.c ++++ libvirt-6.3.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" -@@ -3551,6 +3552,7 @@ lxcDomainAttachDeviceNetLive(virLXCDrive +@@ -3552,6 +3553,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: -@@ -3991,6 +3993,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -3992,6 +3994,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-6.2.0/src/lxc/lxc_process.c +Index: libvirt-6.3.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-6.2.0.orig/src/lxc/lxc_process.c -+++ libvirt-6.2.0/src/lxc/lxc_process.c +--- libvirt-6.3.0.orig/src/lxc/lxc_process.c ++++ libvirt-6.3.0/src/lxc/lxc_process.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.528673155 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.528673155 +0200 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-6.2.0/src/network/bridge_driver.c +Index: libvirt-6.3.0/src/network/bridge_driver.c =================================================================== ---- libvirt-6.2.0.orig/src/network/bridge_driver.c -+++ libvirt-6.2.0/src/network/bridge_driver.c -@@ -1444,7 +1444,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-6.3.0.orig/src/network/bridge_driver.c ++++ libvirt-6.3.0/src/network/bridge_driver.c +@@ -1476,7 +1476,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-6.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-6.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-6.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-6.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-6.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-6.3.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.KX8OFn/_old 2020-05-09 19:51:04.536673172 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.536673172 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-6.2.0/src/util/virarch.c +Index: libvirt-6.3.0/src/util/virarch.c =================================================================== ---- libvirt-6.2.0.orig/src/util/virarch.c -+++ libvirt-6.2.0/src/util/virarch.c +--- libvirt-6.3.0.orig/src/util/virarch.c ++++ libvirt-6.3.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.KX8OFn/_old 2020-05-09 19:51:04.544673189 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.544673189 +0200 @@ -1,11 +1,11 @@ -Index: libvirt-6.2.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.3.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-6.2.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-6.2.0/src/security/apparmor/libvirt-qemu -@@ -228,3 +228,6 @@ - # required for sasl GSSAPI plugin - /etc/gss/mech.d/ r, - /etc/gss/mech.d/* r, +--- libvirt-6.3.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.3.0/src/security/apparmor/libvirt-qemu +@@ -233,3 +233,6 @@ + # /sys/bus/nd/devices + / r, # harmless on any lsb compliant system + /sys/bus/nd/devices/{,**/} r, + + # Temporary screendump rule -- See bsc#904426 + /var/cache/libvirt/qemu/qemu.screendump.* rw, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.552673206 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.552673206 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-6.2.0/src/libxl/xen_common.c +Index: libvirt-6.3.0/src/libxl/xen_common.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/xen_common.c -+++ libvirt-6.2.0/src/libxl/xen_common.c +--- libvirt-6.3.0.orig/src/libxl/xen_common.c ++++ libvirt-6.3.0/src/libxl/xen_common.c @@ -381,12 +381,19 @@ xenParsePCI(char *entry) int busID; int slotID; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.560673223 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.560673223 +0200 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-6.2.0/src/security/apparmor/libvirt-qemu +Index: libvirt-6.3.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-6.2.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-6.2.0/src/security/apparmor/libvirt-qemu +--- libvirt-6.3.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-6.3.0/src/security/apparmor/libvirt-qemu @@ -61,6 +61,7 @@ #/dev/fb* rw, @@ -20,10 +20,10 @@ @{HOME}/.pulse-cookie rwk, owner /root/.pulse-cookie rwk, owner /root/.pulse/ rw, -Index: libvirt-6.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-6.3.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== ---- libvirt-6.2.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ libvirt-6.2.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +--- libvirt-6.3.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-6.3.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-bump-xen-version.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.568673241 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.568673241 +0200 @@ -9,10 +9,10 @@ c3999835df makes it hard to upstream this patch. See bsc#1157490 and bsc#1167007 for more details -Index: libvirt-6.2.0/m4/virt-driver-libxl.m4 +Index: libvirt-6.3.0/m4/virt-driver-libxl.m4 =================================================================== ---- libvirt-6.2.0.orig/m4/virt-driver-libxl.m4 -+++ libvirt-6.2.0/m4/virt-driver-libxl.m4 +--- libvirt-6.3.0.orig/m4/virt-driver-libxl.m4 ++++ libvirt-6.3.0/m4/virt-driver-libxl.m4 @@ -26,11 +26,11 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ LIBXL_CFLAGS="" LIBXL_FIRMWARE_DIR="" @@ -27,10 +27,10 @@ if test "x$with_libxl" = "xyes" ; then LIBXL_FIRMWARE_DIR=$($PKG_CONFIG --variable xenfirmwaredir xenlight) LIBXL_EXECBIN_DIR=$($PKG_CONFIG --variable libexec_bin xenlight) -Index: libvirt-6.2.0/src/libxl/libxl_conf.c +Index: libvirt-6.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.2.0/src/libxl/libxl_conf.c +--- libvirt-6.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.3.0/src/libxl/libxl_conf.c @@ -1823,7 +1823,7 @@ libxlDriverConfigNew(void) int libxlDriverConfigInit(libxlDriverConfigPtr cfg) @@ -40,10 +40,10 @@ if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -Index: libvirt-6.2.0/src/libxl/libxl_domain.c +Index: libvirt-6.3.0/src/libxl/libxl_domain.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_domain.c -+++ libvirt-6.2.0/src/libxl/libxl_domain.c +--- libvirt-6.3.0.orig/src/libxl/libxl_domain.c ++++ libvirt-6.3.0/src/libxl/libxl_domain.c @@ -1020,8 +1020,8 @@ libxlDomainSetVcpuAffinities(libxlDriver static int libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) @@ -64,10 +64,10 @@ &aop_console_how); libxl_domain_restore_params_dispose(¶ms); } -Index: libvirt-6.2.0/tests/libxlmock.c +Index: libvirt-6.3.0/tests/libxlmock.c =================================================================== ---- libvirt-6.2.0.orig/tests/libxlmock.c -+++ libvirt-6.2.0/tests/libxlmock.c +--- libvirt-6.3.0.orig/tests/libxlmock.c ++++ libvirt-6.3.0/tests/libxlmock.c @@ -67,7 +67,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, int, 0, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.576673258 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.576673258 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-6.2.0/tools/libvirt-guests.sh.in +Index: libvirt-6.3.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-6.2.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-6.2.0/tools/libvirt-guests.sh.in +--- libvirt-6.3.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-6.3.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -74,8 +74,8 @@ # check if URI is reachable test_connect() @@ -108,7 +129,7 @@ list_guests() { + local list=$(run_virsh_c "$uri" list --uuid $persistent) - list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then - RETVAL=1 + rc_failed 1 @@ -83,15 +83,15 @@ fi @@ -134,7 +155,7 @@ guest_is_on() { + guest_running=false - id=$(run_virsh "$uri" domid "$uuid") if [ $? -ne 0 ]; then - RETVAL=1 + rc_failed 1 return 1 fi -@@ -184,6 +205,13 @@ start() { +@@ -190,6 +211,13 @@ start() { test_connect "$uri" || continue @@ -104,8 +104,8 @@ + eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do - name=$(guest_name "$uri" "$guest") -@@ -405,7 +433,7 @@ shutdown_guests_parallel() + local name=$(guest_name "$uri" "$guest") +@@ -418,7 +446,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -114,7 +114,7 @@ return fi else -@@ -434,7 +462,7 @@ stop() { +@@ -449,7 +477,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -123,7 +123,7 @@ return fi fi -@@ -482,14 +510,14 @@ stop() { +@@ -499,14 +527,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -140,7 +140,7 @@ set +f return fi -@@ -548,14 +576,13 @@ gueststatus() { +@@ -567,14 +595,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -157,55 +157,49 @@ fi fi } -@@ -600,4 +627,4 @@ case "$1" in +@@ -619,4 +646,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-6.2.0/tools/libvirt-guests.sysconf +Index: libvirt-6.3.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-6.2.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-6.2.0/tools/libvirt-guests.sysconf -@@ -1,19 +1,29 @@ +--- libvirt-6.3.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-6.3.0/tools/libvirt-guests.sysconf +@@ -1,9 +1,14 @@ +## Path: System/Virtualization/libvirt-guests -+ + # Customizations for the libvirt-guests.service systemd unit + +## Type: string +## Default: default # URIs to check for running guests # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' --#URIS=default -+URIS=default + #URIS=default +## Type: string +## Default: start # action taken on host boot # - start all guests which were running on shutdown are started on boot # regardless on their autostart settings - # - ignore libvirt-guests init script won't start any guest on boot, however, - # guests marked as autostart will still be automatically started by +@@ -12,10 +17,14 @@ # libvirtd --#ON_BOOT=start -+ON_BOOT=start + #ON_BOOT=start +## Type: integer +## Default: 0 # Number of seconds to wait between each guest start. Set to 0 to allow # parallel startup. --#START_DELAY=0 -+START_DELAY=0 + #START_DELAY=0 +## Type: string +## Default: 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 -@@ -22,14 +32,18 @@ - # which just needs a long time to shutdown. When setting - # ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a +@@ -26,12 +35,16 @@ # value suitable for your guests. --#ON_SHUTDOWN=suspend -+ON_SHUTDOWN=suspend + #ON_SHUTDOWN=suspend +## Type: integer +## Default: 0 @@ -213,15 +207,14 @@ # "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. --#PARALLEL_SHUTDOWN=0 -+PARALLEL_SHUTDOWN=0 + #PARALLEL_SHUTDOWN=0 +## Type: integer +## Default: 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 -@@ -37,14 +51,18 @@ +@@ -39,14 +52,18 @@ # request). The default value is 300 seconds (5 minutes). #SHUTDOWN_TIMEOUT=300 @@ -230,8 +223,7 @@ # 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. --#BYPASS_CACHE=0 -+BYPASS_CACHE=0 + #BYPASS_CACHE=0 +## Type: integer +## Default: 0 ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.584673275 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.584673275 +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-6.2.0/src/remote/remote_daemon_config.c +Index: libvirt-6.3.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-6.2.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-6.2.0/src/remote/remote_daemon_config.c +--- libvirt-6.3.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-6.3.0/src/remote/remote_daemon_config.c @@ -99,7 +99,7 @@ daemonConfigNew(bool privileged G_GNUC_U #ifdef WITH_IP @@ -16,10 +16,10 @@ # else /* ! LIBVIRTD */ data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */ # endif /* ! LIBVIRTD */ -Index: libvirt-6.2.0/src/remote/libvirtd.conf.in +Index: libvirt-6.3.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-6.2.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-6.2.0/src/remote/libvirtd.conf.in +--- libvirt-6.3.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-6.3.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. ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.592673293 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.592673293 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-6.2.0/src/remote/libvirtd.sysconf +Index: libvirt-6.3.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-6.2.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-6.2.0/src/remote/libvirtd.sysconf +--- libvirt-6.3.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-6.3.0/src/remote/libvirtd.sysconf @@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit @@ -14,17 +14,12 @@ # Default behaviour is for libvirtd.service to start on boot # so that VM autostart can be performed. We then want it to # shutdown again if nothing was started and rely on systemd -@@ -11,9 +15,13 @@ LIBVIRTD_ARGS="--timeout 120" +@@ -11,6 +15,8 @@ LIBVIRTD_ARGS="--timeout 120" # can be used to listen on TCP/TLS sockets #LIBVIRTD_ARGS="--listen" +## Type: string +## Default: none - # Override Kerberos service keytab for SASL/GSSAPI - #KRB5_KTNAME=/etc/libvirt/krb5.tab - -+## Type: string -+## Default: none # Override the QEMU/SDL default audio driver probing when # starting virtual machines using SDL graphics # ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.600673310 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.600673310 +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-6.2.0/src/libxl/libxl.conf +Index: libvirt-6.3.0/src/libxl/libxl.conf =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl.conf -+++ libvirt-6.2.0/src/libxl/libxl.conf +--- libvirt-6.3.0.orig/src/libxl/libxl.conf ++++ libvirt-6.3.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-6.2.0/src/libxl/libxl_conf.c +Index: libvirt-6.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.2.0/src/libxl/libxl_conf.c +--- libvirt-6.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.3.0/src/libxl/libxl_conf.c @@ -1737,15 +1737,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.616673344 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.616673344 +0200 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-6.2.0/src/qemu/qemu.conf +Index: libvirt-6.3.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.2.0.orig/src/qemu/qemu.conf -+++ libvirt-6.2.0/src/qemu/qemu.conf +--- libvirt-6.3.0.orig/src/qemu/qemu.conf ++++ libvirt-6.3.0/src/qemu/qemu.conf @@ -788,10 +788,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-6.2.0/src/qemu/qemu_conf.c +Index: libvirt-6.3.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/qemu/qemu_conf.c -+++ libvirt-6.2.0/src/qemu/qemu_conf.c -@@ -95,10 +95,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver +--- libvirt-6.3.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.3.0/src/qemu/qemu_conf.c +@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ @@ -36,10 +36,10 @@ #endif -Index: libvirt-6.2.0/src/security/virt-aa-helper.c +Index: libvirt-6.3.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-6.2.0.orig/src/security/virt-aa-helper.c -+++ libvirt-6.2.0/src/security/virt-aa-helper.c +--- libvirt-6.3.0.orig/src/security/virt-aa-helper.c ++++ libvirt-6.3.0/src/security/virt-aa-helper.c @@ -479,7 +479,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.624673361 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.624673361 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-6.2.0/src/qemu/qemu.conf +Index: libvirt-6.3.0/src/qemu/qemu.conf =================================================================== ---- libvirt-6.2.0.orig/src/qemu/qemu.conf -+++ libvirt-6.2.0/src/qemu/qemu.conf +--- libvirt-6.3.0.orig/src/qemu/qemu.conf ++++ libvirt-6.3.0/src/qemu/qemu.conf @@ -420,10 +420,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ # #lock_manager = "lockd" -Index: libvirt-6.2.0/src/qemu/qemu_conf.c +Index: libvirt-6.3.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/qemu/qemu_conf.c -+++ libvirt-6.2.0/src/qemu/qemu_conf.c +--- libvirt-6.3.0.orig/src/qemu/qemu_conf.c ++++ libvirt-6.3.0/src/qemu/qemu_conf.c @@ -266,7 +266,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf cfg->slirpHelperName = g_strdup(QEMU_SLIRP_HELPER); cfg->dbusDaemonName = g_strdup(QEMU_DBUS_DAEMON); ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.640673396 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.640673396 +0200 @@ -1,14 +1,14 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-6.2.0/src/locking/virtlockd.sysconf +Index: libvirt-6.3.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-6.2.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-6.2.0/src/locking/virtlockd.sysconf +--- libvirt-6.3.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-6.3.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + +## Type: string +## Default: "" - # - # Pass extra arguments to virtlockd - #VIRTLOCKD_ARGS= + # Customizations for the virtlockd.service systemd unit + + VIRTLOCKD_ARGS="" ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.648673413 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.648673413 +0200 @@ -1,14 +1,14 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-6.2.0/src/logging/virtlogd.sysconf +Index: libvirt-6.3.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-6.2.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-6.2.0/src/logging/virtlogd.sysconf +--- libvirt-6.3.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-6.3.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + +## Type: string +## Default: "" - # - # Pass extra arguments to virtlogd - #VIRTLOGD_ARGS= + # Customizations for the virtlogd.service systemd unit + + VIRTLOGD_ARGS="" ++++++ suse-xen-ovmf-loaders.patch ++++++ --- /var/tmp/diff_new_pack.KX8OFn/_old 2020-05-09 19:51:04.656673430 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.660673438 +0200 @@ -5,10 +5,10 @@ upstream efforts to improve firmware handling in the qemu driver broke the firmware handling in the xen driver. -Index: libvirt-6.2.0/src/libxl/libxl_conf.c +Index: libvirt-6.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-6.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-6.2.0/src/libxl/libxl_conf.c +--- libvirt-6.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-6.3.0/src/libxl/libxl_conf.c @@ -1777,6 +1777,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.KX8OFn/_old 2020-05-09 19:51:04.668673456 +0200 +++ /var/tmp/diff_new_pack.KX8OFn/_new 2020-05-09 19:51:04.668673456 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-6.2.0/tools/Makefile.am +Index: libvirt-6.3.0/tools/Makefile.am =================================================================== ---- libvirt-6.2.0.orig/tools/Makefile.am -+++ libvirt-6.2.0/tools/Makefile.am +--- libvirt-6.3.0.orig/tools/Makefile.am ++++ libvirt-6.3.0/tools/Makefile.am @@ -70,7 +70,7 @@ MAINTAINERCLEANFILES = confdir = $(sysconfdir)/libvirt conf_DATA = @@ -11,10 +11,10 @@ bin_PROGRAMS = virsh virt-admin libexec_SCRIPTS = libvirt-guests.sh -Index: libvirt-6.2.0/tools/virt-create-rootfs +Index: libvirt-6.3.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-6.2.0/tools/virt-create-rootfs ++++ libvirt-6.3.0/tools/virt-create-rootfs @@ -0,0 +1,231 @@ +#!/bin/sh +set -e @@ -247,11 +247,11 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-6.2.0/docs/Makefile.am +Index: libvirt-6.3.0/docs/Makefile.am =================================================================== ---- libvirt-6.2.0.orig/docs/Makefile.am -+++ libvirt-6.2.0/docs/Makefile.am -@@ -209,6 +209,7 @@ manpages1_rst = \ +--- libvirt-6.3.0.orig/docs/Makefile.am ++++ libvirt-6.3.0/docs/Makefile.am +@@ -215,6 +215,7 @@ manpages1_rst = \ manpages/virt-xml-validate.rst \ manpages/virt-admin.rst \ manpages/virsh.rst \ @@ -259,10 +259,10 @@ $(NULL) manpages7_rst = \ $(KEYCODES:%=manpages/virkeycode-%.rst) \ -Index: libvirt-6.2.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-6.3.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-6.2.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-6.3.0/docs/manpages/virt-create-rootfs.rst @@ -0,0 +1,88 @@ +================== +virt-create-rootfs
