Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2018-08-07 10:50:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Tue Aug 7 10:50:36 2018 rev:263 rq:627773 version:4.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2018-07-27 10:51:37.297115806 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2018-08-07 10:50:40.164645890 +0200 @@ -1,0 +2,20 @@ +Mon Aug 6 16:38:32 UTC 2018 - [email protected] + +- Update to libvirt 4.6.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Switch from yajl to jansson + - Dropped patches: + libvirt-4.5.0-apparmor-add-missing-comma.patch + - Patches added to fix upstream bugs: + temp-build-fix.patch + +------------------------------------------------------------------- +Fri Aug 3 09:31:55 UTC 2018 - [email protected] + +- Fix apparmor failure at startup because of syntax error in + libvirt profile: + * Add libvirt-4.5.0-apparmor-add-missing-comma.patch (picked + from upstream). + +------------------------------------------------------------------- Old: ---- libvirt-4.5.0.tar.xz libvirt-4.5.0.tar.xz.asc New: ---- libvirt-4.6.0.tar.xz libvirt-4.6.0.tar.xz.asc temp-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.268651445 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.268651445 +0200 @@ -48,7 +48,6 @@ %define with_libssh2 0%{!?_without_libssh2:1} # A few optional bits off by default, we enable later -%define with_cgconfig 0%{!?_without_cgconfig:0} %define with_numactl 0%{!?_without_numactl:0} %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} @@ -167,11 +166,6 @@ %define qemu_user qemu %define qemu_group qemu -# Pull in cgroups config system -%if %{with_qemu} || %{with_lxc} - %define with_cgconfig 0%{!?_without_cgconfig:1} -%endif - %if %{with_firewalld} %define _fwdefdir %{_prefix}/lib/firewalld/services %else @@ -184,7 +178,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 4.5.0 +Version: 4.6.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1-or-later @@ -253,9 +247,9 @@ BuildRequires: perl(XML::XPath) # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libjansson-devel BuildRequires: libpciaccess0-devel >= 0.10.9 BuildRequires: libudev-devel >= 145 -BuildRequires: libyajl-devel %if %{with_sanlock} BuildRequires: sanlock-devel >= 2.4 %endif @@ -270,12 +264,11 @@ BuildRequires: apparmor-rpm-macros BuildRequires: libapparmor-devel %endif -BuildRequires: dnsmasq >= 2.41 -BuildRequires: iptables -# TODO BuildRequires: iptables-ipv6 BuildRequires: cyrus-sasl-devel +BuildRequires: dnsmasq >= 2.41 BuildRequires: ebtables -BuildRequires: polkit >= 0.93 +BuildRequires: iptables +BuildRequires: polkit >= 0.112 BuildRequires: radvd # For mount/umount in FS driver BuildRequires: util-linux @@ -348,6 +341,7 @@ Patch156: 0001-Extract-stats-functions-from-the-qemu-driver.patch Patch157: 0002-lxc-implement-connectGetAllDomainStats.patch Patch158: 0001-libxl-add-support-for-BlockResize-API.patch +Patch159: temp-build-fix.patch # Our patches Patch200: suse-libvirtd-disable-tls.patch Patch201: suse-libvirtd-sysconfig-settings.patch @@ -403,7 +397,7 @@ Requires: iproute Requires: logrotate Requires: udev >= 145 -Recommends: polkit >= 0.93 +Recommends: polkit >= 0.112 %ifarch i386 i586 i686 x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode @@ -462,10 +456,10 @@ %package daemon-driver-network Summary: Network driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: iptables -# TODO Requires: iptables-ipv6 -Requires: %{name}-daemon = %{version}-%{release} Requires: radvd %description daemon-driver-network @@ -476,10 +470,10 @@ %package daemon-driver-nwfilter Summary: A nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: ebtables Requires: iptables -# TODO Requires: iptables-ipv6 -Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-nwfilter The nwfilter driver plugin for the libvirtd daemon, providing @@ -490,6 +484,7 @@ Summary: Nodedev driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -500,6 +495,7 @@ Summary: Interface driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-interface The interface driver plugin for the libvirtd daemon, providing @@ -519,6 +515,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: nfs-utils # For mkfs Requires: util-linux @@ -536,6 +533,7 @@ Summary: Storage driver plugin for lvm volumes Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: lvm2 %description daemon-driver-storage-logical @@ -557,6 +555,7 @@ Summary: Storage driver plugin for local scsi devices Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-scsi The storage driver backend adding implementation of the storage APIs for scsi @@ -566,6 +565,7 @@ Summary: Storage driver plugin for iscsi Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: open-iscsi %description daemon-driver-storage-iscsi @@ -576,6 +576,7 @@ Summary: Storage driver plugin for multipath volumes Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: device-mapper %description daemon-driver-storage-mpath @@ -588,6 +589,7 @@ Summary: Storage driver plugin for gluster Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-gluster The storage driver backend adding implementation of the storage APIs for gluster @@ -599,6 +601,7 @@ Summary: Storage driver plugin for rbd Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-rbd The storage driver backend adding implementation of the storage APIs for rbd @@ -610,6 +613,7 @@ Summary: Storage driver plugin for sheepdog Group: Development/Libraries/C and C++ Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: sheepdog %description daemon-driver-storage-sheepdog @@ -647,6 +651,7 @@ Summary: Qemu driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: %{name}-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} @@ -669,6 +674,7 @@ Summary: LXC driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # There really is a hard cross-driver dependency here Requires: %{name}-daemon-driver-network = %{version}-%{release} @@ -684,6 +690,7 @@ Summary: Uml driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-uml The UML driver plugin for the libvirtd daemon, providing @@ -697,6 +704,7 @@ Summary: VirtualBox driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-vbox The vbox driver plugin for the libvirtd daemon, providing @@ -710,6 +718,7 @@ Summary: Libxl driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing @@ -830,6 +839,8 @@ # Needed by virt-pki-validate script. Requires: cyrus-sasl Requires: gnutls +# We dlopen(libjansson.so.4), so need an explicit dep +Requires: libjansson4 %if %{with_bash_completion} Requires: %{name}-bash-completion = %{version}-%{release} %endif @@ -931,6 +942,7 @@ %patch156 -p1 %patch157 -p1 %patch158 -p1 +%patch159 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -1112,7 +1124,7 @@ %{?arg_apparmor} \ %{?arg_apparmor_profiles} \ --with-udev \ - --with-yajl \ + --with-jansson \ %{?arg_sanlock} \ --with-libpcap \ --with-macvtap \ ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.308651516 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.308651516 +0200 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-4.5.0/src/conf/domain_stats.c +Index: libvirt-4.6.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-4.5.0/src/conf/domain_stats.c ++++ libvirt-4.6.0/src/conf/domain_stats.c @@ -0,0 +1,139 @@ +/* + * domain_stats.c: domain stats extraction helpers @@ -162,10 +162,10 @@ +} + +#undef STATS_ADD_NET_PARAM -Index: libvirt-4.5.0/src/conf/domain_stats.h +Index: libvirt-4.6.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-4.5.0/src/conf/domain_stats.h ++++ libvirt-4.6.0/src/conf/domain_stats.h @@ -0,0 +1,64 @@ +/* + * domain_stats.h: domain stats extraction helpers @@ -231,11 +231,11 @@ + int *maxparams); + +#endif /* __DOMAIN_STATS_H */ -Index: libvirt-4.5.0/src/libvirt_private.syms +Index: libvirt-4.6.0/src/libvirt_private.syms =================================================================== ---- libvirt-4.5.0.orig/src/libvirt_private.syms -+++ libvirt-4.5.0/src/libvirt_private.syms -@@ -654,6 +654,9 @@ virDomainConfNWFilterInstantiate; +--- libvirt-4.6.0.orig/src/libvirt_private.syms ++++ libvirt-4.6.0/src/libvirt_private.syms +@@ -647,6 +647,9 @@ virDomainConfNWFilterInstantiate; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -245,7 +245,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1543,6 +1546,7 @@ virCgroupGetMemoryUsage; +@@ -1537,6 +1540,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -253,10 +253,10 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKill; -Index: libvirt-4.5.0/src/qemu/qemu_driver.c +Index: libvirt-4.6.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.5.0/src/qemu/qemu_driver.c +--- libvirt-4.6.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.6.0/src/qemu/qemu_driver.c @@ -74,6 +74,7 @@ #include "virarptable.h" #include "viruuid.h" @@ -265,7 +265,7 @@ #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19670,21 +19671,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -19597,21 +19598,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ } -@@ -19707,37 +19694,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d +@@ -19634,37 +19621,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d unsigned int privflags ATTRIBUTE_UNUSED) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ } static int -@@ -19916,44 +19873,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -19844,44 +19801,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -19961,68 +19880,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -19889,68 +19808,9 @@ qemuDomainGetStatsInterface(virQEMUDrive int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -442,7 +442,7 @@ #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ do { \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ -@@ -20144,10 +20004,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver +@@ -20072,10 +19932,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver if (disk->info.alias) alias = qemuDomainStorageAlias(disk->info.alias, backing_idx); @@ -455,7 +455,7 @@ block_idx, src->path); if (backing_idx) QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex", -@@ -20263,7 +20123,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20191,7 +20051,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr * after the iteration than it is to iterate twice; but we still * want count listed first. */ count_index = record->nparams; @@ -464,7 +464,7 @@ for (i = 0; i < dom->def->ndisks; i++) { virDomainDiskDefPtr disk = dom->def->disks[i]; -@@ -20297,10 +20157,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20225,10 +20085,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -475,11 +475,11 @@ static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-4.5.0/src/util/vircgroup.c +Index: libvirt-4.6.0/src/util/vircgroup.c =================================================================== ---- libvirt-4.5.0.orig/src/util/vircgroup.c -+++ libvirt-4.5.0/src/util/vircgroup.c -@@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control +--- libvirt-4.6.0.orig/src/util/vircgroup.c ++++ libvirt-4.6.0/src/util/vircgroup.c +@@ -3956,6 +3956,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -524,7 +524,7 @@ #else /* !VIR_CGROUP_SUPPORTED */ bool -@@ -4899,6 +4937,14 @@ virCgroupControllerAvailable(int control +@@ -4733,6 +4771,14 @@ virCgroupControllerAvailable(int control { return false; } @@ -539,11 +539,11 @@ #endif /* !VIR_CGROUP_SUPPORTED */ -Index: libvirt-4.5.0/src/util/vircgroup.h +Index: libvirt-4.6.0/src/util/vircgroup.h =================================================================== ---- libvirt-4.5.0.orig/src/util/vircgroup.h -+++ libvirt-4.5.0/src/util/vircgroup.h -@@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou +--- libvirt-4.6.0.orig/src/util/vircgroup.h ++++ libvirt-4.6.0/src/util/vircgroup.h +@@ -297,4 +297,9 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); bool virCgroupControllerAvailable(int controller); @@ -551,11 +551,12 @@ +int virCgroupGetStatsCpu(virCgroupPtr cgroup, + virDomainStatsRecordPtr record, + int *maxparams); ++ #endif /* __VIR_CGROUP_H__ */ -Index: libvirt-4.5.0/src/conf/Makefile.inc.am +Index: libvirt-4.6.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-4.5.0.orig/src/conf/Makefile.inc.am -+++ libvirt-4.5.0/src/conf/Makefile.inc.am +--- libvirt-4.6.0.orig/src/conf/Makefile.inc.am ++++ libvirt-4.6.0/src/conf/Makefile.inc.am @@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0001-libxl-add-support-for-BlockResize-API.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.316651531 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.316651531 +0200 @@ -19,10 +19,10 @@ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) -Index: libvirt-4.5.0/src/libxl/libxl_driver.c +Index: libvirt-4.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.5.0/src/libxl/libxl_driver.c +--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.6.0/src/libxl/libxl_driver.c @@ -5119,6 +5119,97 @@ libxlDomainMemoryStats(virDomainPtr dom, #undef LIBXL_SET_MEMSTAT ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.324651545 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.324651545 +0200 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-4.5.0/src/lxc/lxc_driver.c +Index: libvirt-4.6.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.5.0/src/lxc/lxc_driver.c +--- libvirt-4.6.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.6.0/src/lxc/lxc_driver.c @@ -79,6 +79,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" @@ -21,7 +21,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5444,6 +5445,142 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5411,6 +5412,142 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -164,7 +164,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5539,6 +5676,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5506,6 +5643,7 @@ static virHypervisorDriver lxcHypervisor .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.332651559 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.332651559 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.5.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.6.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-4.5.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-4.5.0/examples/apparmor/libvirt-lxc +--- libvirt-4.6.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.6.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.352651595 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.352651595 +0200 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-4.5.0/src/qemu/qemu_driver.c +Index: libvirt-4.6.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.5.0/src/qemu/qemu_driver.c -@@ -17559,6 +17559,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.6.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.6.0/src/qemu/qemu_driver.c +@@ -17484,6 +17484,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } ++++++ libvirt-4.5.0.tar.xz -> libvirt-4.6.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-4.5.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-4.6.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.384651653 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.388651660 +0200 @@ -2,11 +2,11 @@ From: <[email protected]> -Index: libvirt-4.5.0/src/cpu/cpu_map.xml +Index: libvirt-4.6.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-4.5.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.5.0/src/cpu/cpu_map.xml -@@ -2355,6 +2355,8 @@ +--- libvirt-4.6.0.orig/src/cpu/cpu_map.xml ++++ libvirt-4.6.0/src/cpu/cpu_map.xml +@@ -2361,6 +2361,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.VlItHL/_old 2018-08-07 10:50:43.408651696 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.408651696 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-4.5.0/configure.ac +Index: libvirt-4.6.0/configure.ac =================================================================== ---- libvirt-4.5.0.orig/configure.ac -+++ libvirt-4.5.0/configure.ac -@@ -255,6 +255,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-4.6.0.orig/configure.ac ++++ libvirt-4.6.0/configure.ac +@@ -256,6 +256,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF @@ -10,7 +10,7 @@ LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL -@@ -297,6 +298,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER -@@ -970,6 +972,7 @@ LIBVIRT_RESULT_LIBXL +@@ -980,6 +982,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,10 +26,10 @@ LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL -Index: libvirt-4.5.0/tools/virsh.c +Index: libvirt-4.6.0/tools/virsh.c =================================================================== ---- libvirt-4.5.0.orig/tools/virsh.c -+++ libvirt-4.5.0/tools/virsh.c +--- libvirt-4.6.0.orig/tools/virsh.c ++++ libvirt-4.6.0/tools/virsh.c @@ -575,6 +575,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-4.5.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.6.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-4.5.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-4.5.0/src/interface/interface_backend_netcf.c +--- libvirt-4.6.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.6.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -126,10 +126,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-4.5.0/src/interface/interface_driver.c +Index: libvirt-4.6.0/src/interface/interface_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/interface/interface_driver.c -+++ libvirt-4.5.0/src/interface/interface_driver.c +--- libvirt-4.6.0.orig/src/interface/interface_driver.c ++++ libvirt-4.6.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -147,10 +147,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-4.5.0/m4/virt-netcontrol.m4 +Index: libvirt-4.6.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-4.5.0/m4/virt-netcontrol.m4 ++++ libvirt-4.6.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl @@ -191,10 +191,10 @@ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ + LIBVIRT_RESULT_LIB([NETCONTROL]) +]) -Index: libvirt-4.5.0/src/interface/Makefile.inc.am +Index: libvirt-4.6.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-4.5.0.orig/src/interface/Makefile.inc.am -+++ libvirt-4.5.0/src/interface/Makefile.inc.am +--- libvirt-4.6.0.orig/src/interface/Makefile.inc.am ++++ libvirt-4.6.0/src/interface/Makefile.inc.am @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.444651760 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.444651760 +0200 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-4.5.0/src/libxl/libxl_driver.c +Index: libvirt-4.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.5.0/src/libxl/libxl_driver.c +--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.6.0/src/libxl/libxl_driver.c @@ -1344,6 +1344,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } ++++++ libxl-qemu-emulator-caps.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.452651774 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.452651774 +0200 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-4.5.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.6.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-4.5.0/src/libxl/libxl_capabilities.c +--- libvirt-4.6.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.460651789 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.460651789 +0200 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-4.5.0/src/libxl/libxl_conf.c +Index: libvirt-4.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.5.0/src/libxl/libxl_conf.c +--- libvirt-4.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.6.0/src/libxl/libxl_conf.c @@ -837,6 +837,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.468651803 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.468651803 +0200 @@ -16,11 +16,11 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-4.5.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.6.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-4.5.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-4.5.0/include/libvirt/libvirt-domain.h -@@ -1008,6 +1008,31 @@ typedef enum { +--- libvirt-4.6.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.6.0/include/libvirt/libvirt-domain.h +@@ -1015,6 +1015,31 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" @@ -52,10 +52,10 @@ /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, -Index: libvirt-4.5.0/src/libxl/libxl_driver.c +Index: libvirt-4.6.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.5.0/src/libxl/libxl_driver.c +--- libvirt-4.6.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.6.0/src/libxl/libxl_driver.c @@ -5985,6 +5985,9 @@ libxlDomainMigratePerform3Params(virDoma const char *dname = NULL; const char *uri = NULL; @@ -99,10 +99,10 @@ goto cleanup; } -Index: libvirt-4.5.0/src/libxl/libxl_migration.c +Index: libvirt-4.6.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_migration.c -+++ libvirt-4.5.0/src/libxl/libxl_migration.c +--- libvirt-4.6.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.6.0/src/libxl/libxl_migration.c @@ -353,18 +353,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, @@ -263,10 +263,10 @@ virObjectLock(vm); if (ret < 0) -Index: libvirt-4.5.0/src/libxl/libxl_migration.h +Index: libvirt-4.6.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_migration.h -+++ libvirt-4.5.0/src/libxl/libxl_migration.h +--- libvirt-4.6.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.6.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,11 +311,11 @@ virDomainPtr libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-4.5.0/tools/virsh-domain.c +Index: libvirt-4.6.0/tools/virsh-domain.c =================================================================== ---- libvirt-4.5.0.orig/tools/virsh-domain.c -+++ libvirt-4.5.0/tools/virsh-domain.c -@@ -10328,6 +10328,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-4.6.0.orig/tools/virsh-domain.c ++++ libvirt-4.6.0/tools/virsh-domain.c +@@ -10425,6 +10425,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_BOOL, .help = N_("use TLS for migration") }, @@ -338,7 +338,7 @@ {.name = NULL} }; -@@ -10351,6 +10367,7 @@ doMigrate(void *opaque) +@@ -10448,6 +10464,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -346,7 +346,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10470,6 +10487,27 @@ doMigrate(void *opaque) +@@ -10567,6 +10584,27 @@ doMigrate(void *opaque) goto save_error; } @@ -374,11 +374,11 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-4.5.0/tools/virsh.pod +Index: libvirt-4.6.0/tools/virsh.pod =================================================================== ---- libvirt-4.5.0.orig/tools/virsh.pod -+++ libvirt-4.5.0/tools/virsh.pod -@@ -1932,6 +1932,14 @@ Providing I<--tls> causes the migration +--- libvirt-4.6.0.orig/tools/virsh.pod ++++ libvirt-4.6.0/tools/virsh.pod +@@ -1937,6 +1937,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.VlItHL/_old 2018-08-07 10:50:43.476651817 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.476651817 +0200 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-4.5.0/src/libxl/libxl_conf.c +Index: libvirt-4.6.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.5.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.5.0/src/libxl/libxl_conf.c +--- libvirt-4.6.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.6.0/src/libxl/libxl_conf.c @@ -837,6 +837,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.484651832 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.484651832 +0200 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-4.5.0/src/lxc/lxc_controller.c +Index: libvirt-4.6.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-4.5.0.orig/src/lxc/lxc_controller.c -+++ libvirt-4.5.0/src/lxc/lxc_controller.c +--- libvirt-4.6.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.6.0/src/lxc/lxc_controller.c @@ -73,6 +73,7 @@ #include "rpc/virnetdaemon.h" #include "virstring.h" @@ -33,10 +33,10 @@ return ret; } -Index: libvirt-4.5.0/src/lxc/lxc_driver.c +Index: libvirt-4.6.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.5.0/src/lxc/lxc_driver.c +--- libvirt-4.6.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.6.0/src/lxc/lxc_driver.c @@ -74,6 +74,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -45,7 +45,7 @@ #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -3956,6 +3957,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -3945,6 +3946,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: -@@ -4399,6 +4401,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4388,6 +4390,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -61,10 +61,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-4.5.0/src/lxc/lxc_process.c +Index: libvirt-4.6.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-4.5.0.orig/src/lxc/lxc_process.c -+++ libvirt-4.5.0/src/lxc/lxc_process.c +--- libvirt-4.6.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.6.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.488651839 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.492651846 +0200 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-4.5.0/src/network/bridge_driver.c +Index: libvirt-4.6.0/src/network/bridge_driver.c =================================================================== ---- libvirt-4.5.0.orig/src/network/bridge_driver.c -+++ libvirt-4.5.0/src/network/bridge_driver.c -@@ -1457,7 +1457,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-4.6.0.orig/src/network/bridge_driver.c ++++ libvirt-4.6.0/src/network/bridge_driver.c +@@ -1463,7 +1463,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.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-4.5.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-4.5.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.496651853 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.500651860 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-4.5.0/src/util/virarch.c +Index: libvirt-4.6.0/src/util/virarch.c =================================================================== ---- libvirt-4.5.0.orig/src/util/virarch.c -+++ libvirt-4.5.0/src/util/virarch.c +--- libvirt-4.6.0.orig/src/util/virarch.c ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.504651867 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.504651867 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.5.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.6.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.5.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.5.0/examples/apparmor/libvirt-qemu +--- libvirt-4.6.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.6.0/examples/apparmor/libvirt-qemu @@ -205,3 +205,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.512651882 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.512651882 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-4.5.0/src/xenconfig/xen_common.c +Index: libvirt-4.6.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-4.5.0.orig/src/xenconfig/xen_common.c -+++ libvirt-4.5.0/src/xenconfig/xen_common.c +--- libvirt-4.6.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.6.0/src/xenconfig/xen_common.c @@ -402,12 +402,19 @@ xenParsePCI(char *entry) int busID; int slotID; @@ -31,7 +31,7 @@ + if (!(nextkey = strchr(key, ':'))) return NULL; - if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) == NULL) { + if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) { @@ -452,10 +459,30 @@ xenParsePCI(char *entry) if (virStrToLong_i(func, NULL, 16, &funcID) < 0) return NULL; @@ -64,10 +64,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.5.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.520651896 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.520651896 +0200 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-4.5.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.6.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-4.5.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-4.5.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.6.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.6.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.5.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.6.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.5.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.5.0/examples/apparmor/libvirt-qemu +--- libvirt-4.6.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.6.0/examples/apparmor/libvirt-qemu @@ -62,6 +62,7 @@ #/dev/fb* rw, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.528651910 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.528651910 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-4.5.0/tools/libvirt-guests.init.in +Index: libvirt-4.6.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-4.5.0.orig/tools/libvirt-guests.init.in -+++ libvirt-4.5.0/tools/libvirt-guests.init.in +--- libvirt-4.6.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.6.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.5.0/tools/libvirt-guests.sh.in +Index: libvirt-4.6.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-4.5.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-4.5.0/tools/libvirt-guests.sh.in +--- libvirt-4.6.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.6.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -209,10 +209,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-4.5.0/tools/libvirt-guests.sysconf +Index: libvirt-4.6.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-4.5.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-4.5.0/tools/libvirt-guests.sysconf +--- libvirt-4.6.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.6.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.536651925 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.536651925 +0200 @@ -3,10 +3,10 @@ On SUSE distros, the default is for libvirtd to listen only on the Unix Domain Socket. The libvirt client still provides remote access via a SSH tunnel. -Index: libvirt-4.5.0/src/remote/libvirtd.conf +Index: libvirt-4.6.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-4.5.0.orig/src/remote/libvirtd.conf -+++ libvirt-4.5.0/src/remote/libvirtd.conf +--- libvirt-4.6.0.orig/src/remote/libvirtd.conf ++++ libvirt-4.6.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.5.0/src/remote/remote_daemon_config.c +Index: libvirt-4.6.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-4.5.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-4.5.0/src/remote/remote_daemon_config.c +--- libvirt-4.6.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-4.6.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.5.0/src/remote/test_libvirtd.aug.in +Index: libvirt-4.6.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-4.5.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-4.5.0/src/remote/test_libvirtd.aug.in +--- libvirt-4.6.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.540651932 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.544651939 +0200 @@ -7,10 +7,10 @@ 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.5.0/src/remote/libvirtd.service.in +Index: libvirt-4.6.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-4.5.0.orig/src/remote/libvirtd.service.in -+++ libvirt-4.5.0/src/remote/libvirtd.service.in +--- libvirt-4.6.0.orig/src/remote/libvirtd.service.in ++++ libvirt-4.6.0/src/remote/libvirtd.service.in @@ -17,6 +17,8 @@ After=local-fs.target After=remote-fs.target After=systemd-logind.service ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.548651946 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.552651953 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-4.5.0/src/remote/libvirtd.sysconf +Index: libvirt-4.6.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-4.5.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-4.5.0/src/remote/libvirtd.sysconf +--- libvirt-4.6.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-4.6.0/src/remote/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.556651960 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.556651960 +0200 @@ -1,9 +1,9 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-4.5.0/src/qemu/qemu.conf +Index: libvirt-4.6.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.5.0.orig/src/qemu/qemu.conf -+++ libvirt-4.5.0/src/qemu/qemu.conf +--- libvirt-4.6.0.orig/src/qemu/qemu.conf ++++ libvirt-4.6.0/src/qemu/qemu.conf @@ -769,10 +769,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.5.0/src/qemu/qemu_conf.c +Index: libvirt-4.6.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-4.5.0.orig/src/qemu/qemu_conf.c -+++ libvirt-4.5.0/src/qemu/qemu_conf.c +--- libvirt-4.6.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.6.0/src/qemu/qemu_conf.c @@ -122,10 +122,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM @@ -36,10 +36,10 @@ #endif -Index: libvirt-4.5.0/src/security/virt-aa-helper.c +Index: libvirt-4.6.0/src/security/virt-aa-helper.c =================================================================== ---- libvirt-4.5.0.orig/src/security/virt-aa-helper.c -+++ libvirt-4.5.0/src/security/virt-aa-helper.c +--- libvirt-4.6.0.orig/src/security/virt-aa-helper.c ++++ libvirt-4.6.0/src/security/virt-aa-helper.c @@ -515,7 +515,8 @@ valid_path(const char *path, const bool "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.564651975 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.564651975 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-4.5.0/src/qemu/qemu.conf +Index: libvirt-4.6.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.5.0.orig/src/qemu/qemu.conf -+++ libvirt-4.5.0/src/qemu/qemu.conf +--- libvirt-4.6.0.orig/src/qemu/qemu.conf ++++ libvirt-4.6.0/src/qemu/qemu.conf @@ -414,11 +414,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ suse-virtlockd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.580652003 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.580652003 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-4.5.0/src/locking/virtlockd.sysconf +Index: libvirt-4.6.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-4.5.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-4.5.0/src/locking/virtlockd.sysconf +--- libvirt-4.6.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.6.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.588652018 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.588652018 +0200 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-4.5.0/src/logging/virtlogd.sysconf +Index: libvirt-4.6.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-4.5.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-4.5.0/src/logging/virtlogd.sysconf +--- libvirt-4.6.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.6.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ temp-build-fix.patch ++++++ Fix link errors in tools/nss and tests Although a simple 'make' of libvirt.git works, building libvirt 4.6.0 with 'osc build ...' fails in tools/nss and tests, with output along the lines of: [ 469s] libtool: link: gcc -shared -fPIC -DPIC -Wl,--whole-archive nss/.libs/libnss_libvirt_impl.a -Wl,--no-whole-archive -lpthread -lutil -ltirpc -fstack-protector-strong -grecord-gcc-switches -O2 -fstack-protector-strong -g -Wl,--version-script=./nss/libvirt_nss.syms -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -grecord-gcc-switches -O2 -fstack-protector-strong -g -pthread -Wl,-soname -Wl,libnss_libvirt.so.2 -o nss/.libs/libnss_libvirt.so.2 [ 469s] nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virjsoncompat.o): In function `virJSONJanssonOnce': [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:63: undefined reference to `dlopen' [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:79: undefined reference to `dlsym' ... A quick hack is to add '-ldl' to the linker flags for libnss_libvirt_impl and /libnss_libvirt_guest_impl. Will ask about a proper fix on libvirt dev list. Index: libvirt-4.6.0/tools/Makefile.am =================================================================== --- libvirt-4.6.0.orig/tools/Makefile.am +++ libvirt-4.6.0/tools/Makefile.am @@ -525,6 +525,9 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ $(AM_CFLAGS) \ $(NULL) +nss_libnss_libvirt_impl_la_LDFLAGS = \ + -ldl + nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la @@ -552,6 +555,9 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS $(AM_CFLAGS) \ $(NULL) +nss_libnss_libvirt_guest_impl_la_LDFLAGS = \ + -ldl + nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.VlItHL/_old 2018-08-07 10:50:43.604652046 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.604652046 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.5.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.6.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.VlItHL/_old 2018-08-07 10:50:43.612652060 +0200 +++ /var/tmp/diff_new_pack.VlItHL/_new 2018-08-07 10:50:43.616652068 +0200 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-4.5.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.6.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.5.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.5.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.6.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.6.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 */
