Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2018-03-08 10:54:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Thu Mar 8 10:54:21 2018 rev:253 rq:583091 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2018-02-25 11:32:26.732222789 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2018-03-08 10:54:24.288021390 +0100 @@ -1,0 +2,18 @@ +Mon Mar 5 15:55:07 UTC 2018 - jfeh...@suse.com + +- Update to libvirt 4.1.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + 72adaf2f-revert-qemu-monitor-error-report.patch, + 71d56a39-nodedev-fix-parse-PCI-address.patch, + 68eed56b-conf-smbios-oem-strings.patch, + 76977061-qemu-smbios-oem-strings.patch, + 0c710a37-libxl-resume-lock-on-mig-failure.patch, + 759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch, + c2dc6698-fix-deadlock-obtaining-hostname.patch, + c391e07e-libxl-clock-settings.patch, + ef71caea-libxl-memalign.patch, + suse-apparmor-signal.patch + +------------------------------------------------------------------- Old: ---- 0c710a37-libxl-resume-lock-on-mig-failure.patch 68eed56b-conf-smbios-oem-strings.patch 71d56a39-nodedev-fix-parse-PCI-address.patch 72adaf2f-revert-qemu-monitor-error-report.patch 759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch 76977061-qemu-smbios-oem-strings.patch c2dc6698-fix-deadlock-obtaining-hostname.patch c391e07e-libxl-clock-settings.patch ef71caea-libxl-memalign.patch libvirt-4.0.0.tar.xz libvirt-4.0.0.tar.xz.asc suse-apparmor-signal.patch New: ---- libvirt-4.1.0.tar.xz libvirt-4.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.703970417 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.707970274 +0100 @@ -171,10 +171,10 @@ Name: libvirt Url: http://libvirt.org/ -Version: 4.0.0 +Version: 4.1.0 Release: 0 Summary: Library providing a simple virtualization API -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} @@ -317,16 +317,7 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 72adaf2f-revert-qemu-monitor-error-report.patch -Patch1: 71d56a39-nodedev-fix-parse-PCI-address.patch -Patch2: 68eed56b-conf-smbios-oem-strings.patch -Patch3: 76977061-qemu-smbios-oem-strings.patch -Patch4: 0c710a37-libxl-resume-lock-on-mig-failure.patch -Patch5: 6b3d716e-keycodemap-py3.patch -Patch6: 759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch -Patch7: c2dc6698-fix-deadlock-obtaining-hostname.patch -Patch8: c391e07e-libxl-clock-settings.patch -Patch9: ef71caea-libxl-memalign.patch +Patch0: 6b3d716e-keycodemap-py3.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -350,15 +341,14 @@ Patch206: suse-qemu-conf.patch Patch207: suse-ovmf-paths.patch Patch208: suse-apparmor-libnl-paths.patch -Patch209: suse-apparmor-signal.patch -Patch210: support-managed-pci-xen-driver.patch -Patch211: xen-sxpr-disk-type.patch -Patch212: libxl-support-block-script.patch -Patch213: apparmor-no-mount.patch -Patch214: qemu-apparmor-screenshot.patch -Patch215: libvirt-suse-netcontrol.patch -Patch216: lxc-wait-after-eth-del.patch -Patch217: libxl-qemu-emulator-caps.patch +Patch209: support-managed-pci-xen-driver.patch +Patch210: xen-sxpr-disk-type.patch +Patch211: libxl-support-block-script.patch +Patch212: apparmor-no-mount.patch +Patch213: qemu-apparmor-screenshot.patch +Patch214: libvirt-suse-netcontrol.patch +Patch215: lxc-wait-after-eth-del.patch +Patch216: libxl-qemu-emulator-caps.patch # SLES-Only patches %if ! 0%{?is_opensuse} Patch400: virt-create-rootfs.patch @@ -840,6 +830,9 @@ # Needed by virt-pki-validate script. Requires: cyrus-sasl Requires: gnutls +%if %{with_bash_completion} +Requires: %{name}-bash-completion = %{version}-%{release} +%endif %description client The client binaries needed to access the virtualization @@ -863,10 +856,22 @@ Group: Development/Libraries/C and C++ Requires: %{name}-libs = %{version}-%{release} Requires: readline +%if %{with_bash_completion} +Requires: %{name}-bash-completion = %{version}-%{release} +%endif %description admin The client side utilities to control the libvirt daemon. +%if %{with_bash_completion} +%package bash-completion +Summary: Bash completion script +Group: Development/Libraries/C and C++ + +%description bash-completion +Bash completion script stub. +%endif + %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries/C and C++ @@ -915,19 +920,10 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -# it is submodule in git +# 6b3d716e-keycodemap-py3.patch patches the keycodemapdb git submodule pushd src/keycodemapdb -%patch5 -p1 +%patch0 -p1 popd -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -956,7 +952,6 @@ %patch214 -p1 %patch215 -p1 %patch216 -p1 -%patch217 -p1 %if ! 0%{?is_opensuse} %patch400 -p1 %endif @@ -1305,20 +1300,20 @@ %pre daemon %{_bindir}/getent group libvirt >/dev/null || %{_sbindir}/groupadd -r libvirt -%service_add_pre libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket +%service_add_pre libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %post daemon /sbin/ldconfig %if %{with_apparmor} %apparmor_reload /etc/apparmor.d/usr.sbin.libvirtd %endif -%service_add_post libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket +%service_add_post libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %{fillup_only -n libvirtd} %{fillup_only -n virtlockd} %{fillup_only -n virtlogd} %preun daemon -%service_del_preun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket +%service_del_preun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %postun daemon /sbin/ldconfig @@ -1329,7 +1324,7 @@ done /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : fi - %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket + %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %posttrans daemon # All connection drivers should be installed post transaction. @@ -1390,8 +1385,10 @@ %{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.socket +%{_unitdir}/virtlogd-admin.socket %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket +%{_unitdir}/virtlockd-admin.socket %{_sbindir}/rclibvirtd %{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlockd @@ -1414,7 +1411,7 @@ %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %if %{with_bash_completion} -%{_datadir}/bash-completion/completions/vsh +%{_datadir}/bash-completion/completions/virsh %endif %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ @@ -1683,6 +1680,14 @@ %files admin %doc %{_mandir}/man1/virt-admin.1* %{_bindir}/virt-admin +%if %{with_bash_completion} +%{_datadir}/bash-completion/completions/virt-admin +%endif + +%if %{with_bash_completion} +%files bash-completion +%{_datadir}/bash-completion/completions/vsh +%endif %files devel %{_libdir}/libvirt.so ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.763968258 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.767968114 +0100 @@ -18,11 +18,11 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -diff --git a/src/Makefile.am b/src/Makefile.am -index 166c9a8e9..25f913a5f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -404,6 +404,7 @@ DOMAIN_CONF_SOURCES = \ +Index: libvirt-4.1.0/src/Makefile.am +=================================================================== +--- libvirt-4.1.0.orig/src/Makefile.am ++++ libvirt-4.1.0/src/Makefile.am +@@ -441,6 +441,7 @@ DOMAIN_CONF_SOURCES = \ conf/domain_conf.c conf/domain_conf.h \ conf/domain_audit.c conf/domain_audit.h \ conf/domain_nwfilter.c conf/domain_nwfilter.h \ @@ -30,11 +30,10 @@ conf/virsavecookie.c conf/virsavecookie.h \ conf/snapshot_conf.c conf/snapshot_conf.h \ conf/numa_conf.c conf/numa_conf.h \ -diff --git a/src/conf/domain_stats.c b/src/conf/domain_stats.c -new file mode 100644 -index 000000000..beb3c09d5 +Index: libvirt-4.1.0/src/conf/domain_stats.c +=================================================================== --- /dev/null -+++ b/src/conf/domain_stats.c ++++ libvirt-4.1.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -175,11 +174,10 @@ +} + +#undef STATS_ADD_NET_PARAM -diff --git a/src/conf/domain_stats.h b/src/conf/domain_stats.h -new file mode 100644 -index 000000000..42f8cb6d3 +Index: libvirt-4.1.0/src/conf/domain_stats.h +=================================================================== --- /dev/null -+++ b/src/conf/domain_stats.h ++++ libvirt-4.1.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -245,11 +243,11 @@ + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms -index bc8cc1fba..2e22abcec 100644 ---- a/src/libvirt_private.syms -+++ b/src/libvirt_private.syms -@@ -630,6 +630,9 @@ virDomainConfNWFilterRegister; +Index: libvirt-4.1.0/src/libvirt_private.syms +=================================================================== +--- libvirt-4.1.0.orig/src/libvirt_private.syms ++++ libvirt-4.1.0/src/libvirt_private.syms +@@ -644,6 +644,9 @@ virDomainConfNWFilterRegister; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -259,7 +257,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1468,6 +1471,7 @@ virCgroupGetMemoryUsage; +@@ -1500,6 +1503,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -267,10 +265,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKill; -diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c -index a203c9297..f60436e4c 100644 ---- a/src/qemu/qemu_driver.c -+++ b/src/qemu/qemu_driver.c +Index: libvirt-4.1.0/src/qemu/qemu_driver.c +=================================================================== +--- libvirt-4.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.1.0/src/qemu/qemu_driver.c @@ -72,6 +72,7 @@ #include "viralloc.h" #include "viruuid.h" @@ -279,7 +277,7 @@ #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19380,21 +19381,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +@@ -19518,21 +19519,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -302,7 +300,7 @@ } -@@ -19417,37 +19404,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +@@ -19555,37 +19542,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d unsigned int privflags ATTRIBUTE_UNUSED) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -341,7 +339,7 @@ } static int -@@ -19624,44 +19581,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, +@@ -19764,44 +19721,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -386,7 +384,7 @@ static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -19669,68 +19588,9 @@ qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +@@ -19809,68 +19728,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -456,7 +454,7 @@ #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -19852,10 +19712,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver, +@@ -19992,10 +19852,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver if (disk->info.alias) alias = qemuDomainStorageAlias(disk->info.alias, backing_idx); @@ -469,7 +467,7 @@ block_idx, src->path); if (backing_idx) QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex", -@@ -19971,7 +19831,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, +@@ -20111,7 +19971,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr * after the iteration than it is to iterate twice; but we still * want count listed first. */ count_index = record->nparams; @@ -478,7 +476,7 @@ for (i = 0; i < dom->def->ndisks; i++) { virDomainDiskDefPtr disk = dom->def->disks[i]; -@@ -20005,10 +19865,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr driver, +@@ -20145,10 +20005,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -489,11 +487,11 @@ static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c -index 0a31947b0..04ef4c1a7 100644 ---- a/src/util/vircgroup.c -+++ b/src/util/vircgroup.c -@@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int controller) +Index: libvirt-4.1.0/src/util/vircgroup.c +=================================================================== +--- libvirt-4.1.0.orig/src/util/vircgroup.c ++++ libvirt-4.1.0/src/util/vircgroup.c +@@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -538,7 +536,7 @@ #else /* !VIR_CGROUP_SUPPORTED */ bool -@@ -4899,6 +4937,14 @@ virCgroupControllerAvailable(int controller ATTRIBUTE_UNUSED) +@@ -4899,6 +4937,14 @@ virCgroupControllerAvailable(int control { return false; } @@ -553,11 +551,11 @@ #endif /* !VIR_CGROUP_SUPPORTED */ -diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h -index d83392767..2ebdf9505 100644 ---- a/src/util/vircgroup.h -+++ b/src/util/vircgroup.h -@@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgroup, +Index: libvirt-4.1.0/src/util/vircgroup.h +=================================================================== +--- libvirt-4.1.0.orig/src/util/vircgroup.h ++++ libvirt-4.1.0/src/util/vircgroup.h +@@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); bool virCgroupControllerAvailable(int controller); @@ -566,6 +564,3 @@ + virDomainStatsRecordPtr record, + int *maxparams); #endif /* __VIR_CGROUP_H__ */ --- -2.15.1 - ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.779967682 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.779967682 +0100 @@ -9,11 +9,11 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c -index b3447100f..10667c134 100644 ---- a/src/lxc/lxc_driver.c -+++ b/src/lxc/lxc_driver.c -@@ -81,6 +81,7 @@ +Index: libvirt-4.1.0/src/lxc/lxc_driver.c +=================================================================== +--- libvirt-4.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.1.0/src/lxc/lxc_driver.c +@@ -80,6 +80,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" #include "netdev_bandwidth_conf.h" @@ -21,7 +21,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5485,6 +5486,142 @@ lxcDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +@@ -5514,6 +5515,142 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -164,7 +164,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5579,6 +5716,7 @@ static virHypervisorDriver lxcHypervisorDriver = { +@@ -5608,6 +5745,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ @@ -172,6 +172,3 @@ }; static virConnectDriver lxcConnectDriver = { --- -2.15.1 - ++++++ apibuild-py3.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.803966818 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.803966818 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-4.0.0/docs/apibuild.py +Index: libvirt-4.1.0/docs/apibuild.py =================================================================== ---- libvirt-4.0.0.orig/docs/apibuild.py -+++ libvirt-4.0.0/docs/apibuild.py +--- libvirt-4.1.0.orig/docs/apibuild.py ++++ libvirt-4.1.0/docs/apibuild.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.819966242 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.819966242 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-4.0.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.1.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-4.0.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-4.0.0/examples/apparmor/libvirt-lxc +--- libvirt-4.1.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.1.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.851965090 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.851965090 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-4.0.0/src/qemu/qemu_driver.c +Index: libvirt-4.1.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.0.0/src/qemu/qemu_driver.c -@@ -17159,6 +17159,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.1.0/src/qemu/qemu_driver.c +@@ -17275,6 +17275,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } ++++++ libvirt-4.0.0.tar.xz -> libvirt-4.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-4.0.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-4.1.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.895963506 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.895963506 +0100 @@ -2,11 +2,11 @@ From: <r...@suse.de> -Index: libvirt-4.0.0/src/cpu/cpu_map.xml +Index: libvirt-4.1.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-4.0.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.0.0/src/cpu/cpu_map.xml -@@ -2346,6 +2346,8 @@ +--- libvirt-4.1.0.orig/src/cpu/cpu_map.xml ++++ libvirt-4.1.0/src/cpu/cpu_map.xml +@@ -2349,6 +2349,8 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004d0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.935962066 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.935962066 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-4.0.0/configure.ac +Index: libvirt-4.1.0/configure.ac =================================================================== ---- libvirt-4.0.0.orig/configure.ac -+++ libvirt-4.0.0/configure.ac -@@ -257,6 +257,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-4.1.0.orig/configure.ac ++++ libvirt-4.1.0/configure.ac +@@ -258,6 +258,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF @@ -10,7 +10,7 @@ LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN -@@ -298,6 +299,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -26,11 +26,11 @@ LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-4.0.0/src/Makefile.am +Index: libvirt-4.1.0/src/Makefile.am =================================================================== ---- libvirt-4.0.0.orig/src/Makefile.am -+++ libvirt-4.0.0/src/Makefile.am -@@ -1039,6 +1039,10 @@ if WITH_NETCF +--- libvirt-4.1.0.orig/src/Makefile.am ++++ libvirt-4.1.0/src/Makefile.am +@@ -857,6 +857,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -41,7 +41,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1659,6 +1663,10 @@ if WITH_NETCF +@@ -1228,6 +1232,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -52,10 +52,10 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-4.0.0/tools/virsh.c +Index: libvirt-4.1.0/tools/virsh.c =================================================================== ---- libvirt-4.0.0.orig/tools/virsh.c -+++ libvirt-4.0.0/tools/virsh.c +--- libvirt-4.1.0.orig/tools/virsh.c ++++ libvirt-4.1.0/tools/virsh.c @@ -578,6 +578,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -65,10 +65,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-4.0.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.1.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-4.0.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-4.0.0/src/interface/interface_backend_netcf.c +--- libvirt-4.1.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.1.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -83,7 +83,7 @@ #include "virerror.h" #include "datatypes.h" -@@ -66,6 +71,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState +@@ -67,6 +72,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState static virNetcfDriverStatePtr driver; @@ -121,9 +121,9 @@ static void virNetcfDriverStateDispose(void *obj) -@@ -88,6 +124,10 @@ netcfStateInitialize(bool privileged ATT - if (!(driver = virObjectLockableNew(virNetcfDriverStateClass))) - return -1; +@@ -91,6 +127,10 @@ netcfStateInitialize(bool privileged, + + driver->privileged = privileged; +#ifdef WITH_NETCONTROL + nc_logger_redirect_to(interface_nc_log_driver); @@ -132,7 +132,7 @@ /* open netcf */ if (ncf_init(&driver->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -@@ -1143,6 +1183,19 @@ static virStateDriver interfaceStateDriv +@@ -1238,6 +1278,19 @@ static virStateDriver interfaceStateDriv int netcfIfaceRegister(void) { @@ -149,13 +149,13 @@ + + ncf_close(netcf); + - if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) + if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; - if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-4.0.0/src/interface/interface_driver.c + if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) +Index: libvirt-4.1.0/src/interface/interface_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/interface/interface_driver.c -+++ libvirt-4.0.0/src/interface/interface_driver.c +--- libvirt-4.1.0.orig/src/interface/interface_driver.c ++++ libvirt-4.1.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -173,10 +173,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-4.0.0/m4/virt-netcontrol.m4 +Index: libvirt-4.1.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-4.0.0/m4/virt-netcontrol.m4 ++++ libvirt-4.1.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:25.983960338 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:25.987960194 +0100 @@ -8,11 +8,11 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-4.0.0/src/libxl/libxl_driver.c +Index: libvirt-4.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.0.0/src/libxl/libxl_driver.c -@@ -1382,6 +1382,61 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-4.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.1.0/src/libxl/libxl_driver.c +@@ -1380,6 +1380,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6498,6 +6553,7 @@ static virHypervisorDriver libxlHypervis +@@ -6496,6 +6551,7 @@ static virHypervisorDriver libxlHypervis .domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */ ++++++ libxl-qemu-emulator-caps.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.007959474 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.007959474 +0100 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-4.0.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.1.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-4.0.0/src/libxl/libxl_capabilities.c +--- libvirt-4.1.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.1.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.023958898 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.023958898 +0100 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-4.0.0/src/libxl/libxl_conf.c +Index: libvirt-4.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.0.0/src/libxl/libxl_conf.c +--- libvirt-4.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.1.0/src/libxl/libxl_conf.c @@ -769,6 +769,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.035958466 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.035958466 +0100 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-4.0.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.1.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-4.0.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-4.0.0/include/libvirt/libvirt-domain.h +--- libvirt-4.1.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.1.0/include/libvirt/libvirt-domain.h @@ -1008,6 +1008,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,11 +52,11 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-4.0.0/src/libxl/libxl_driver.c +Index: libvirt-4.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.0.0/src/libxl/libxl_driver.c -@@ -6100,6 +6100,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-4.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.1.0/src/libxl/libxl_driver.c +@@ -6098,6 +6098,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; int ret = -1; @@ -66,7 +66,7 @@ #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME virReportUnsupportedError(); -@@ -6116,6 +6119,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6114,6 +6117,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,7 +85,7 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6130,11 +6145,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6128,11 +6143,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-4.0.0/src/libxl/libxl_migration.c +Index: libvirt-4.1.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_migration.c -+++ libvirt-4.0.0/src/libxl/libxl_migration.c +--- libvirt-4.1.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.1.0/src/libxl/libxl_migration.c @@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, @@ -263,10 +263,10 @@ virObjectLock(vm); if (ret < 0) -Index: libvirt-4.0.0/src/libxl/libxl_migration.h +Index: libvirt-4.1.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_migration.h -+++ libvirt-4.0.0/src/libxl/libxl_migration.h +--- libvirt-4.1.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.1.0/src/libxl/libxl_migration.h @@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ @@ -311,10 +311,10 @@ virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-4.0.0/tools/virsh-domain.c +Index: libvirt-4.1.0/tools/virsh-domain.c =================================================================== ---- libvirt-4.0.0.orig/tools/virsh-domain.c -+++ libvirt-4.0.0/tools/virsh-domain.c +--- libvirt-4.1.0.orig/tools/virsh-domain.c ++++ libvirt-4.1.0/tools/virsh-domain.c @@ -10540,6 +10540,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") @@ -374,10 +374,10 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-4.0.0/tools/virsh.pod +Index: libvirt-4.1.0/tools/virsh.pod =================================================================== ---- libvirt-4.0.0.orig/tools/virsh.pod -+++ libvirt-4.0.0/tools/virsh.pod +--- libvirt-4.1.0.orig/tools/virsh.pod ++++ libvirt-4.1.0/tools/virsh.pod @@ -1849,6 +1849,14 @@ Providing I<--tls> causes the migration the migration of the domain. Usage requires proper TLS setup for both source and target. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.059957602 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.059957602 +0100 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-4.0.0/src/libxl/libxl_conf.c +Index: libvirt-4.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.0.0/src/libxl/libxl_conf.c +--- libvirt-4.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.1.0/src/libxl/libxl_conf.c @@ -769,6 +769,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.079956883 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.079956883 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-4.0.0/src/lxc/lxc_controller.c +Index: libvirt-4.1.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-4.0.0.orig/src/lxc/lxc_controller.c -+++ libvirt-4.0.0/src/lxc/lxc_controller.c +--- libvirt-4.1.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.1.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -25,7 +25,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -1997,6 +1998,7 @@ static int virLXCControllerDeleteInterfa +@@ -2003,6 +2004,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; } @@ -33,11 +33,11 @@ return ret; } -Index: libvirt-4.0.0/src/lxc/lxc_driver.c +Index: libvirt-4.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.0.0/src/lxc/lxc_driver.c -@@ -76,6 +76,7 @@ +--- libvirt-4.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.1.0/src/lxc/lxc_driver.c +@@ -75,6 +75,7 @@ #include "virtime.h" #include "virtypedparam.h" #include "viruri.h" @@ -45,7 +45,7 @@ #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -4007,6 +4008,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -4021,6 +4022,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); @@ -53,7 +53,7 @@ break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4441,6 +4443,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4464,6 +4466,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -61,11 +61,11 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-4.0.0/src/lxc/lxc_process.c +Index: libvirt-4.1.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-4.0.0.orig/src/lxc/lxc_process.c -+++ libvirt-4.0.0/src/lxc/lxc_process.c -@@ -52,6 +52,7 @@ +--- libvirt-4.1.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.1.0/src/lxc/lxc_process.c +@@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" #include "virsystemd.h" @@ -73,9 +73,9 @@ #include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC -@@ -221,6 +222,7 @@ static void virLXCProcessCleanup(virLXCD +@@ -220,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD } - networkReleaseActualDevice(vm->def, iface); + virDomainNetReleaseActualDevice(vm->def, iface); } + virWaitForDevices(); ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.091956451 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.091956451 +0100 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-4.0.0/src/network/bridge_driver.c +Index: libvirt-4.1.0/src/network/bridge_driver.c =================================================================== ---- libvirt-4.0.0.orig/src/network/bridge_driver.c -+++ libvirt-4.0.0/src/network/bridge_driver.c -@@ -1393,7 +1393,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-4.1.0.orig/src/network/bridge_driver.c ++++ libvirt-4.1.0/src/network/bridge_driver.c +@@ -1470,7 +1470,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-4.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.1.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-4.0.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-4.0.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.1.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.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.75cuoQ/_old 2018-03-08 10:54:26.107955875 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.111955731 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-4.0.0/src/util/virarch.c +Index: libvirt-4.1.0/src/util/virarch.c =================================================================== ---- libvirt-4.0.0.orig/src/util/virarch.c -+++ libvirt-4.0.0/src/util/virarch.c +--- libvirt-4.1.0.orig/src/util/virarch.c ++++ libvirt-4.1.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.123955299 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.123955299 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-4.0.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.1.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.0.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.0.0/examples/apparmor/libvirt-qemu +--- libvirt-4.1.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.1.0/examples/apparmor/libvirt-qemu @@ -193,3 +193,6 @@ # silence refusals to open lttng files (see LP: #1432644) deny /dev/shm/lttng-ust-wait-* r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.131955011 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.139954723 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-4.0.0/src/xenconfig/xen_common.c +Index: libvirt-4.1.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-4.0.0.orig/src/xenconfig/xen_common.c -+++ libvirt-4.0.0/src/xenconfig/xen_common.c +--- libvirt-4.1.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.1.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c @@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; ++++++ suse-apparmor-libnl-paths.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.147954435 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.147954435 +0100 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-4.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-4.0.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-4.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.1.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.1.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ owner @{PROC}/[0-9]*/status r, @{PROC}/filesystems r, @@ -21,10 +21,10 @@ # for hostdev /sys/devices/ r, -Index: libvirt-4.0.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.1.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.0.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.0.0/examples/apparmor/libvirt-qemu +--- libvirt-4.1.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.1.0/examples/apparmor/libvirt-qemu @@ -62,6 +62,7 @@ #/dev/fb* rw, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.159954003 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.159954003 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-4.0.0/tools/libvirt-guests.init.in +Index: libvirt-4.1.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-4.0.0.orig/tools/libvirt-guests.init.in -+++ libvirt-4.0.0/tools/libvirt-guests.init.in +--- libvirt-4.1.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.1.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -46,10 +46,10 @@ + exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-4.0.0/tools/libvirt-guests.sh.in +Index: libvirt-4.1.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-4.0.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-4.0.0/tools/libvirt-guests.sh.in +--- libvirt-4.1.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.1.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -151,7 +151,7 @@ eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -409,7 +437,7 @@ shutdown_guests_parallel() +@@ -412,7 +440,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -160,7 +160,7 @@ return fi else -@@ -437,7 +465,7 @@ stop() { +@@ -441,7 +469,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -169,7 +169,7 @@ return fi fi -@@ -485,14 +513,14 @@ stop() { +@@ -489,14 +517,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -186,7 +186,7 @@ set +f return fi -@@ -551,14 +579,13 @@ gueststatus() { +@@ -555,14 +583,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -203,16 +203,16 @@ fi fi } -@@ -603,4 +630,4 @@ case "$1" in +@@ -607,4 +634,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-4.0.0/tools/libvirt-guests.sysconf +Index: libvirt-4.1.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-4.0.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-4.0.0/tools/libvirt-guests.sysconf +--- libvirt-4.1.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.1.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.171953571 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.175953427 +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-4.0.0/daemon/libvirtd.conf +Index: libvirt-4.1.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-4.0.0.orig/daemon/libvirtd.conf -+++ libvirt-4.0.0/daemon/libvirtd.conf +--- libvirt-4.1.0.orig/src/remote/libvirtd.conf ++++ libvirt-4.1.0/src/remote/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -18,10 +18,10 @@ # Listen for unencrypted TCP connections on the public TCP/IP port. # NB, must pass the --listen flag to the libvirtd process for this to -Index: libvirt-4.0.0/daemon/libvirtd-config.c +Index: libvirt-4.1.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-4.0.0.orig/daemon/libvirtd-config.c -+++ libvirt-4.0.0/daemon/libvirtd-config.c +--- libvirt-4.1.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-4.1.0/src/remote/remote_daemon_config.c @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -31,10 +31,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-4.0.0/daemon/test_libvirtd.aug.in +Index: libvirt-4.1.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-4.0.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-4.0.0/daemon/test_libvirtd.aug.in +--- libvirt-4.1.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-4.1.0/src/remote/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ suse-libvirtd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.191952851 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.191952851 +0100 @@ -7,14 +7,14 @@ tools. If a user installs libvirt on their SUSE Xen host, then libvirt should be king and override xendomains. See bsc#1015348 -Index: libvirt-4.0.0/daemon/libvirtd.service.in +Index: libvirt-4.1.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-4.0.0.orig/daemon/libvirtd.service.in -+++ libvirt-4.0.0/daemon/libvirtd.service.in -@@ -14,6 +14,8 @@ After=iscsid.service - After=apparmor.service +--- libvirt-4.1.0.orig/src/remote/libvirtd.service.in ++++ libvirt-4.1.0/src/remote/libvirtd.service.in +@@ -16,6 +16,8 @@ After=apparmor.service After=local-fs.target After=remote-fs.target + After=systemd-machined.service +After=xencommons.service +Conflicts=xendomains.service Documentation=man:libvirtd(8) ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.203952419 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.203952419 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-4.0.0/daemon/libvirtd.sysconf +Index: libvirt-4.1.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-4.0.0.orig/daemon/libvirtd.sysconf -+++ libvirt-4.0.0/daemon/libvirtd.sysconf +--- libvirt-4.1.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-4.1.0/src/remote/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.215951987 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.219951843 +0100 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-4.0.0/src/qemu/qemu.conf +Index: libvirt-4.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.0.0.orig/src/qemu/qemu.conf -+++ libvirt-4.0.0/src/qemu/qemu.conf +--- libvirt-4.1.0.orig/src/qemu/qemu.conf ++++ libvirt-4.1.0/src/qemu/qemu.conf @@ -743,10 +743,9 @@ security_default_confined = 0 # 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-4.0.0/src/qemu/qemu_conf.c +Index: libvirt-4.1.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-4.0.0.orig/src/qemu/qemu_conf.c -+++ libvirt-4.0.0/src/qemu/qemu_conf.c +--- libvirt-4.1.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.1.0/src/qemu/qemu_conf.c @@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.227951555 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.231951411 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-4.0.0/src/qemu/qemu.conf +Index: libvirt-4.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.0.0.orig/src/qemu/qemu.conf -+++ libvirt-4.0.0/src/qemu/qemu.conf +--- libvirt-4.1.0.orig/src/qemu/qemu.conf ++++ libvirt-4.1.0/src/qemu/qemu.conf @@ -380,11 +380,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.259950402 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.263950259 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-4.0.0/src/locking/virtlockd.sysconf +Index: libvirt-4.1.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-4.0.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-4.0.0/src/locking/virtlockd.sysconf +--- libvirt-4.1.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.1.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.275949827 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.275949827 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-4.0.0/src/logging/virtlogd.sysconf +Index: libvirt-4.1.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-4.0.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-4.0.0/src/logging/virtlogd.sysconf +--- libvirt-4.1.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.1.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.287949395 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.291949251 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c @@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.75cuoQ/_old 2018-03-08 10:54:26.299948963 +0100 +++ /var/tmp/diff_new_pack.75cuoQ/_new 2018-03-08 10:54:26.299948963 +0100 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-4.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.1.0/src/xenconfig/xen_sxpr.c @@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */