Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2018-05-06 14:59:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Sun May 6 14:59:33 2018 rev:257 rq:603330 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2018-04-07 20:52:56.475328606 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2018-05-06 14:59:41.696931429 +0200 @@ -1,0 +2,11 @@ +Wed May 2 21:42:09 UTC 2018 - [email protected] + +- Update to libvirt 4.3.0 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Remove legacy Xen driver + - Dropped patches: + 09877303-virSocketAddrParseInternal.patch, + 412afdb8-intro-virSocketAddrParseAny.patch + +------------------------------------------------------------------- Old: ---- 09877303-virSocketAddrParseInternal.patch 412afdb8-intro-virSocketAddrParseAny.patch libvirt-4.2.0.tar.xz libvirt-4.2.0.tar.xz.asc New: ---- libvirt-4.3.0.tar.xz libvirt-4.3.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.312762032 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.316761885 +0200 @@ -22,7 +22,6 @@ %endif # The hypervisor drivers that run in libvirtd -%define with_xen 0%{!?_without_xen:1} %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} %define with_uml 0%{!?_without_uml:1} @@ -55,21 +54,16 @@ %define with_libssh 0%{!?_without_libssh:0} %define with_bash_completion 0%{!?_without_bash_completion:0} -# Xen no longer contains xm/xend so disable building the legacy Xen driver -%define with_xen 0 - # Set the OS / architecture specific special cases # Xen is available only on x86_64, armv7 and aarch64 %ifnarch x86_64 armv7hl aarch64 - %define with_xen 0 %define with_libxl 0 %endif # For SLE, further restrict Xen support to x86_64 only %if ! 0%{?is_opensuse} %ifarch %arm aarch64 - %define with_xen 0 %define with_libxl 0 %endif %endif @@ -175,7 +169,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 4.2.0 +Version: 4.3.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1-or-later @@ -196,9 +190,6 @@ %if %{with_uml} Requires: %{name}-daemon-driver-uml = %{version}-%{release} %endif -%if %{with_xen} -Requires: %{name}-daemon-driver-xen = %{version}-%{release} -%endif %if %{with_vbox} Requires: %{name}-daemon-driver-vbox = %{version}-%{release} %endif @@ -221,7 +212,7 @@ BuildRequires: modutils BuildRequires: systemd BuildRequires: pkgconfig(systemd) -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} BuildRequires: xen-devel %endif %if %{with_qemu} @@ -324,8 +315,6 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: 09877303-virSocketAddrParseInternal.patch -Patch1: 412afdb8-intro-virSocketAddrParseAny.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -681,18 +670,6 @@ User Mode Linux %endif -%if %{with_xen} - -%package daemon-driver-xen -Summary: Xen driver plugin for the libvirtd daemon -Group: Development/Libraries/C and C++ -Requires: %{name}-daemon = %{version}-%{release} - -%description daemon-driver-xen -The Xen driver plugin for the libvirtd daemon, providing -an implementation of the hypervisor driver APIs using Xen. -%endif - %if %{with_vbox} %package daemon-driver-vbox @@ -778,20 +755,15 @@ capabilities of UML %endif -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests Group: Development/Libraries/C and C++ Requires: %{name}-daemon = %{version}-%{release} - %if %{with_xen} -Requires: %{name}-daemon-driver-xen = %{version}-%{release} - %endif - %if %{with_libxl} -Requires: %{name}-daemon-driver-libxl = %{version}-%{release} - %endif Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-libxl = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} @@ -927,8 +899,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1 @@ -961,11 +931,6 @@ %endif %build -%if %{with_xen} - %define arg_xen --with-xen -%else - %define arg_xen --without-xen -%endif %if %{with_qemu} %define arg_qemu --with-qemu %else @@ -1084,7 +1049,6 @@ export CFLAGS="%{optflags}" export PYTHON=%{_bindir}/python3 %configure --disable-static \ - %{?arg_xen} \ %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ @@ -1226,7 +1190,7 @@ of managing VirtualBox. EOF %endif -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF' Any empty package encapsulating requirements for a libvirtd capable of managing Xen. @@ -1588,13 +1552,6 @@ %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so %endif -%if %{with_xen} - -%files daemon-driver-xen -%dir %{_libdir}/%{name}/connection-driver -%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so -%endif - %if %{with_libxl} %files daemon-driver-libxl @@ -1633,7 +1590,7 @@ %doc %{_docdir}/%{name}/libvirt-daemon-uml.README %endif -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} %files daemon-xen %doc %{_docdir}/%{name}/libvirt-daemon-xen.README ++++++ 0001-Extract-stats-functions-from-the-qemu-driver.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.384759390 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.388759243 +0200 @@ -18,10 +18,10 @@ create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.h -Index: libvirt-4.2.0/src/conf/domain_stats.c +Index: libvirt-4.3.0/src/conf/domain_stats.c =================================================================== --- /dev/null -+++ libvirt-4.2.0/src/conf/domain_stats.c ++++ libvirt-4.3.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.2.0/src/conf/domain_stats.h +Index: libvirt-4.3.0/src/conf/domain_stats.h =================================================================== --- /dev/null -+++ libvirt-4.2.0/src/conf/domain_stats.h ++++ libvirt-4.3.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.2.0/src/libvirt_private.syms +Index: libvirt-4.3.0/src/libvirt_private.syms =================================================================== ---- libvirt-4.2.0.orig/src/libvirt_private.syms -+++ libvirt-4.2.0/src/libvirt_private.syms -@@ -646,6 +646,9 @@ virDomainConfNWFilterRegister; +--- libvirt-4.3.0.orig/src/libvirt_private.syms ++++ libvirt-4.3.0/src/libvirt_private.syms +@@ -649,6 +649,9 @@ virDomainConfNWFilterRegister; virDomainConfNWFilterTeardown; virDomainConfVMNWFilterTeardown; @@ -245,7 +245,7 @@ # conf/interface_conf.h virInterfaceDefFormat; -@@ -1507,6 +1510,7 @@ virCgroupGetMemoryUsage; +@@ -1508,6 +1511,7 @@ virCgroupGetMemoryUsage; virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; @@ -253,11 +253,11 @@ virCgroupHasController; virCgroupHasEmptyTasks; virCgroupKill; -Index: libvirt-4.2.0/src/qemu/qemu_driver.c +Index: libvirt-4.3.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.2.0/src/qemu/qemu_driver.c -@@ -73,6 +73,7 @@ +--- libvirt-4.3.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.3.0/src/qemu/qemu_driver.c +@@ -74,6 +74,7 @@ #include "virarptable.h" #include "viruuid.h" #include "domain_conf.h" @@ -265,7 +265,7 @@ #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" -@@ -19528,21 +19529,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr +@@ -19508,21 +19509,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr int *maxparams, unsigned int privflags ATTRIBUTE_UNUSED) { @@ -288,7 +288,7 @@ } -@@ -19565,37 +19552,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d +@@ -19545,37 +19532,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d unsigned int privflags ATTRIBUTE_UNUSED) { qemuDomainObjPrivatePtr priv = dom->privateData; @@ -327,7 +327,7 @@ } static int -@@ -19774,44 +19731,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr +@@ -19754,44 +19711,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr return ret; } @@ -372,7 +372,7 @@ static int qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainObjPtr dom, -@@ -19819,68 +19738,9 @@ qemuDomainGetStatsInterface(virQEMUDrive +@@ -19799,68 +19718,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]; \ -@@ -20002,10 +19862,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver +@@ -19982,10 +19842,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", -@@ -20121,7 +19981,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20101,7 +19961,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]; -@@ -20155,10 +20015,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr +@@ -20135,10 +19995,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr #undef QEMU_ADD_BLOCK_PARAM_ULL @@ -475,10 +475,10 @@ static int qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, virPerfEventType type, -Index: libvirt-4.2.0/src/util/vircgroup.c +Index: libvirt-4.3.0/src/util/vircgroup.c =================================================================== ---- libvirt-4.2.0.orig/src/util/vircgroup.c -+++ libvirt-4.2.0/src/util/vircgroup.c +--- libvirt-4.3.0.orig/src/util/vircgroup.c ++++ libvirt-4.3.0/src/util/vircgroup.c @@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control return ret; } @@ -539,10 +539,10 @@ #endif /* !VIR_CGROUP_SUPPORTED */ -Index: libvirt-4.2.0/src/util/vircgroup.h +Index: libvirt-4.3.0/src/util/vircgroup.h =================================================================== ---- libvirt-4.2.0.orig/src/util/vircgroup.h -+++ libvirt-4.2.0/src/util/vircgroup.h +--- libvirt-4.3.0.orig/src/util/vircgroup.h ++++ libvirt-4.3.0/src/util/vircgroup.h @@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); @@ -552,10 +552,10 @@ + virDomainStatsRecordPtr record, + int *maxparams); #endif /* __VIR_CGROUP_H__ */ -Index: libvirt-4.2.0/src/conf/Makefile.inc.am +Index: libvirt-4.3.0/src/conf/Makefile.inc.am =================================================================== ---- libvirt-4.2.0.orig/src/conf/Makefile.inc.am -+++ libvirt-4.2.0/src/conf/Makefile.inc.am +--- libvirt-4.3.0.orig/src/conf/Makefile.inc.am ++++ libvirt-4.3.0/src/conf/Makefile.inc.am @@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \ conf/domain_audit.h \ conf/domain_nwfilter.c \ ++++++ 0002-lxc-implement-connectGetAllDomainStats.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.400758803 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.400758803 +0200 @@ -9,10 +9,10 @@ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) -Index: libvirt-4.2.0/src/lxc/lxc_driver.c +Index: libvirt-4.3.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.2.0/src/lxc/lxc_driver.c +--- libvirt-4.3.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.3.0/src/lxc/lxc_driver.c @@ -80,6 +80,7 @@ #include "viraccessapichecklxc.h" #include "virhostdev.h" @@ -21,7 +21,7 @@ #define VIR_FROM_THIS VIR_FROM_LXC -@@ -5528,6 +5529,142 @@ lxcDomainHasManagedSaveImage(virDomainPt +@@ -5524,6 +5525,142 @@ lxcDomainHasManagedSaveImage(virDomainPt return ret; } @@ -164,7 +164,7 @@ /* Function Tables */ static virHypervisorDriver lxcHypervisorDriver = { -@@ -5622,6 +5759,7 @@ static virHypervisorDriver lxcHypervisor +@@ -5619,6 +5756,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.ybqF1i/_old 2018-05-06 14:59:46.416758215 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.420758069 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.2.0/examples/apparmor/libvirt-lxc +Index: libvirt-4.3.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-4.2.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-4.2.0/examples/apparmor/libvirt-lxc +--- libvirt-4.3.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-4.3.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.448757041 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.452756895 +0200 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-4.2.0/src/qemu/qemu_driver.c +Index: libvirt-4.3.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/qemu/qemu_driver.c -+++ libvirt-4.2.0/src/qemu/qemu_driver.c -@@ -17285,6 +17285,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-4.3.0.orig/src/qemu/qemu_driver.c ++++ libvirt-4.3.0/src/qemu/qemu_driver.c +@@ -17293,6 +17293,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt goto endjob; } ++++++ libvirt-4.2.0.tar.xz -> libvirt-4.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-4.2.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-4.3.0.tar.xz differ: char 15, line 1 ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.488755573 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.488755573 +0200 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-4.2.0/src/cpu/cpu_map.xml +Index: libvirt-4.3.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-4.2.0.orig/src/cpu/cpu_map.xml -+++ libvirt-4.2.0/src/cpu/cpu_map.xml +--- libvirt-4.3.0.orig/src/cpu/cpu_map.xml ++++ libvirt-4.3.0/src/cpu/cpu_map.xml @@ -2349,6 +2349,8 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.520754399 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.520754399 +0200 @@ -1,36 +1,36 @@ -Index: libvirt-4.2.0/configure.ac +Index: libvirt-4.3.0/configure.ac =================================================================== ---- libvirt-4.2.0.orig/configure.ac -+++ libvirt-4.2.0/configure.ac -@@ -258,6 +258,7 @@ LIBVIRT_ARG_LIBSSH +--- libvirt-4.3.0.orig/configure.ac ++++ libvirt-4.3.0/configure.ac +@@ -257,6 +257,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_NETCF +LIBVIRT_ARG_NETCONTROL + LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL - LIBVIRT_ARG_OPENWSMAN @@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF +LIBVIRT_CHECK_NETCONTROL + LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER - LIBVIRT_CHECK_OPENWSMAN -@@ -994,6 +996,7 @@ LIBVIRT_RESULT_LIBXL +@@ -966,6 +968,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF +LIBVIRT_RESULT_NETCONTROL + LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL - LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-4.2.0/tools/virsh.c +Index: libvirt-4.3.0/tools/virsh.c =================================================================== ---- libvirt-4.2.0.orig/tools/virsh.c -+++ libvirt-4.2.0/tools/virsh.c -@@ -578,6 +578,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-4.3.0.orig/tools/virsh.c ++++ libvirt-4.3.0/tools/virsh.c +@@ -575,6 +575,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -39,10 +39,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c +Index: libvirt-4.3.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-4.2.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-4.2.0/src/interface/interface_backend_netcf.c +--- libvirt-4.3.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-4.3.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -57,7 +57,7 @@ #include "virerror.h" #include "datatypes.h" -@@ -67,6 +72,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState +@@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState static virNetcfDriverStatePtr driver; @@ -95,7 +95,7 @@ static void virNetcfDriverStateDispose(void *obj) -@@ -91,6 +127,10 @@ netcfStateInitialize(bool privileged, +@@ -89,6 +125,10 @@ netcfStateInitialize(bool privileged, driver->privileged = privileged; @@ -106,7 +106,7 @@ /* open netcf */ if (ncf_init(&driver->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -@@ -1238,6 +1278,19 @@ static virStateDriver interfaceStateDriv +@@ -1225,6 +1265,19 @@ static virStateDriver interfaceStateDriv int netcfIfaceRegister(void) { @@ -126,10 +126,10 @@ if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) return -1; if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) -Index: libvirt-4.2.0/src/interface/interface_driver.c +Index: libvirt-4.3.0/src/interface/interface_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/interface/interface_driver.c -+++ libvirt-4.2.0/src/interface/interface_driver.c +--- libvirt-4.3.0.orig/src/interface/interface_driver.c ++++ libvirt-4.3.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.2.0/m4/virt-netcontrol.m4 +Index: libvirt-4.3.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-4.2.0/m4/virt-netcontrol.m4 ++++ libvirt-4.3.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.2.0/src/interface/Makefile.inc.am +Index: libvirt-4.3.0/src/interface/Makefile.inc.am =================================================================== ---- libvirt-4.2.0.orig/src/interface/Makefile.inc.am -+++ libvirt-4.2.0/src/interface/Makefile.inc.am +--- libvirt-4.3.0.orig/src/interface/Makefile.inc.am ++++ libvirt-4.3.0/src/interface/Makefile.inc.am @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ $(NULL) ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.572752491 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.572752491 +0200 @@ -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.2.0/src/libxl/libxl_driver.c +Index: libvirt-4.3.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.2.0/src/libxl/libxl_driver.c -@@ -1375,6 +1375,61 @@ libxlDomainReboot(virDomainPtr dom, unsi +--- libvirt-4.3.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.3.0/src/libxl/libxl_driver.c +@@ -1358,6 +1358,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } static int @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6487,6 +6542,7 @@ static virHypervisorDriver libxlHypervis +@@ -6426,6 +6481,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.ybqF1i/_old 2018-05-06 14:59:46.584752050 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.588751904 +0200 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-4.2.0/src/libxl/libxl_capabilities.c +Index: libvirt-4.3.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-4.2.0/src/libxl/libxl_capabilities.c +--- libvirt-4.3.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.600751463 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.600751463 +0200 @@ -3,11 +3,11 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-4.2.0/src/libxl/libxl_conf.c +Index: libvirt-4.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.2.0/src/libxl/libxl_conf.c -@@ -771,6 +771,30 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-4.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.3.0/src/libxl/libxl_conf.c +@@ -837,6 +837,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -38,7 +38,7 @@ static char * libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, const char *username, -@@ -1019,6 +1043,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1085,6 +1109,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.612751023 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.616750876 +0200 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-4.2.0/include/libvirt/libvirt-domain.h +Index: libvirt-4.3.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-4.2.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-4.2.0/include/libvirt/libvirt-domain.h +--- libvirt-4.3.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-4.3.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.2.0/src/libxl/libxl_driver.c +Index: libvirt-4.3.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_driver.c -+++ libvirt-4.2.0/src/libxl/libxl_driver.c -@@ -6087,6 +6087,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-4.3.0.orig/src/libxl/libxl_driver.c ++++ libvirt-4.3.0/src/libxl/libxl_driver.c +@@ -6028,6 +6028,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(); -@@ -6103,6 +6106,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6044,6 +6047,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) -@@ -6117,11 +6132,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6058,11 +6073,11 @@ libxlDomainMigratePerform3Params(virDoma if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, @@ -99,11 +99,11 @@ goto cleanup; } -Index: libvirt-4.2.0/src/libxl/libxl_migration.c +Index: libvirt-4.3.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_migration.c -+++ libvirt-4.2.0/src/libxl/libxl_migration.c -@@ -359,18 +359,39 @@ libxlMigrateDstReceive(virNetSocketPtr s +--- libvirt-4.3.0.orig/src/libxl/libxl_migration.c ++++ libvirt-4.3.0/src/libxl/libxl_migration.c +@@ -356,18 +356,39 @@ libxlMigrateDstReceive(virNetSocketPtr s static int libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -145,7 +145,7 @@ if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -906,7 +927,7 @@ struct libxlTunnelControl { +@@ -903,7 +924,7 @@ struct libxlTunnelControl { static int libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -154,7 +154,7 @@ virStreamPtr st, struct libxlTunnelControl **tnl) { -@@ -939,7 +960,7 @@ libxlMigrationSrcStartTunnel(libxlDriver +@@ -936,7 +957,7 @@ libxlMigrationSrcStartTunnel(libxlDriver virObjectUnlock(vm); /* Send data to pipe */ @@ -163,7 +163,7 @@ virObjectLock(vm); out: -@@ -975,7 +996,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -972,7 +993,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP const char *dconnuri ATTRIBUTE_UNUSED, const char *dname, const char *uri, @@ -172,7 +172,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -1015,11 +1036,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1012,11 +1033,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perpective. */ @@ -186,7 +186,7 @@ if (!(st = virStreamNew(dconn, 0))) goto cleanup; ret = dconn->driver->domainMigratePrepareTunnel3Params -@@ -1033,7 +1054,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1030,7 +1051,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP if (ret == -1) goto cleanup; @@ -195,7 +195,7 @@ if (uri_out) { if (virTypedParamsReplaceString(¶ms, &nparams, VIR_MIGRATE_PARAM_URI, uri_out) < 0) { -@@ -1048,11 +1069,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1045,11 +1066,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); @@ -210,7 +210,7 @@ if (ret < 0) orig_err = virSaveLastError(); -@@ -1083,14 +1104,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP +@@ -1080,14 +1101,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -227,7 +227,7 @@ libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } -@@ -1137,7 +1158,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1134,7 +1155,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD const char *dconnuri, const char *uri_str ATTRIBUTE_UNUSED, const char *dname, @@ -236,7 +236,7 @@ { int ret = -1; bool useParams; -@@ -1172,7 +1193,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD +@@ -1169,7 +1190,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD } ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -245,7 +245,7 @@ cleanup: orig_err = virSaveLastError(); -@@ -1194,7 +1215,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1191,7 +1212,7 @@ libxlDomainMigrationSrcPerform(libxlDriv const char *dconnuri ATTRIBUTE_UNUSED, const char *uri_str, const char *dname ATTRIBUTE_UNUSED, @@ -254,7 +254,7 @@ { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -1234,7 +1255,7 @@ libxlDomainMigrationSrcPerform(libxlDriv +@@ -1231,7 +1252,7 @@ libxlDomainMigrationSrcPerform(libxlDriv /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -263,10 +263,10 @@ virObjectLock(vm); if (ret < 0) -Index: libvirt-4.2.0/src/libxl/libxl_migration.h +Index: libvirt-4.3.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_migration.h -+++ libvirt-4.2.0/src/libxl/libxl_migration.h +--- libvirt-4.3.0.orig/src/libxl/libxl_migration.h ++++ libvirt-4.3.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 libxlDomainMigrationDstFinish(virConnectPtr dconn, -Index: libvirt-4.2.0/tools/virsh-domain.c +Index: libvirt-4.3.0/tools/virsh-domain.c =================================================================== ---- libvirt-4.2.0.orig/tools/virsh-domain.c -+++ libvirt-4.2.0/tools/virsh-domain.c +--- libvirt-4.3.0.orig/tools/virsh-domain.c ++++ libvirt-4.3.0/tools/virsh-domain.c @@ -10545,6 +10545,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.2.0/tools/virsh.pod +Index: libvirt-4.3.0/tools/virsh.pod =================================================================== ---- libvirt-4.2.0.orig/tools/virsh.pod -+++ libvirt-4.2.0/tools/virsh.pod +--- libvirt-4.3.0.orig/tools/virsh.pod ++++ libvirt-4.3.0/tools/virsh.pod @@ -1850,6 +1850,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.ybqF1i/_old 2018-05-06 14:59:46.628750435 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.628750435 +0200 @@ -7,11 +7,11 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-4.2.0/src/libxl/libxl_conf.c +Index: libvirt-4.3.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-4.2.0.orig/src/libxl/libxl_conf.c -+++ libvirt-4.2.0/src/libxl/libxl_conf.c -@@ -771,6 +771,25 @@ libxlDiskSetDiscard(libxl_device_disk *x +--- libvirt-4.3.0.orig/src/libxl/libxl_conf.c ++++ libvirt-4.3.0/src/libxl/libxl_conf.c +@@ -837,6 +837,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } @@ -37,7 +37,7 @@ static void libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) { -@@ -916,6 +935,7 @@ libxlMakeNetworkDiskSrc(virStorageSource +@@ -982,6 +1001,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -45,7 +45,7 @@ const char *driver = virDomainDiskGetDriver(l_disk); int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); -@@ -931,7 +951,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -997,7 +1017,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -54,7 +54,7 @@ return -1; } -@@ -1044,6 +1064,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk +@@ -1110,6 +1130,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) return -1; libxlDiskSetCacheMode(x_disk, l_disk->cachemode); ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.640749995 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.640749995 +0200 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-4.2.0/src/lxc/lxc_controller.c +Index: libvirt-4.3.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-4.2.0.orig/src/lxc/lxc_controller.c -+++ libvirt-4.2.0/src/lxc/lxc_controller.c +--- libvirt-4.3.0.orig/src/lxc/lxc_controller.c ++++ libvirt-4.3.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.2.0/src/lxc/lxc_driver.c +Index: libvirt-4.3.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/lxc/lxc_driver.c -+++ libvirt-4.2.0/src/lxc/lxc_driver.c +--- libvirt-4.3.0.orig/src/lxc/lxc_driver.c ++++ libvirt-4.3.0/src/lxc/lxc_driver.c @@ -75,6 +75,7 @@ #include "virtime.h" #include "virtypedparam.h" @@ -45,7 +45,7 @@ #include "virstring.h" #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" -@@ -4035,6 +4036,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +@@ -4031,6 +4032,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: -@@ -4478,6 +4480,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4474,6 +4476,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.2.0/src/lxc/lxc_process.c +Index: libvirt-4.3.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-4.2.0.orig/src/lxc/lxc_process.c -+++ libvirt-4.2.0/src/lxc/lxc_process.c +--- libvirt-4.3.0.orig/src/lxc/lxc_process.c ++++ libvirt-4.3.0/src/lxc/lxc_process.c @@ -51,6 +51,7 @@ #include "viratomic.h" #include "virprocess.h" @@ -73,7 +73,7 @@ #include "netdev_bandwidth_conf.h" #define VIR_FROM_THIS VIR_FROM_LXC -@@ -220,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD +@@ -216,6 +217,7 @@ static void virLXCProcessCleanup(virLXCD } virDomainNetReleaseActualDevice(vm->def, iface); } ++++++ network-don-t-use-dhcp-authoritative-on-static-netwo.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.652749554 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.652749554 +0200 @@ -17,11 +17,11 @@ tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) -Index: libvirt-4.2.0/src/network/bridge_driver.c +Index: libvirt-4.3.0/src/network/bridge_driver.c =================================================================== ---- libvirt-4.2.0.orig/src/network/bridge_driver.c -+++ libvirt-4.2.0/src/network/bridge_driver.c -@@ -1470,7 +1470,14 @@ networkDnsmasqConfContents(virNetworkObj +--- libvirt-4.3.0.orig/src/network/bridge_driver.c ++++ libvirt-4.3.0/src/network/bridge_driver.c +@@ -1457,7 +1457,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.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +Index: libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf =================================================================== ---- libvirt-4.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf -+++ libvirt-4.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +--- libvirt-4.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf ++++ libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -10,7 +10,6 @@ bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.664749115 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.664749115 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-4.2.0/src/util/virarch.c +Index: libvirt-4.3.0/src/util/virarch.c =================================================================== ---- libvirt-4.2.0.orig/src/util/virarch.c -+++ libvirt-4.2.0/src/util/virarch.c +--- libvirt-4.3.0.orig/src/util/virarch.c ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.676748674 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.676748674 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.2.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.2.0/examples/apparmor/libvirt-qemu +--- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.3.0/examples/apparmor/libvirt-qemu @@ -197,3 +197,6 @@ # required for sasl GSSAPI plugin /etc/gss/mech.d/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.688748234 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.688748234 +0200 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-4.2.0/src/xenconfig/xen_common.c +Index: libvirt-4.3.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-4.2.0.orig/src/xenconfig/xen_common.c -+++ libvirt-4.2.0/src/xenconfig/xen_common.c +--- libvirt-4.3.0.orig/src/xenconfig/xen_common.c ++++ libvirt-4.3.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.2.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.700747793 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.700747793 +0200 @@ -8,10 +8,10 @@ to squelch a denial when starting confined domains. Found while investigating bsc#1058847 -Index: libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-4.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-4.2.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper -+++ libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-4.3.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper ++++ libvirt-4.3.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.2.0/examples/apparmor/libvirt-qemu +Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-4.2.0/examples/apparmor/libvirt-qemu +--- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-4.3.0/examples/apparmor/libvirt-qemu @@ -62,6 +62,7 @@ #/dev/fb* rw, ++++++ suse-libvirt-guests-service.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.716747206 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.716747206 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests service to conform to SUSE standards -Index: libvirt-4.2.0/tools/libvirt-guests.init.in +Index: libvirt-4.3.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-4.2.0.orig/tools/libvirt-guests.init.in -+++ libvirt-4.2.0/tools/libvirt-guests.init.in +--- libvirt-4.3.0.orig/tools/libvirt-guests.init.in ++++ libvirt-4.3.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.2.0/tools/libvirt-guests.sh.in +Index: libvirt-4.3.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-4.2.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-4.2.0/tools/libvirt-guests.sh.in +--- libvirt-4.3.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-4.3.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") -@@ -412,7 +440,7 @@ shutdown_guests_parallel() +@@ -414,7 +442,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 -@@ -441,7 +469,7 @@ stop() { +@@ -443,7 +471,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 -@@ -489,14 +517,14 @@ stop() { +@@ -491,14 +519,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -186,7 +186,7 @@ set +f return fi -@@ -555,14 +583,13 @@ gueststatus() { +@@ -557,14 +585,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -203,23 +203,23 @@ fi fi } -@@ -607,4 +634,4 @@ case "$1" in +@@ -609,4 +636,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-4.2.0/tools/libvirt-guests.sysconf +Index: libvirt-4.3.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-4.2.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-4.2.0/tools/libvirt-guests.sysconf +--- libvirt-4.3.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-4.3.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + +## Type: string +## Default: default # URIs to check for running guests - # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' + # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system' -#URIS=default +URIS=default ++++++ suse-libvirtd-disable-tls.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.728746765 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.728746765 +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.2.0/src/remote/libvirtd.conf +Index: libvirt-4.3.0/src/remote/libvirtd.conf =================================================================== ---- libvirt-4.2.0.orig/src/remote/libvirtd.conf -+++ libvirt-4.2.0/src/remote/libvirtd.conf +--- libvirt-4.3.0.orig/src/remote/libvirtd.conf ++++ libvirt-4.3.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.2.0/src/remote/remote_daemon_config.c +Index: libvirt-4.3.0/src/remote/remote_daemon_config.c =================================================================== ---- libvirt-4.2.0.orig/src/remote/remote_daemon_config.c -+++ libvirt-4.2.0/src/remote/remote_daemon_config.c +--- libvirt-4.3.0.orig/src/remote/remote_daemon_config.c ++++ libvirt-4.3.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.2.0/src/remote/test_libvirtd.aug.in +Index: libvirt-4.3.0/src/remote/test_libvirtd.aug.in =================================================================== ---- libvirt-4.2.0.orig/src/remote/test_libvirtd.aug.in -+++ libvirt-4.2.0/src/remote/test_libvirtd.aug.in +--- libvirt-4.3.0.orig/src/remote/test_libvirtd.aug.in ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.740746326 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.740746326 +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.2.0/src/remote/libvirtd.service.in +Index: libvirt-4.3.0/src/remote/libvirtd.service.in =================================================================== ---- libvirt-4.2.0.orig/src/remote/libvirtd.service.in -+++ libvirt-4.2.0/src/remote/libvirtd.service.in +--- libvirt-4.3.0.orig/src/remote/libvirtd.service.in ++++ libvirt-4.3.0/src/remote/libvirtd.service.in @@ -16,6 +16,8 @@ After=apparmor.service After=local-fs.target After=remote-fs.target ++++++ suse-libvirtd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.748746032 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.752745885 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-4.2.0/src/remote/libvirtd.sysconf +Index: libvirt-4.3.0/src/remote/libvirtd.sysconf =================================================================== ---- libvirt-4.2.0.orig/src/remote/libvirtd.sysconf -+++ libvirt-4.2.0/src/remote/libvirtd.sysconf +--- libvirt-4.3.0.orig/src/remote/libvirtd.sysconf ++++ libvirt-4.3.0/src/remote/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ suse-ovmf-paths.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.764745445 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.764745445 +0200 @@ -1,10 +1,10 @@ Adjust paths of OVMF firmwares on SUSE distros -Index: libvirt-4.2.0/src/qemu/qemu.conf +Index: libvirt-4.3.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.2.0.orig/src/qemu/qemu.conf -+++ libvirt-4.2.0/src/qemu/qemu.conf -@@ -743,10 +743,9 @@ security_default_confined = 0 +--- libvirt-4.3.0.orig/src/qemu/qemu.conf ++++ libvirt-4.3.0/src/qemu/qemu.conf +@@ -747,10 +747,9 @@ security_default_confined = 0 # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # follows this scheme. #nvram = [ @@ -18,11 +18,11 @@ #] # The backend to use for handling stdout/stderr output from -Index: libvirt-4.2.0/src/qemu/qemu_conf.c +Index: libvirt-4.3.0/src/qemu/qemu_conf.c =================================================================== ---- libvirt-4.2.0.orig/src/qemu/qemu_conf.c -+++ libvirt-4.2.0/src/qemu/qemu_conf.c -@@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain +--- libvirt-4.3.0.orig/src/qemu/qemu_conf.c ++++ libvirt-4.3.0/src/qemu/qemu_conf.c +@@ -122,10 +122,9 @@ void qemuDomainCmdlineDefFree(qemuDomain #ifndef DEFAULT_LOADER_NVRAM # define DEFAULT_LOADER_NVRAM \ ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.776745004 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.776745004 +0200 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-4.2.0/src/qemu/qemu.conf +Index: libvirt-4.3.0/src/qemu/qemu.conf =================================================================== ---- libvirt-4.2.0.orig/src/qemu/qemu.conf -+++ libvirt-4.2.0/src/qemu/qemu.conf +--- libvirt-4.3.0.orig/src/qemu/qemu.conf ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.800744123 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.804743976 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd sysconfig file to conform to SUSE standards -Index: libvirt-4.2.0/src/locking/virtlockd.sysconf +Index: libvirt-4.3.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-4.2.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-4.2.0/src/locking/virtlockd.sysconf +--- libvirt-4.3.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-4.3.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + ++++++ suse-virtlogd-sysconfig-settings.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.816743537 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.816743537 +0200 @@ -1,9 +1,9 @@ Adjust virtlogd sysconfig file to conform to SUSE standards -Index: libvirt-4.2.0/src/logging/virtlogd.sysconf +Index: libvirt-4.3.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-4.2.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-4.2.0/src/logging/virtlogd.sysconf +--- libvirt-4.3.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-4.3.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.ybqF1i/_old 2018-05-06 14:59:46.832742949 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.832742949 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.3.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.ybqF1i/_old 2018-05-06 14:59:46.840742656 +0200 +++ /var/tmp/diff_new_pack.ybqF1i/_new 2018-05-06 14:59:46.848742362 +0200 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c +Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +--- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-4.3.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 */
