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-03-05 13:43:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Fri Mar 5 13:43:20 2021 rev:326 rq:876096 version:7.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2021-02-22 14:58:01.469764368 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new.2378/libvirt.changes 2021-03-05 13:43:33.623528607 +0100 @@ -1,0 +2,32 @@ +Mon Mar 1 23:06:57 UTC 2021 - James Fehlig <jfeh...@suse.com> + +- libxl: Fix node device detach when driver unspecified + libxl-default-pcistub-name.patch + boo#1182885 +- spec: Bump minimum glib version to 2.56 + +------------------------------------------------------------------- +Mon Mar 1 15:27:37 UTC 2021 - James Fehlig <jfeh...@suse.com> + +- Update to libvirt 7.1.0 + - Many incremental improvements and bug fixes, see + https://libvirt.org/news.html + - bsc#1182367, bsc#1182515 + - Dropped patches: + 32c5e432-revert-f035f53b.patch, + e3d60f76-fix-socket-file-gen.patch, + 7cf60006-qemu-swtpm-aarch64.patch, + afb823fc-qemu-validate-swtpm.patch, + 8a4b8996-conf-move-virDomainCheckVirtioOptions.patch, + c05f0066-conf-drop-empty-virDomainNetDefPostParse.patch, + 19d4e467-conf-improve-virDomainVirtioOptionsCheckABIStability.patch, + bd112c9e-qemu-virtio-options-vsock.patch + +------------------------------------------------------------------- +Sat Feb 20 00:51:09 UTC 2021 - James Fehlig <jfeh...@suse.com> + +- Remove old initscript patching of libvirt-guests.sh + Modified suse-libvirt-guests-service.patch + boo#1182494 + +------------------------------------------------------------------- Old: ---- 19d4e467-conf-improve-virDomainVirtioOptionsCheckABIStability.patch 32c5e432-revert-f035f53b.patch 7cf60006-qemu-swtpm-aarch64.patch 8a4b8996-conf-move-virDomainCheckVirtioOptions.patch afb823fc-qemu-validate-swtpm.patch bd112c9e-qemu-virtio-options-vsock.patch c05f0066-conf-drop-empty-virDomainNetDefPostParse.patch e3d60f76-fix-socket-file-gen.patch libvirt-7.0.0.tar.xz libvirt-7.0.0.tar.xz.asc New: ---- libvirt-7.1.0.tar.xz libvirt-7.1.0.tar.xz.asc libxl-default-pcistub-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.151538176 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.155538180 +0100 @@ -141,7 +141,7 @@ Name: libvirt URL: http://libvirt.org/ -Version: 7.0.0 +Version: 7.1.0 Release: 0 Summary: Library providing a virtualization API License: LGPL-2.1-or-later @@ -190,7 +190,7 @@ %endif BuildRequires: bash-completion-devel >= 2.0 BuildRequires: fdupes -BuildRequires: glib2-devel >= 2.48 +BuildRequires: glib2-devel >= 2.56 BuildRequires: libattr-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel @@ -291,17 +291,10 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 32c5e432-revert-f035f53b.patch -Patch1: e3d60f76-fix-socket-file-gen.patch -Patch2: 7cf60006-qemu-swtpm-aarch64.patch -Patch3: afb823fc-qemu-validate-swtpm.patch -Patch4: 8a4b8996-conf-move-virDomainCheckVirtioOptions.patch -Patch5: c05f0066-conf-drop-empty-virDomainNetDefPostParse.patch -Patch6: 19d4e467-conf-improve-virDomainVirtioOptionsCheckABIStability.patch -Patch7: bd112c9e-qemu-virtio-options-vsock.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch +Patch102: libxl-default-pcistub-name.patch # Need to go upstream Patch150: libvirt-power8-models.patch Patch151: ppc64le-canonical-name.patch @@ -1440,6 +1433,7 @@ %doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlockd.8* +%doc %{_mandir}/man8/virtproxyd.8* %doc %{_mandir}/man7/virkey*.7* %if %{with_apparmor} %dir %{_sysconfdir}/apparmor.d @@ -1486,6 +1480,7 @@ %{_sbindir}/rcvirtinterfaced %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so +%doc %{_mandir}/man8/virtinterfaced.8* %files daemon-driver-network %{_fillupdir}/sysconfig.virtnetworkd @@ -1510,6 +1505,7 @@ %dir %{_prefix}/lib/firewalld/zones/ %{_prefix}/lib/firewalld/zones/libvirt.xml %endif +%doc %{_mandir}/man8/virtnetworkd.8* %files daemon-driver-nodedev %{_fillupdir}/sysconfig.virtnodedevd @@ -1524,6 +1520,7 @@ %{_sbindir}/rcvirtnodedevd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so +%doc %{_mandir}/man8/virtnodedevd.8* %files daemon-driver-nwfilter %{_fillupdir}/sysconfig.virtnwfilterd @@ -1539,6 +1536,7 @@ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so +%doc %{_mandir}/man8/virtnwfilterd.8* %files daemon-driver-secret %{_fillupdir}/sysconfig.virtsecretd @@ -1553,6 +1551,7 @@ %{_sbindir}/rcvirtsecretd %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so +%doc %{_mandir}/man8/virtsecretd.8* %files daemon-driver-storage @@ -1574,6 +1573,7 @@ %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so %dir %{_libdir}/%{name}/storage-file %{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so +%doc %{_mandir}/man8/virtstoraged.8* %files daemon-driver-storage-disk %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so @@ -1639,7 +1639,8 @@ %dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/%{name}/ %dir %attr(0731, tss, tss) %{_localstatedir}/log/swtpm/%{name}/qemu/ %{_bindir}/virt-qemu-run -%{_mandir}/man1/virt-qemu-run.1* +%doc %{_mandir}/man1/virt-qemu-run.1* +%doc %{_mandir}/man8/virtqemud.8* %endif %if %{with_lxc} @@ -1666,6 +1667,7 @@ %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so %{_bindir}/virt-create-rootfs %doc %{_mandir}/man1/virt-create-rootfs.1* +%doc %{_mandir}/man8/virtlxcd.8* %endif %if %{with_libxl} @@ -1690,6 +1692,7 @@ %dir %attr(0700, root, root) %{_localstatedir}/log/%{name}/libxl/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so +%doc %{_mandir}/man8/virtxend.8* %endif %if %{with_vbox} @@ -1706,6 +1709,7 @@ %{_sbindir}/virtvboxd %{_sbindir}/rcvirtvboxd %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so +%doc %{_mandir}/man8/virtvboxd.8* %endif %if %{with_qemu} ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.187538209 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.191538213 +0100 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-7.0.0/src/conf/domain_stats.c +Index: libvirt-7.1.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-7.0.0/src/conf/domain_stats.c ++++ libvirt-7.1.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-7.0.0/src/conf/domain_stats.h +Index: libvirt-7.1.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-7.0.0/src/conf/domain_stats.h ++++ libvirt-7.1.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-7.0.0/src/libvirt_private.syms +Index: libvirt-7.1.0/src/libvirt_private.syms =================================================================== ---- libvirt-7.0.0.orig/src/libvirt_private.syms -+++ libvirt-7.0.0/src/libvirt_private.syms -@@ -741,12 +741,16 @@ virDomainConfNWFilterTeardown; +--- libvirt-7.1.0.orig/src/libvirt_private.syms ++++ libvirt-7.1.0/src/libvirt_private.syms +@@ -745,12 +745,16 @@ virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -231,7 +231,7 @@ # conf/interface_conf.h virInterfaceDefFormat; virInterfaceDefFree; -@@ -1796,6 +1800,7 @@ virCgroupGetMemoryUsage; +@@ -1898,6 +1902,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -239,10 +239,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKillPainfully; -Index: libvirt-7.0.0/src/qemu/qemu_driver.c +Index: libvirt-7.1.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/qemu/qemu_driver.c -+++ libvirt-7.0.0/src/qemu/qemu_driver.c +--- libvirt-7.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-7.1.0/src/qemu/qemu_driver.c @@ -67,6 +67,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -251,7 +251,7 @@ #include "domain_audit.h" #include "domain_cgroup.h" #include "domain_driver.h" -@@ -17614,13 +17615,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -17515,13 +17516,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr virTypedParamListPtr params, unsigned int privflags G_GNUC_UNUSED) { @@ -266,7 +266,7 @@ } -@@ -17914,25 +17909,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj +@@ -17815,25 +17810,11 @@ qemuDomainGetStatsCpuCgroup(virDomainObj virTypedParamListPtr params) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -293,7 +293,7 @@ } -@@ -18099,76 +18080,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -18000,76 +17981,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -371,11 +371,11 @@ /* refresh information by opening images on the disk */ static int -Index: libvirt-7.0.0/src/util/vircgroup.c +Index: libvirt-7.1.0/src/util/vircgroup.c =================================================================== ---- libvirt-7.0.0.orig/src/util/vircgroup.c -+++ libvirt-7.0.0/src/util/vircgroup.c -@@ -2799,6 +2799,31 @@ virCgroupControllerAvailable(int control +--- libvirt-7.1.0.orig/src/util/vircgroup.c ++++ libvirt-7.1.0/src/util/vircgroup.c +@@ -2981,6 +2981,31 @@ virCgroupControllerAvailable(int control return virCgroupHasController(cgroup, controller); } @@ -407,7 +407,7 @@ #else /* !__linux__ */ bool -@@ -2808,6 +2833,14 @@ virCgroupAvailable(void) +@@ -2990,6 +3015,14 @@ virCgroupAvailable(void) } @@ -422,10 +422,10 @@ int virCgroupNewPartition(const char *path G_GNUC_UNUSED, bool create G_GNUC_UNUSED, -Index: libvirt-7.0.0/src/util/vircgroup.h +Index: libvirt-7.1.0/src/util/vircgroup.h =================================================================== ---- libvirt-7.0.0.orig/src/util/vircgroup.h -+++ libvirt-7.0.0/src/util/vircgroup.h +--- libvirt-7.1.0.orig/src/util/vircgroup.h ++++ libvirt-7.1.0/src/util/vircgroup.h @@ -23,6 +23,7 @@ #include "virbitmap.h" @@ -441,10 +441,10 @@ + +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virTypedParamListPtr params); -Index: libvirt-7.0.0/src/conf/meson.build +Index: libvirt-7.1.0/src/conf/meson.build =================================================================== ---- libvirt-7.0.0.orig/src/conf/meson.build -+++ libvirt-7.0.0/src/conf/meson.build +--- libvirt-7.1.0.orig/src/conf/meson.build ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.199538220 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.199538220 +0100 @@ -19,11 +19,11 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-7.0.0/src/libxl/libxl_driver.c +Index: libvirt-7.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.0.0/src/libxl/libxl_driver.c -@@ -5317,6 +5317,96 @@ libxlDomainMemoryStats(virDomainPtr dom, +--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.1.0/src/libxl/libxl_driver.c +@@ -5311,6 +5311,96 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT @@ -120,7 +120,7 @@ static int libxlDomainGetJobInfo(virDomainPtr dom, virDomainJobInfoPtr info) -@@ -6786,6 +6876,7 @@ static virHypervisorDriver libxlHypervis +@@ -6607,6 +6697,7 @@ static virHypervisorDriver libxlHypervis #endif .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.207538227 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.207538227 +0100 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-7.0.0/src/lxc/lxc_driver.c +Index: libvirt-7.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.0.0/src/lxc/lxc_driver.c +--- libvirt-7.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.1.0/src/lxc/lxc_driver.c @@ -74,6 +74,8 @@ #include "netdev_bandwidth_conf.h" #include "virsocket.h" ++++++ libvirt-7.0.0.tar.xz -> libvirt-7.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-7.0.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new.2378/libvirt-7.1.0.tar.xz differ: char 26, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.247538263 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.247538263 +0100 @@ -2,10 +2,10 @@ From: <r...@suse.de> -Index: libvirt-7.0.0/src/cpu_map/ppc64_POWER8.xml +Index: libvirt-7.1.0/src/cpu_map/ppc64_POWER8.xml =================================================================== ---- libvirt-7.0.0.orig/src/cpu_map/ppc64_POWER8.xml -+++ libvirt-7.0.0/src/cpu_map/ppc64_POWER8.xml +--- libvirt-7.1.0.orig/src/cpu_map/ppc64_POWER8.xml ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.271538285 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.271538285 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.0.0/tools/virsh.c +Index: libvirt-7.1.0/tools/virsh.c =================================================================== ---- libvirt-7.0.0.orig/tools/virsh.c -+++ libvirt-7.0.0/tools/virsh.c +--- libvirt-7.1.0.orig/tools/virsh.c ++++ libvirt-7.1.0/tools/virsh.c @@ -543,6 +543,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -11,10 +11,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-7.0.0/src/interface/interface_backend_netcf.c +Index: libvirt-7.1.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-7.0.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-7.0.0/src/interface/interface_backend_netcf.c +--- libvirt-7.1.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-7.1.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.0.0/src/interface/interface_driver.c +Index: libvirt-7.1.0/src/interface/interface_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/interface/interface_driver.c -+++ libvirt-7.0.0/src/interface/interface_driver.c +--- libvirt-7.1.0.orig/src/interface/interface_driver.c ++++ libvirt-7.1.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,12 +147,12 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-7.0.0/meson.build +Index: libvirt-7.1.0/meson.build =================================================================== ---- libvirt-7.0.0.orig/meson.build -+++ libvirt-7.0.0/meson.build -@@ -1159,6 +1159,12 @@ if netcf_dep.found() - conf.set('WITH_NETCF', 1) +--- libvirt-7.1.0.orig/meson.build ++++ libvirt-7.1.0/meson.build +@@ -1162,6 +1162,12 @@ if not get_option('netcf').disabled() + endif endif +netcontrol_version = '0.2.0' @@ -164,12 +164,12 @@ have_gnu_gettext_tools = false if not get_option('nls').disabled() have_gettext = cc.has_function('gettext') -@@ -1550,10 +1556,10 @@ elif get_option('driver_hyperv').enabled +@@ -1553,10 +1559,10 @@ elif get_option('driver_hyperv').enabled error('openwsman is required for the Hyper-V driver') endif --if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found()) -+if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found() or netcontrol_dep.found()) +-if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or conf.has('WITH_NETCF')) ++if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or conf.has('WITH_NETCF') or netcontrol_dep.found()) conf.set('WITH_INTERFACE', 1) elif get_option('driver_interface').enabled() - error('Requested the Interface driver without netcf or udev and libvirtd support') @@ -177,18 +177,18 @@ endif if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') -@@ -2363,6 +2369,7 @@ libs_summary = { +@@ -2360,6 +2366,7 @@ libs_summary = { 'libssh2': libssh2_dep.found(), 'libutil': libutil_dep.found(), - 'netcf': netcf_dep.found(), + 'netcf': conf.has('WITH_NETCF'), + 'netcontrol': netcontrol_dep.found(), 'NLS': have_gnu_gettext_tools, 'numactl': numactl_dep.found(), 'openwsman': openwsman_dep.found(), -Index: libvirt-7.0.0/src/interface/meson.build +Index: libvirt-7.1.0/src/interface/meson.build =================================================================== ---- libvirt-7.0.0.orig/src/interface/meson.build -+++ libvirt-7.0.0/src/interface/meson.build +--- libvirt-7.1.0.orig/src/interface/meson.build ++++ libvirt-7.1.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.0.0/meson_options.txt +Index: libvirt-7.1.0/meson_options.txt =================================================================== ---- libvirt-7.0.0.orig/meson_options.txt -+++ libvirt-7.0.0/meson_options.txt +--- libvirt-7.1.0.orig/meson_options.txt ++++ libvirt-7.1.0/meson_options.txt @@ -28,6 +28,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-default-pcistub-name.patch ++++++ commit 844c278ad2a957592ba9fbf93c6aa076a2b3d216 Author: Jim Fehlig <jfeh...@suse.com> Date: Mon Mar 1 15:41:44 2021 -0700 libxl: Fix node device detach when driver unspecified Commit 887dd0d331 caused a small regression in NodeDeviceDetach in the libxl driver when the 'driver' parameter is not specified. E.g. error: Failed to detach device pci_0000_0a_10_0 error: An error occurred, but the cause is unknown If the driver name is not specified, NULL is passed to virDomainDriverNodeDeviceDetachFlags, in which case virPCIDeviceSetStubDriver is never called to set the stub to pciback. Fix it by setting the driver to "xen" if it is not specified when invoking NodeDeviceDetach. Signed-off-by: Jim Fehlig <jfeh...@suse.com> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 75a8d46af0..348434ca72 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5777,6 +5777,9 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, virCheckFlags(0, -1); + if (!driverName) + driverName = "xen"; + if (driverName && STRNEQ(driverName, "xen")) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported driver name '%s'"), driverName); ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.311538321 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.315538325 +0100 @@ -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-7.0.0/src/libxl/libxl_driver.c +Index: libvirt-7.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.0.0/src/libxl/libxl_driver.c +--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.1.0/src/libxl/libxl_driver.c @@ -1372,6 +1372,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6664,6 +6719,7 @@ static virHypervisorDriver libxlHypervis +@@ -6485,6 +6540,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.5vsWkM/_old 2021-03-05 13:43:44.319538329 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.319538329 +0100 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-7.0.0/src/libxl/libxl_conf.c +Index: libvirt-7.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.0.0/src/libxl/libxl_conf.c +--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.1.0/src/libxl/libxl_conf.c @@ -921,6 +921,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -38,7 +38,7 @@ static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, const char *username, -@@ -1159,6 +1183,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1163,6 +1187,7 @@ libxlMakeDisk(virDomainDiskDefPtr 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.5vsWkM/_old 2021-03-05 13:43:44.327538336 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.331538340 +0100 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-7.0.0/docs/manpages/virsh.rst +Index: libvirt-7.1.0/docs/manpages/virsh.rst =================================================================== ---- libvirt-7.0.0.orig/docs/manpages/virsh.rst -+++ libvirt-7.0.0/docs/manpages/virsh.rst +--- libvirt-7.1.0.orig/docs/manpages/virsh.rst ++++ libvirt-7.1.0/docs/manpages/virsh.rst @@ -3145,7 +3145,8 @@ migrate [--postcopy-bandwidth bandwidth] [--parallel [--parallel-connections connections]] @@ -43,10 +43,10 @@ Running migration can be canceled by interrupting virsh (usually using ``Ctrl-C``) or by ``domjobabort`` command sent from another virsh instance. -Index: libvirt-7.0.0/include/libvirt/libvirt-domain.h +Index: libvirt-7.1.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-7.0.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-7.0.0/include/libvirt/libvirt-domain.h +--- libvirt-7.1.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-7.1.0/include/libvirt/libvirt-domain.h @@ -1078,6 +1078,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.0.0/src/libxl/libxl_driver.c +Index: libvirt-7.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-7.0.0/src/libxl/libxl_driver.c -@@ -6226,6 +6226,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-7.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-7.1.0/src/libxl/libxl_driver.c +@@ -6047,6 +6047,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(); -@@ -6242,6 +6245,15 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6063,6 +6066,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) -@@ -6256,11 +6268,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6077,11 +6089,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -117,11 +117,11 @@ goto cleanup; } -Index: libvirt-7.0.0/src/libxl/libxl_migration.c +Index: libvirt-7.1.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_migration.c -+++ libvirt-7.0.0/src/libxl/libxl_migration.c -@@ -341,18 +341,38 @@ libxlMigrateDstReceive(virNetSocketPtr s +--- libvirt-7.1.0.orig/src/libxl/libxl_migration.c ++++ libvirt-7.1.0/src/libxl/libxl_migration.c +@@ -340,18 +340,38 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -162,7 +162,7 @@ if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -905,7 +925,7 @@ struct libxlTunnelControl { +@@ -900,7 +920,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -171,7 +171,7 @@ virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -938,7 +958,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -933,7 +953,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -180,7 +180,7 @@ virObjectLock(vm); out: -@@ -974,7 +994,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -969,7 +989,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, @@ -189,7 +189,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1019,11 +1039,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1014,11 +1034,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP /* 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 -@@ -1037,7 +1057,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1032,7 +1052,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP if (ret == -1) goto confirm; @@ -212,7 +212,7 @@ if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1052,11 +1072,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1047,11 +1067,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -227,7 +227,7 @@ if (ret < 0) { notify_source = false; virErrorPreserveLast(&orig_err); -@@ -1091,7 +1111,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1086,7 +1106,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP 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", -@@ -1099,7 +1119,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1094,7 +1114,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } cleanup: @@ -245,7 +245,7 @@ libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1143,7 +1163,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1138,7 +1158,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str G_GNUC_UNUSED, const char *dname, @@ -254,7 +254,7 @@ { int ret = -1; int useParams; -@@ -1180,7 +1200,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1175,7 +1195,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -263,7 +263,7 @@ if (ret < 0) { /* -@@ -1207,7 +1227,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1202,7 +1222,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri G_GNUC_UNUSED, const char *uri_str, const char *dname G_GNUC_UNUSED, @@ -272,7 +272,7 @@ { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -1243,7 +1263,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1238,7 +1258,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -281,10 +281,10 @@ virObjectLock(vm); if (ret == 0) { -Index: libvirt-7.0.0/src/libxl/libxl_migration.h +Index: libvirt-7.1.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_migration.h -+++ libvirt-7.0.0/src/libxl/libxl_migration.h +--- libvirt-7.1.0.orig/src/libxl/libxl_migration.h ++++ libvirt-7.1.0/src/libxl/libxl_migration.h @@ -35,6 +35,9 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -327,11 +327,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-7.0.0/tools/virsh-domain.c +Index: libvirt-7.1.0/tools/virsh-domain.c =================================================================== ---- libvirt-7.0.0.orig/tools/virsh-domain.c -+++ libvirt-7.0.0/tools/virsh-domain.c -@@ -10707,6 +10707,18 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-7.1.0.orig/tools/virsh-domain.c ++++ libvirt-7.1.0/tools/virsh-domain.c +@@ -10703,6 +10703,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} }; -@@ -10727,6 +10739,7 @@ doMigrate(void *opaque) +@@ -10723,6 +10735,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; -@@ -10857,6 +10870,22 @@ doMigrate(void *opaque) +@@ -10853,6 +10866,22 @@ doMigrate(void *opaque) goto save_error; } ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.335538343 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.339538347 +0100 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-7.0.0/src/libxl/libxl_conf.c +Index: libvirt-7.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.0.0/src/libxl/libxl_conf.c +--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.1.0/src/libxl/libxl_conf.c @@ -921,6 +921,22 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -34,7 +34,7 @@ static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -1058,6 +1074,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -1062,6 +1078,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -42,7 +42,7 @@ const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -1073,7 +1090,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1077,7 +1094,7 @@ libxlMakeDisk(virDomainDiskDefPtr 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); -@@ -1184,6 +1201,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1188,6 +1205,9 @@ libxlMakeDisk(virDomainDiskDefPtr 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.5vsWkM/_old 2021-03-05 13:43:44.343538351 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.347538354 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-7.0.0/src/lxc/lxc_controller.c +Index: libvirt-7.1.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-7.0.0.orig/src/lxc/lxc_controller.c -+++ libvirt-7.0.0/src/lxc/lxc_controller.c +--- libvirt-7.1.0.orig/src/lxc/lxc_controller.c ++++ libvirt-7.1.0/src/lxc/lxc_controller.c @@ -2015,6 +2015,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-7.0.0/src/lxc/lxc_driver.c +Index: libvirt-7.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-7.0.0/src/lxc/lxc_driver.c +--- libvirt-7.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-7.1.0/src/lxc/lxc_driver.c @@ -67,6 +67,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -53,10 +53,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-7.0.0/src/lxc/lxc_process.c +Index: libvirt-7.1.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-7.0.0.orig/src/lxc/lxc_process.c -+++ libvirt-7.0.0/src/lxc/lxc_process.c +--- libvirt-7.1.0.orig/src/lxc/lxc_process.c ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.355538361 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.355538361 +0100 @@ -17,10 +17,10 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-7.0.0/src/network/bridge_driver.c +Index: libvirt-7.1.0/src/network/bridge_driver.c =================================================================== ---- libvirt-7.0.0.orig/src/network/bridge_driver.c -+++ libvirt-7.0.0/src/network/bridge_driver.c +--- libvirt-7.1.0.orig/src/network/bridge_driver.c ++++ libvirt-7.1.0/src/network/bridge_driver.c @@ -1449,7 +1449,14 @@ networkDnsmasqConfContents(virNetworkObj if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -37,10 +37,10 @@ } if (ipdef->tftproot) { -Index: libvirt-7.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-7.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-7.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-7.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-7.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.363538369 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.363538369 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-7.0.0/src/util/virarch.c +Index: libvirt-7.1.0/src/util/virarch.c =================================================================== ---- libvirt-7.0.0.orig/src/util/virarch.c -+++ libvirt-7.0.0/src/util/virarch.c +--- libvirt-7.1.0.orig/src/util/virarch.c ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.371538376 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.371538376 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.0.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.1.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.0.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.0.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.1.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.379538383 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.379538383 +0100 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-7.0.0/src/security/apparmor/libvirt-qemu +Index: libvirt-7.1.0/src/security/apparmor/libvirt-qemu =================================================================== ---- libvirt-7.0.0.orig/src/security/apparmor/libvirt-qemu -+++ libvirt-7.0.0/src/security/apparmor/libvirt-qemu +--- libvirt-7.1.0.orig/src/security/apparmor/libvirt-qemu ++++ libvirt-7.1.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.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-7.1.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== ---- libvirt-7.0.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ libvirt-7.0.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +--- libvirt-7.1.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.387538391 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.387538391 +0100 @@ -9,11 +9,11 @@ c3999835df makes it hard to upstream this patch. See bsc#1157490 and bsc#1167007 for more details -Index: libvirt-7.0.0/src/libxl/libxl_conf.c +Index: libvirt-7.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.0.0/src/libxl/libxl_conf.c -@@ -1827,7 +1827,7 @@ libxlDriverConfigNew(void) +--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.1.0/src/libxl/libxl_conf.c +@@ -1831,7 +1831,7 @@ libxlDriverConfigNew(void) int libxlDriverConfigInit(libxlDriverConfigPtr cfg) { @@ -22,11 +22,11 @@ if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -Index: libvirt-7.0.0/src/libxl/libxl_domain.c +Index: libvirt-7.1.0/src/libxl/libxl_domain.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_domain.c -+++ libvirt-7.0.0/src/libxl/libxl_domain.c -@@ -1013,8 +1013,8 @@ libxlDomainSetVcpuAffinities(libxlDriver +--- libvirt-7.1.0.orig/src/libxl/libxl_domain.c ++++ libvirt-7.1.0/src/libxl/libxl_domain.c +@@ -1007,8 +1007,8 @@ libxlDomainSetVcpuAffinities(libxlDriver static int libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) { @@ -37,7 +37,7 @@ int32_t target_mem; int tries = 3; int wait_secs = 10; -@@ -1404,7 +1404,7 @@ libxlDomainStart(libxlDriverPrivatePtr d +@@ -1397,7 +1397,7 @@ libxlDomainStart(libxlDriverPrivatePtr d params.stream_version = restore_ver; #endif ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, @@ -46,10 +46,10 @@ &aop_console_how); libxl_domain_restore_params_dispose(¶ms); } -Index: libvirt-7.0.0/tests/libxlmock.c +Index: libvirt-7.1.0/tests/libxlmock.c =================================================================== ---- libvirt-7.0.0.orig/tests/libxlmock.c -+++ libvirt-7.0.0/tests/libxlmock.c +--- libvirt-7.1.0.orig/tests/libxlmock.c ++++ libvirt-7.1.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, @@ -59,11 +59,11 @@ VIR_MOCK_STUB_RET_ARGS(xc_interface_close, int, 0, -Index: libvirt-7.0.0/meson.build +Index: libvirt-7.1.0/meson.build =================================================================== ---- libvirt-7.0.0.orig/meson.build -+++ libvirt-7.0.0/meson.build -@@ -1563,7 +1563,7 @@ elif get_option('driver_interface').enab +--- libvirt-7.1.0.orig/meson.build ++++ libvirt-7.1.0/meson.build +@@ -1566,7 +1566,7 @@ elif get_option('driver_interface').enab endif if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD') @@ -72,7 +72,7 @@ libxl_dep = dependency('xenlight', version: '>=' + libxl_version, required: get_option('driver_libxl')) if libxl_dep.found() -@@ -1593,7 +1593,7 @@ if not get_option('driver_libxl').disabl +@@ -1596,7 +1596,7 @@ if not get_option('driver_libxl').disabl endif libxl_dep = declare_dependency( ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.395538398 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.395538398 +0100 @@ -1,17 +1,10 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-7.0.0/tools/libvirt-guests.sh.in +Index: libvirt-7.1.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-7.0.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-7.0.0/tools/libvirt-guests.sh.in -@@ -16,14 +16,13 @@ - # License along with this library. If not, see - # <http://www.gnu.org/licenses/>. - -+. /etc/rc.status -+rc_reset -+ - sysconfdir="@sysconfdir@" +--- libvirt-7.1.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-7.1.0/tools/libvirt-guests.sh.in +@@ -20,10 +20,6 @@ sysconfdir="@sysconfdir@" localstatedir="@localstatedir@" libvirtd="@sbindir@"/libvirtd @@ -22,151 +15,23 @@ # Source gettext library. # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh -@@ -43,9 +42,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- +@@ -43,7 +39,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- . "$sysconfdir"/sysconfig/libvirt-guests LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests -VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests -- --RETVAL=0 +if [ -d "$localstatedir"/lock/subsys ]; then + VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests +else + VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests +fi - # retval COMMAND ARGUMENTS... - # run command with arguments and convert non-zero return value to 1 and set -@@ -53,7 +54,7 @@ RETVAL=0 - retval() { - "$@" - if [ $? -ne 0 ]; then -- RETVAL=1 -+ rc_failed 1 - return 1 - else - return 0 -@@ -82,6 +83,26 @@ run_virsh_c() { - ( export LC_ALL=C; run_virsh "$@" ) - } - -+await_daemon_up() -+{ -+ uri=$1 -+ i=1 -+ rets=10 -+ run_virsh $uri list > /dev/null 2>&1 -+ while test $? -ne 0 && test $i -lt $rets; do -+ sleep 1 -+ echo -n . -+ i=$(($i + 1)) -+ run_virsh $uri list > /dev/null 2>&1 -+ done -+ if [ $i -eq $rets ]; then -+ eval_gettext "libvirt-guests unable to connect to URI: $uri" -+ echo -+ return 1 -+ fi -+ return 0 -+} -+ - # test_connect URI - # check if URI is reachable - test_connect() -@@ -108,7 +129,7 @@ list_guests() { - local list="$(run_virsh_c "$uri" list --uuid $persistent)" - - if [ $? -ne 0 ]; then -- RETVAL=1 -+ rc_failed 1 - return 1 - fi - -@@ -134,7 +155,7 @@ guest_is_on() { - - guest_running="false" - if [ $? -ne 0 ]; then -- RETVAL=1 -+ rc_failed 1 - return 1 - fi - -@@ -190,6 +211,13 @@ start() { - - test_connect "$uri" || continue + RETVAL=0 -+ await_daemon_up $uri -+ if [ $? -ne 0 ]; then -+ eval_gettext "Ignoring guests on $uri URI, can't connect" -+ echo -+ continue -+ fi -+ - eval_gettext "Resuming guests on \$uri URI..."; echo - for guest in $list; do - 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 -- RETVAL=1 -+ rc_failed 1 - return - fi - else -@@ -449,7 +477,7 @@ stop() { - if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" - echo -- RETVAL=6 -+ rc_failed 6 - return - fi - fi -@@ -499,14 +527,14 @@ stop() { - if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" - echo -- RETVAL=1 -+ rc_failed 1 - set +f - return - fi - else - gettext "Failed to list transient guests" - echo -- RETVAL=1 -+ rc_failed 1 - set +f - return - fi -@@ -567,14 +595,13 @@ gueststatus() { - rh_status() { - if [ -f "$LISTFILE" ]; then - gettext "stopped, with saved guests"; echo -- RETVAL=3 -+ rc_failed 3 - else - if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - gettext "started"; echo -- RETVAL=0 - else - gettext "stopped, with no saved guests"; echo -- RETVAL=3 -+ rc_failed 3 - fi - fi - } -@@ -619,4 +646,4 @@ case "$1" in - usage - ;; - esac --exit $RETVAL -+rc_exit -Index: libvirt-7.0.0/tools/libvirt-guests.sysconf +Index: libvirt-7.1.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-7.0.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-7.0.0/tools/libvirt-guests.sysconf +--- libvirt-7.1.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.403538406 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.403538406 +0100 @@ -3,10 +3,10 @@ On SUSE distros, the default is for libvirtd to listen only on the Unix Domain Socket. The libvirt client still provides remote access via a SSH tunnel. -Index: libvirt-7.0.0/src/remote/remote_daemon_config.c +Index: libvirt-7.1.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-7.0.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-7.0.0/src/remote/remote_daemon_config.c +--- libvirt-7.1.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-7.1.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.0.0/src/remote/libvirtd.conf.in +Index: libvirt-7.1.0/src/remote/libvirtd.conf.in =================================================================== ---- libvirt-7.0.0.orig/src/remote/libvirtd.conf.in -+++ libvirt-7.0.0/src/remote/libvirtd.conf.in +--- libvirt-7.1.0.orig/src/remote/libvirtd.conf.in ++++ libvirt-7.1.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.0.0/src/remote/test_libvirtd.aug.in +Index: libvirt-7.1.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-7.0.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-7.0.0/src/remote/test_libvirtd.aug.in +--- libvirt-7.1.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.411538412 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.411538412 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-7.0.0/src/remote/libvirtd.sysconf +Index: libvirt-7.1.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-7.0.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-7.0.0/src/remote/libvirtd.sysconf +--- libvirt-7.1.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-7.1.0/src/remote/libvirtd.sysconf @@ -1,5 +1,9 @@ +## Path: System/Virtualization/libvirt # Customizations for the libvirtd.service systemd unit ++++++ suse-libxl-disable-autoballoon.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.419538420 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.419538420 +0100 @@ -6,10 +6,10 @@ by default. It can only be enabled with the 'autoballoon' setting in libxl.conf. See jsc#SLE-3059 for more details. -Index: libvirt-7.0.0/src/libxl/libxl.conf +Index: libvirt-7.1.0/src/libxl/libxl.conf =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl.conf -+++ libvirt-7.0.0/src/libxl/libxl.conf +--- libvirt-7.1.0.orig/src/libxl/libxl.conf ++++ libvirt-7.1.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.0.0/src/libxl/libxl_conf.c +Index: libvirt-7.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.0.0/src/libxl/libxl_conf.c -@@ -1744,15 +1744,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa +--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.1.0/src/libxl/libxl_conf.c +@@ -1748,15 +1748,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa /* * Get domain0 autoballoon configuration. Honor user-specified * setting in libxl.conf first. If not specified, autoballooning @@ -48,7 +48,7 @@ int res; res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); -@@ -1761,15 +1758,8 @@ libxlGetAutoballoonConf(libxlDriverConfi +@@ -1765,15 +1762,8 @@ libxlGetAutoballoonConf(libxlDriverConfi else if (res == 1) return 0; @@ -66,10 +66,10 @@ return 0; } -Index: libvirt-7.0.0/src/libxl/test_libvirtd_libxl.aug.in +Index: libvirt-7.1.0/src/libxl/test_libvirtd_libxl.aug.in =================================================================== ---- libvirt-7.0.0.orig/src/libxl/test_libvirtd_libxl.aug.in -+++ libvirt-7.0.0/src/libxl/test_libvirtd_libxl.aug.in +--- libvirt-7.1.0.orig/src/libxl/test_libvirtd_libxl.aug.in ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.427538428 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.427538428 +0100 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-7.0.0/src/qemu/qemu.conf +Index: libvirt-7.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.0.0.orig/src/qemu/qemu.conf -+++ libvirt-7.0.0/src/qemu/qemu.conf +--- libvirt-7.1.0.orig/src/qemu/qemu.conf ++++ libvirt-7.1.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,10 +18,10 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-7.0.0/src/qemu/qemu_conf.c +Index: libvirt-7.1.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.0.0/src/qemu/qemu_conf.c +--- libvirt-7.1.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.1.0/src/qemu/qemu_conf.c @@ -98,10 +98,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver #ifndef DEFAULT_LOADER_NVRAM @@ -36,11 +36,11 @@ #endif -Index: libvirt-7.0.0/src/security/virt-aa-helper.c +Index: libvirt-7.1.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-7.0.0.orig/src/security/virt-aa-helper.c -+++ libvirt-7.0.0/src/security/virt-aa-helper.c -@@ -479,7 +479,8 @@ valid_path(const char *path, const bool +--- libvirt-7.1.0.orig/src/security/virt-aa-helper.c ++++ libvirt-7.1.0/src/security/virt-aa-helper.c +@@ -480,7 +480,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ "/usr/share/qemu-efi/", /* for AAVMF images */ @@ -50,10 +50,10 @@ }; /* override the above with these */ const char * const override[] = { -Index: libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.435538435 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.435538435 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-7.0.0/src/qemu/qemu.conf +Index: libvirt-7.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-7.0.0.orig/src/qemu/qemu.conf -+++ libvirt-7.0.0/src/qemu/qemu.conf +--- libvirt-7.1.0.orig/src/qemu/qemu.conf ++++ libvirt-7.1.0/src/qemu/qemu.conf @@ -491,10 +491,19 @@ # isolation, but it cannot appear in a list of drivers. # @@ -60,10 +60,10 @@ # #lock_manager = "lockd" -Index: libvirt-7.0.0/src/qemu/qemu_conf.c +Index: libvirt-7.1.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/qemu/qemu_conf.c -+++ libvirt-7.0.0/src/qemu/qemu_conf.c +--- libvirt-7.1.0.orig/src/qemu/qemu_conf.c ++++ libvirt-7.1.0/src/qemu/qemu_conf.c @@ -272,7 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf 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.0.0/src/qemu/test_libvirtd_qemu.aug.in +Index: libvirt-7.1.0/src/qemu/test_libvirtd_qemu.aug.in =================================================================== ---- libvirt-7.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in -+++ libvirt-7.0.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-7.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in ++++ libvirt-7.1.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.5vsWkM/_old 2021-03-05 13:43:44.447538446 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.451538449 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-7.0.0/src/locking/virtlockd.sysconf +Index: libvirt-7.1.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-7.0.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-7.0.0/src/locking/virtlockd.sysconf +--- libvirt-7.1.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-7.1.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.459538457 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.459538457 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-7.0.0/src/logging/virtlogd.sysconf +Index: libvirt-7.1.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-7.0.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-7.0.0/src/logging/virtlogd.sysconf +--- libvirt-7.1.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-7.1.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ suse-xen-ovmf-loaders.patch ++++++ --- /var/tmp/diff_new_pack.5vsWkM/_old 2021-03-05 13:43:44.467538464 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.467538464 +0100 @@ -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.0.0/src/libxl/libxl_conf.c +Index: libvirt-7.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-7.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-7.0.0/src/libxl/libxl_conf.c -@@ -1784,6 +1784,15 @@ libxlDriverConfigNew(void) +--- libvirt-7.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-7.1.0/src/libxl/libxl_conf.c +@@ -1788,6 +1788,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.5vsWkM/_old 2021-03-05 13:43:44.475538471 +0100 +++ /var/tmp/diff_new_pack.5vsWkM/_new 2021-03-05 13:43:44.475538471 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-7.0.0/tools/virt-create-rootfs +Index: libvirt-7.1.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-7.0.0/tools/virt-create-rootfs ++++ libvirt-7.1.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.0.0/docs/manpages/virt-create-rootfs.rst +Index: libvirt-7.1.0/docs/manpages/virt-create-rootfs.rst =================================================================== --- /dev/null -+++ libvirt-7.0.0/docs/manpages/virt-create-rootfs.rst ++++ libvirt-7.1.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.0.0/docs/manpages/meson.build +Index: libvirt-7.1.0/docs/manpages/meson.build =================================================================== ---- libvirt-7.0.0.orig/docs/manpages/meson.build -+++ libvirt-7.0.0/docs/manpages/meson.build +--- libvirt-7.1.0.orig/docs/manpages/meson.build ++++ libvirt-7.1.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.0.0/tools/meson.build +Index: libvirt-7.1.0/tools/meson.build =================================================================== ---- libvirt-7.0.0.orig/tools/meson.build -+++ libvirt-7.0.0/tools/meson.build +--- libvirt-7.1.0.orig/tools/meson.build ++++ libvirt-7.1.0/tools/meson.build @@ -149,6 +149,8 @@ else virsh_icon_res = [] endif
