Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2017-03-11 15:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Sat Mar 11 15:17:52 2017 rev:223 rq:476768 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2017-02-22 13:48:58.975187053 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2017-03-11 15:17:53.906315325 +0100 @@ -1,0 +2,34 @@ +Fri Mar 3 14:11:24 UTC 2017 - [email protected] + +- Update to libvirt 3.1.0 + - Modularize storage driver by splitting it into backend-specific + subpackages + - CVE-2017-2635, bsc#1027075 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: + b018ada3-shunloadtest-build-fix.patch, + f86a7a83-libxl-dom0-balloon-fix.patch, + 6e4759d0-libxl-timer-fix.patch, + 87df87e0-libxl-timer-tsc-emulate.patch, + b4386fda-xenconfig-timer-fix.patch, + d3970925-timer-tests.patch, + 321a28c6-libxl-default-disk-format.patch, + bd116810-libxl-fix-disk-detach.patch, + ff225538-libxl-autoballoon-setting.patch, + c89a6e78-libxl-physinfo-cleanup.patch, + d2b77608-libxl-maxmem-fix.patch, + 79692c38-libxl-dom0-maxmem.patch, + 4ab0c959-libxl-mem-leak.patch, + 2dc1cf19-libxl-double-free.patch, + apparmor-errormsg-fix.patch, + apparmor-alt-seclabel.patch, + qemu-disable-namespaces.patch + +------------------------------------------------------------------- +Thu Mar 2 09:01:21 UTC 2017 - [email protected] + +- Drop author list from description. Fix summary to be more + accurate as to what the subpackage pertains to. + +------------------------------------------------------------------- Old: ---- 2dc1cf19-libxl-double-free.patch 321a28c6-libxl-default-disk-format.patch 4ab0c959-libxl-mem-leak.patch 6e4759d0-libxl-timer-fix.patch 79692c38-libxl-dom0-maxmem.patch 87df87e0-libxl-timer-tsc-emulate.patch apparmor-alt-seclabel.patch apparmor-errormsg-fix.patch b018ada3-shunloadtest-build-fix.patch b4386fda-xenconfig-timer-fix.patch bd116810-libxl-fix-disk-detach.patch c89a6e78-libxl-physinfo-cleanup.patch d2b77608-libxl-maxmem-fix.patch d3970925-timer-tests.patch f86a7a83-libxl-dom0-balloon-fix.patch ff225538-libxl-autoballoon-setting.patch libvirt-3.0.0.tar.xz libvirt-3.0.0.tar.xz.asc qemu-disable-namespaces.patch New: ---- libvirt-3.1.0.tar.xz libvirt-3.1.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.366108748 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.370108182 +0100 @@ -175,7 +175,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 3.0.0 +Version: 3.1.0 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -226,6 +226,10 @@ %if %{with_xen} || %{with_libxl} BuildRequires: xen-devel %endif +%if %{with_qemu} +# For managing ACLs +BuildRequires: libacl-devel +%endif BuildRequires: fdupes BuildRequires: libattr-devel BuildRequires: libgcrypt-devel @@ -313,24 +317,8 @@ Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches -Patch0: b018ada3-shunloadtest-build-fix.patch -Patch1: f86a7a83-libxl-dom0-balloon-fix.patch -Patch2: 6e4759d0-libxl-timer-fix.patch -Patch3: 87df87e0-libxl-timer-tsc-emulate.patch -Patch4: b4386fda-xenconfig-timer-fix.patch -Patch5: d3970925-timer-tests.patch -Patch6: 321a28c6-libxl-default-disk-format.patch -Patch7: bd116810-libxl-fix-disk-detach.patch -Patch8: ff225538-libxl-autoballoon-setting.patch -Patch9: c89a6e78-libxl-physinfo-cleanup.patch -Patch10: d2b77608-libxl-maxmem-fix.patch -Patch11: 79692c38-libxl-dom0-maxmem.patch -Patch12: 4ab0c959-libxl-mem-leak.patch -Patch13: 2dc1cf19-libxl-double-free.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch -Patch101: apparmor-errormsg-fix.patch -Patch102: apparmor-alt-seclabel.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -355,10 +343,6 @@ Patch212: libvirt-suse-netcontrol.patch Patch213: lxc-wait-after-eth-del.patch Patch214: libxl-qemu-emulator-caps.patch -# Similar to upstream, temporarily disable qemu namespaces until all issues -# are resolved. See -# https://www.redhat.com/archives/libvir-list/2017-January/msg00790.html -Patch300: qemu-disable-namespaces.patch # SLES-Only patches %if %{with_sle_build} Patch400: virt-create-rootfs.patch @@ -373,16 +357,8 @@ Linux instance. The library aims to provide long term stable C API to interact with Linux virtualization technologies. - - -Authors: --------- - Daniel Veillard <[email protected]> - Karel Zak <[email protected]> - - %package doc -Summary: API reference and website documentation +Summary: API reference and website documentation for libvirt Group: Development/Libraries/C and C++ %description doc @@ -390,7 +366,7 @@ copy of the libvirt.org website documentation. %package daemon -Summary: Server side daemon and supporting files for libvirt library +Summary: Server side daemon and supporting files for libvirt Group: Development/Libraries/C and C++ # All runtime requirements for the libvirt package (runtime requirements @@ -501,8 +477,8 @@ The secret driver plugin for the libvirtd daemon, providing an implementation of the secret key APIs. -%package daemon-driver-storage -Summary: Storage driver plugin for the libvirtd daemon +%package daemon-driver-storage-core +Summary: Storage driver plugin including base backends for the libvirtd daemon Group: Development/Libraries/C and C++ Requires: libvirt-daemon = %{version}-%{release} Requires: nfs-utils @@ -512,15 +488,115 @@ # From QEMU RPMs Requires: /usr/bin/qemu-img %endif -# For LVM drivers + +%description daemon-driver-storage-core +The storage driver plugin for the libvirtd daemon, providing +an implementation of the storage APIs using files, local disks, LVM, SCSI, +iSCSI, and multipath storage. + +%package daemon-driver-storage-logical +Summary: Storage driver plugin for lvm volumes +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: lvm2 -# For ISCSI driver -Requires: open-iscsi -# For disk driver + +%description daemon-driver-storage-logical +The storage driver backend adding implementation of the storage APIs for block +volumes using lvm. + +%package daemon-driver-storage-disk +Summary: Storage driver plugin for disk +Group: Development/Libraries/C and C++ Requires: device-mapper +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: parted -# For multipath support + +%description daemon-driver-storage-disk +The storage driver backend adding implementation of the storage APIs for block +volumes using the host disks. + +%package daemon-driver-storage-scsi +Summary: Storage driver plugin for local scsi devices +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} + +%description daemon-driver-storage-scsi +The storage driver backend adding implementation of the storage APIs for scsi +host devices. + +%package daemon-driver-storage-iscsi +Summary: Storage driver plugin for iscsi +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: open-iscsi + +%description daemon-driver-storage-iscsi +The storage driver backend adding implementation of the storage APIs for iscsi +volumes using the host iscsi stack. + +%package daemon-driver-storage-mpath +Summary: Storage driver plugin for multipath volumes +Group: Development/Libraries/C and C++ Requires: device-mapper +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} + +%description daemon-driver-storage-mpath +The storage driver backend adding implementation of the storage APIs for +multipath storage using device mapper. + + +%if %{with_storage_gluster} +%package daemon-driver-storage-gluster +Summary: Storage driver plugin for gluster +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} + +%description daemon-driver-storage-gluster +The storage driver backend adding implementation of the storage APIs for gluster +volumes using libgfapi. +%endif + +%if %{with_storage_rbd} +%package daemon-driver-storage-rbd +Summary: Storage driver plugin for rbd +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} + +%description daemon-driver-storage-rbd +The storage driver backend adding implementation of the storage APIs for rbd +volumes using the ceph protocol. +%endif + +%if %{with_storage_sheepdog} +%package daemon-driver-storage-sheepdog +Summary: Storage driver plugin for sheepdog +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: sheepdog + +%description daemon-driver-storage-sheepdog +The storage driver backend adding implementation of the storage APIs for +sheepdog volumes using. +%endif + +%package daemon-driver-storage +Summary: Storage driver plugin including all backends for the libvirtd daemon +Group: Development/Libraries/C and C++ +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} +%if %{with_storage_gluster} +Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} +%endif +%if %{with_storage_rbd} +Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} +%endif +%if %{with_storage_sheepdog} +Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} +%endif %description daemon-driver-storage The storage driver plugin for the libvirtd daemon, providing @@ -536,7 +612,7 @@ # There really is a hard cross-driver dependency here Requires: /usr/bin/qemu-img Requires: libvirt-daemon-driver-network = %{version}-%{release} -Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} # For image compression Requires: bzip2 Requires: gzip @@ -738,7 +814,7 @@ capabilities of recent versions of Linux (and other OSes). %package libs -Summary: Client side libraries +Summary: Client side libraries for libvirt # So remote clients can access libvirt over SSH tunnel # (client invokes 'nc' against the UNIX socket on the server) Group: Development/Libraries/C and C++ @@ -807,23 +883,7 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -846,7 +906,6 @@ %patch212 -p1 %patch213 -p1 %patch214 -p1 -%patch300 -p1 %if %{with_sle_build} %patch400 -p1 %endif @@ -995,11 +1054,14 @@ --with-storage-fs \ --with-storage-lvm \ --with-storage-iscsi \ + --with-storage-scsi \ --with-storage-disk \ --with-storage-mpath \ %{?arg_storage_rbd} \ %{?arg_storage_sheepdog} \ %{?arg_storage_gluster} \ + --without-storage-zfs \ + --without-storage-vstorage \ %{?arg_numactl} \ %{?arg_numad} \ --with-capng \ @@ -1048,6 +1110,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/connection-driver/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/storage-backend/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/storage-backend/*.a # remove currently unsupported locale(s) for dir in $RPM_BUILD_ROOT/usr/share/locale/* do @@ -1446,9 +1510,43 @@ %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %files daemon-driver-storage + +%files daemon-driver-storage-core %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so +%dir %{_libdir}/%{name}/storage-backend +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so + +%files daemon-driver-storage-disk +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so + +%files daemon-driver-storage-logical +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so + +%files daemon-driver-storage-scsi +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so + +%files daemon-driver-storage-iscsi +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so + +%files daemon-driver-storage-mpath +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so + +%if %{with_storage_gluster} +%files daemon-driver-storage-gluster +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so +%endif + +%if %{with_storage_rbd} +%files daemon-driver-storage-rbd +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so +%endif + +%if %{with_storage_sheepdog} +%files daemon-driver-storage-sheepdog +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so +%endif %if %{with_qemu} ++++++ apparmor-fixes.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.418101390 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.418101390 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.1.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.0.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.0.0/examples/apparmor/libvirt-qemu +--- libvirt-3.1.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.1.0/examples/apparmor/libvirt-qemu @@ -146,6 +146,9 @@ # for restore /{usr/,}bin/bash rmix, ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.430099692 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.430099692 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/examples/apparmor/libvirt-lxc +Index: libvirt-3.1.0/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-3.0.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-3.0.0/examples/apparmor/libvirt-lxc +--- libvirt-3.1.0.orig/examples/apparmor/libvirt-lxc ++++ libvirt-3.1.0/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.454096297 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.458095731 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-3.0.0/src/qemu/qemu_driver.c +Index: libvirt-3.1.0/src/qemu/qemu_driver.c =================================================================== ---- libvirt-3.0.0.orig/src/qemu/qemu_driver.c -+++ libvirt-3.0.0/src/qemu/qemu_driver.c -@@ -16828,6 +16828,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-3.1.0.orig/src/qemu/qemu_driver.c ++++ libvirt-3.1.0/src/qemu/qemu_driver.c +@@ -16523,6 +16523,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } ++++++ libvirt-3.0.0.tar.xz -> libvirt-3.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-3.0.0.tar.xz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-3.1.0.tar.xz differ: char 15, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.514087807 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.514087807 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-3.0.0/tools/libvirt-guests.init.in +Index: libvirt-3.1.0/tools/libvirt-guests.init.in =================================================================== ---- libvirt-3.0.0.orig/tools/libvirt-guests.init.in -+++ libvirt-3.0.0/tools/libvirt-guests.init.in +--- libvirt-3.1.0.orig/tools/libvirt-guests.init.in ++++ libvirt-3.1.0/tools/libvirt-guests.init.in @@ -4,27 +4,27 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -45,10 +45,10 @@ # exec @libexecdir@/libvirt-guests.sh "$@" -Index: libvirt-3.0.0/tools/libvirt-guests.sh.in +Index: libvirt-3.1.0/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-3.0.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-3.0.0/tools/libvirt-guests.sh.in +--- libvirt-3.1.0.orig/tools/libvirt-guests.sh.in ++++ libvirt-3.1.0/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -208,10 +208,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-3.0.0/tools/libvirt-guests.sysconf +Index: libvirt-3.1.0/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-3.0.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-3.0.0/tools/libvirt-guests.sysconf +--- libvirt-3.1.0.orig/tools/libvirt-guests.sysconf ++++ libvirt-3.1.0/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.526086109 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.526086109 +0100 @@ -2,10 +2,10 @@ From: <[email protected]> -Index: libvirt-3.0.0/src/cpu/cpu_map.xml +Index: libvirt-3.1.0/src/cpu/cpu_map.xml =================================================================== ---- libvirt-3.0.0.orig/src/cpu/cpu_map.xml -+++ libvirt-3.0.0/src/cpu/cpu_map.xml +--- libvirt-3.1.0.orig/src/cpu/cpu_map.xml ++++ libvirt-3.1.0/src/cpu/cpu_map.xml @@ -1569,6 +1569,8 @@ <pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.546083279 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.550082713 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/configure.ac +Index: libvirt-3.1.0/configure.ac =================================================================== ---- libvirt-3.0.0.orig/configure.ac -+++ libvirt-3.0.0/configure.ac +--- libvirt-3.1.0.orig/configure.ac ++++ libvirt-3.1.0/configure.ac @@ -255,6 +255,7 @@ LIBVIRT_ARG_LIBSSH LIBVIRT_ARG_LIBXML LIBVIRT_ARG_MACVTAP @@ -10,7 +10,7 @@ LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_OPENWSMAN -@@ -294,6 +295,7 @@ LIBVIRT_CHECK_LIBSSH +@@ -295,6 +296,7 @@ LIBVIRT_CHECK_LIBSSH LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_NETCF @@ -18,7 +18,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_OPENWSMAN -@@ -977,6 +979,7 @@ LIBVIRT_RESULT_LIBXL +@@ -966,6 +968,7 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_NETCF @@ -26,11 +26,11 @@ LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN -Index: libvirt-3.0.0/src/Makefile.am +Index: libvirt-3.1.0/src/Makefile.am =================================================================== ---- libvirt-3.0.0.orig/src/Makefile.am -+++ libvirt-3.0.0/src/Makefile.am -@@ -957,6 +957,10 @@ if WITH_NETCF +--- libvirt-3.1.0.orig/src/Makefile.am ++++ libvirt-3.1.0/src/Makefile.am +@@ -959,6 +959,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -41,7 +41,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1610,6 +1614,10 @@ if WITH_NETCF +@@ -1620,6 +1624,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -52,10 +52,10 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-3.0.0/tools/virsh.c +Index: libvirt-3.1.0/tools/virsh.c =================================================================== ---- libvirt-3.0.0.orig/tools/virsh.c -+++ libvirt-3.0.0/tools/virsh.c +--- libvirt-3.1.0.orig/tools/virsh.c ++++ libvirt-3.1.0/tools/virsh.c @@ -602,6 +602,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -65,10 +65,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-3.0.0/src/interface/interface_backend_netcf.c +Index: libvirt-3.1.0/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-3.0.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-3.0.0/src/interface/interface_backend_netcf.c +--- libvirt-3.1.0.orig/src/interface/interface_backend_netcf.c ++++ libvirt-3.1.0/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -152,10 +152,10 @@ if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-3.0.0/src/interface/interface_driver.c +Index: libvirt-3.1.0/src/interface/interface_driver.c =================================================================== ---- libvirt-3.0.0.orig/src/interface/interface_driver.c -+++ libvirt-3.0.0/src/interface/interface_driver.c +--- libvirt-3.1.0.orig/src/interface/interface_driver.c ++++ libvirt-3.1.0/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -173,10 +173,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-3.0.0/m4/virt-netcontrol.m4 +Index: libvirt-3.1.0/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-3.0.0/m4/virt-netcontrol.m4 ++++ libvirt-3.1.0/m4/virt-netcontrol.m4 @@ -0,0 +1,39 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.578078751 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.578078751 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/daemon/libvirtd.conf +Index: libvirt-3.1.0/daemon/libvirtd.conf =================================================================== ---- libvirt-3.0.0.orig/daemon/libvirtd.conf -+++ libvirt-3.0.0/daemon/libvirtd.conf +--- libvirt-3.1.0.orig/daemon/libvirtd.conf ++++ libvirt-3.1.0/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,11 +13,11 @@ # 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-3.0.0/daemon/libvirtd-config.c +Index: libvirt-3.1.0/daemon/libvirtd-config.c =================================================================== ---- libvirt-3.0.0.orig/daemon/libvirtd-config.c -+++ libvirt-3.0.0/daemon/libvirtd-config.c -@@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT +--- libvirt-3.1.0.orig/daemon/libvirtd-config.c ++++ libvirt-3.1.0/daemon/libvirtd-config.c +@@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT if (VIR_ALLOC(data) < 0) return NULL; @@ -26,10 +26,10 @@ data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || -Index: libvirt-3.0.0/daemon/test_libvirtd.aug.in +Index: libvirt-3.1.0/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-3.0.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-3.0.0/daemon/test_libvirtd.aug.in +--- libvirt-3.1.0.orig/daemon/test_libvirtd.aug.in ++++ libvirt-3.1.0/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.586077620 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.586077620 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-3.0.0/daemon/libvirtd.sysconf +Index: libvirt-3.1.0/daemon/libvirtd.sysconf =================================================================== ---- libvirt-3.0.0.orig/daemon/libvirtd.sysconf -+++ libvirt-3.0.0/daemon/libvirtd.sysconf +--- libvirt-3.1.0.orig/daemon/libvirtd.sysconf ++++ libvirt-3.1.0/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libxl-dom-reset.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.614073658 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.614073658 +0100 @@ -8,10 +8,10 @@ option, but domainReset can be implemented in the libxl driver by forcibly destroying the domain and starting it again. -Index: libvirt-3.0.0/src/libxl/libxl_driver.c +Index: libvirt-3.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.0.0/src/libxl/libxl_driver.c +--- libvirt-3.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.1.0/src/libxl/libxl_driver.c @@ -1389,6 +1389,61 @@ libxlDomainReboot(virDomainPtr dom, unsi } @@ -74,7 +74,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, unsigned int flags) { -@@ -6442,6 +6497,7 @@ static virHypervisorDriver libxlHypervis +@@ -6497,6 +6552,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.4zAIBD/_old 2017-03-11 15:17:55.626071959 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.626071959 +0100 @@ -8,10 +8,10 @@ See FATE#320638 for details. -Index: libvirt-3.0.0/src/libxl/libxl_capabilities.c +Index: libvirt-3.1.0/src/libxl/libxl_capabilities.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_capabilities.c -+++ libvirt-3.0.0/src/libxl/libxl_capabilities.c +--- libvirt-3.1.0.orig/src/libxl/libxl_capabilities.c ++++ libvirt-3.1.0/src/libxl/libxl_capabilities.c @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "cpu/cpu_x86.h" @@ -20,7 +20,7 @@ #define VIR_FROM_THIS VIR_FROM_LIBXL -@@ -489,7 +490,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC +@@ -491,7 +492,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC if ((guest = virCapabilitiesAddGuest(caps, guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, guest_archs[i].arch, ++++++ libxl-set-cach-mode.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.634070828 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.634070828 +0100 @@ -3,10 +3,10 @@ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -Index: libvirt-3.0.0/src/libxl/libxl_conf.c +Index: libvirt-3.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.0.0/src/libxl/libxl_conf.c +--- libvirt-3.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.1.0/src/libxl/libxl_conf.c @@ -609,6 +609,30 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ libxl-set-migration-constraints.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.642069696 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.642069696 +0100 @@ -16,10 +16,10 @@ tools/virsh.pod | 8 ++++++++ 6 files changed, 125 insertions(+), 6 deletions(-) -Index: libvirt-3.0.0/include/libvirt/libvirt-domain.h +Index: libvirt-3.1.0/include/libvirt/libvirt-domain.h =================================================================== ---- libvirt-3.0.0.orig/include/libvirt/libvirt-domain.h -+++ libvirt-3.0.0/include/libvirt/libvirt-domain.h +--- libvirt-3.1.0.orig/include/libvirt/libvirt-domain.h ++++ libvirt-3.1.0/include/libvirt/libvirt-domain.h @@ -1000,6 +1000,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-3.0.0/src/libxl/libxl_driver.c +Index: libvirt-3.1.0/src/libxl/libxl_driver.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_driver.c -+++ libvirt-3.0.0/src/libxl/libxl_driver.c -@@ -6060,6 +6060,9 @@ libxlDomainMigratePerform3Params(virDoma +--- libvirt-3.1.0.orig/src/libxl/libxl_driver.c ++++ libvirt-3.1.0/src/libxl/libxl_driver.c +@@ -6115,6 +6115,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(); -@@ -6076,6 +6079,18 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6131,6 +6134,18 @@ libxlDomainMigratePerform3Params(virDoma virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || @@ -85,9 +85,9 @@ virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_URI, &uri) < 0) -@@ -6090,11 +6105,11 @@ libxlDomainMigratePerform3Params(virDoma +@@ -6145,11 +6160,11 @@ libxlDomainMigratePerform3Params(virDoma - if (flags & VIR_MIGRATE_PEER2PEER) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, - dconnuri, uri, dname, flags) < 0) + dconnuri, uri, dname, &props) < 0) @@ -99,11 +99,11 @@ goto cleanup; } -Index: libvirt-3.0.0/src/libxl/libxl_migration.c +Index: libvirt-3.1.0/src/libxl/libxl_migration.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_migration.c -+++ libvirt-3.0.0/src/libxl/libxl_migration.c -@@ -358,18 +358,39 @@ libxlMigrateReceive(virNetSocketPtr sock +--- libvirt-3.1.0.orig/src/libxl/libxl_migration.c ++++ libvirt-3.1.0/src/libxl/libxl_migration.c +@@ -359,18 +359,39 @@ libxlMigrateReceive(virNetSocketPtr sock static int libxlDoMigrateSend(libxlDriverPrivatePtr driver, virDomainObjPtr vm, @@ -145,7 +145,25 @@ if (ret != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to send migration data to destination host")); -@@ -727,7 +748,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -908,7 +929,7 @@ struct libxlTunnelControl { + static int + libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, +- unsigned long flags, ++ const libxlDomainMigrationProps *props, + virStreamPtr st, + struct libxlTunnelControl **tnl) + { +@@ -941,7 +962,7 @@ libxlMigrationStartTunnel(libxlDriverPri + + virObjectUnlock(vm); + /* Send data to pipe */ +- ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); ++ ret = libxlDoMigrateSend(driver, vm, props, tc->dataFD[1]); + virObjectLock(vm); + + out: +@@ -976,7 +997,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr const char *dconnuri ATTRIBUTE_UNUSED, const char *dname, const char *uri, @@ -154,7 +172,7 @@ { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; -@@ -764,7 +785,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +@@ -1016,11 +1037,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr /* We don't require the destination to have P2P support * as it looks to be normal migration from the receiver perpective. */ @@ -163,16 +181,36 @@ VIR_DEBUG("Prepare3"); virObjectUnlock(vm); -@@ -789,7 +810,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr +- if (flags & VIR_MIGRATE_TUNNELLED) { ++ if (props->virFlags & VIR_MIGRATE_TUNNELLED) { + if (!(st = virStreamNew(dconn, 0))) + goto cleanup; + ret = dconn->driver->domainMigratePrepareTunnel3Params +@@ -1034,7 +1055,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr + if (ret == -1) + goto cleanup; + +- if (!(flags & VIR_MIGRATE_TUNNELLED)) { ++ if (!(props->virFlags & VIR_MIGRATE_TUNNELLED)) { + if (uri_out) { + if (virTypedParamsReplaceString(¶ms, &nparams, + VIR_MIGRATE_PARAM_URI, uri_out) < 0) { +@@ -1049,11 +1070,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr + } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); - ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, -- uri_out, NULL, flags); -+ uri_out, NULL, props); - +- if (flags & VIR_MIGRATE_TUNNELLED) +- ret = libxlMigrationStartTunnel(driver, vm, flags, st, &tc); ++ if (props->virFlags & VIR_MIGRATE_TUNNELLED) ++ ret = libxlMigrationStartTunnel(driver, vm, props, st, &tc); + else + ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, +- uri_out, NULL, flags); ++ uri_out, NULL, props); if (ret < 0) orig_err = virSaveLastError(); -@@ -821,7 +842,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr + +@@ -1084,14 +1105,14 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); @@ -181,7 +219,15 @@ if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", -@@ -870,7 +891,7 @@ libxlDomainMigrationPerformP2P(libxlDriv + vm->def->name); + + cleanup: +- if (flags & VIR_MIGRATE_TUNNELLED) { ++ if (props->virFlags & VIR_MIGRATE_TUNNELLED) { + libxlMigrationStopTunnel(tc); + virObjectUnref(st); + } +@@ -1138,7 +1159,7 @@ libxlDomainMigrationPerformP2P(libxlDriv const char *dconnuri, const char *uri_str ATTRIBUTE_UNUSED, const char *dname, @@ -190,7 +236,7 @@ { int ret = -1; bool useParams; -@@ -905,7 +926,7 @@ libxlDomainMigrationPerformP2P(libxlDriv +@@ -1173,7 +1194,7 @@ libxlDomainMigrationPerformP2P(libxlDriv } ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, @@ -199,7 +245,7 @@ cleanup: orig_err = virSaveLastError(); -@@ -927,7 +948,7 @@ libxlDomainMigrationPerform(libxlDriverP +@@ -1195,7 +1216,7 @@ libxlDomainMigrationPerform(libxlDriverP const char *dconnuri ATTRIBUTE_UNUSED, const char *uri_str, const char *dname ATTRIBUTE_UNUSED, @@ -208,7 +254,7 @@ { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; -@@ -967,7 +988,7 @@ libxlDomainMigrationPerform(libxlDriverP +@@ -1235,7 +1256,7 @@ libxlDomainMigrationPerform(libxlDriverP /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); @@ -217,11 +263,11 @@ virObjectLock(vm); cleanup: -Index: libvirt-3.0.0/src/libxl/libxl_migration.h +Index: libvirt-3.1.0/src/libxl/libxl_migration.h =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_migration.h -+++ libvirt-3.0.0/src/libxl/libxl_migration.h -@@ -38,6 +38,10 @@ +--- libvirt-3.1.0.orig/src/libxl/libxl_migration.h ++++ libvirt-3.1.0/src/libxl/libxl_migration.h +@@ -39,6 +39,10 @@ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ @@ -232,7 +278,7 @@ NULL char * -@@ -61,6 +65,14 @@ libxlDomainMigrationPrepare(virConnectPt +@@ -70,6 +74,14 @@ libxlDomainMigrationPrepare(virConnectPt int cookieinlen, unsigned int flags); @@ -247,7 +293,7 @@ int libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, virDomainObjPtr vm, -@@ -69,7 +81,7 @@ libxlDomainMigrationPerformP2P(libxlDriv +@@ -78,7 +90,7 @@ libxlDomainMigrationPerformP2P(libxlDriv const char *dconnuri, const char *uri_str, const char *dname, @@ -256,7 +302,7 @@ int libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, -@@ -78,7 +90,7 @@ libxlDomainMigrationPerform(libxlDriverP +@@ -87,7 +99,7 @@ libxlDomainMigrationPerform(libxlDriverP const char *dconnuri, const char *uri_str, const char *dname, @@ -265,11 +311,11 @@ virDomainPtr libxlDomainMigrationFinish(virConnectPtr dconn, -Index: libvirt-3.0.0/tools/virsh-domain.c +Index: libvirt-3.1.0/tools/virsh-domain.c =================================================================== ---- libvirt-3.0.0.orig/tools/virsh-domain.c -+++ libvirt-3.0.0/tools/virsh-domain.c -@@ -10135,6 +10135,22 @@ static const vshCmdOptDef opts_migrate[] +--- libvirt-3.1.0.orig/tools/virsh-domain.c ++++ libvirt-3.1.0/tools/virsh-domain.c +@@ -10222,6 +10222,22 @@ static const vshCmdOptDef opts_migrate[] .type = VSH_OT_STRING, .help = N_("filename containing updated persistent XML for the target") }, @@ -292,7 +338,7 @@ {.name = NULL} }; -@@ -10158,6 +10174,7 @@ doMigrate(void *opaque) +@@ -10245,6 +10261,7 @@ doMigrate(void *opaque) unsigned long long ullOpt = 0; int rv; virConnectPtr dconn = data->dconn; @@ -300,7 +346,7 @@ sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); -@@ -10277,6 +10294,27 @@ doMigrate(void *opaque) +@@ -10364,6 +10381,27 @@ doMigrate(void *opaque) goto save_error; } @@ -328,11 +374,11 @@ if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) goto out; if (opt) { -Index: libvirt-3.0.0/tools/virsh.pod +Index: libvirt-3.1.0/tools/virsh.pod =================================================================== ---- libvirt-3.0.0.orig/tools/virsh.pod -+++ libvirt-3.0.0/tools/virsh.pod -@@ -1709,6 +1709,14 @@ compression. I<--comp-mt-threads> and I< +--- libvirt-3.1.0.orig/tools/virsh.pod ++++ libvirt-3.1.0/tools/virsh.pod +@@ -1732,6 +1732,14 @@ compression. I<--comp-mt-threads> and I< of compress threads on source and the number of decompress threads on target respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. ++++++ libxl-support-block-script.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.650068564 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.650068564 +0100 @@ -7,10 +7,10 @@ For more details, see bsc#954872 and FATE#319810 -Index: libvirt-3.0.0/src/libxl/libxl_conf.c +Index: libvirt-3.1.0/src/libxl/libxl_conf.c =================================================================== ---- libvirt-3.0.0.orig/src/libxl/libxl_conf.c -+++ libvirt-3.0.0/src/libxl/libxl_conf.c +--- libvirt-3.1.0.orig/src/libxl/libxl_conf.c ++++ libvirt-3.1.0/src/libxl/libxl_conf.c @@ -609,6 +609,25 @@ libxlDiskSetDiscard(libxl_device_disk *x #endif } ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.662066866 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.662066866 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-3.0.0/src/lxc/lxc_controller.c +Index: libvirt-3.1.0/src/lxc/lxc_controller.c =================================================================== ---- libvirt-3.0.0.orig/src/lxc/lxc_controller.c -+++ libvirt-3.0.0/src/lxc/lxc_controller.c +--- libvirt-3.1.0.orig/src/lxc/lxc_controller.c ++++ libvirt-3.1.0/src/lxc/lxc_controller.c @@ -1997,6 +1997,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,10 +25,10 @@ return ret; } -Index: libvirt-3.0.0/src/lxc/lxc_driver.c +Index: libvirt-3.1.0/src/lxc/lxc_driver.c =================================================================== ---- libvirt-3.0.0.orig/src/lxc/lxc_driver.c -+++ libvirt-3.0.0/src/lxc/lxc_driver.c +--- libvirt-3.1.0.orig/src/lxc/lxc_driver.c ++++ libvirt-3.1.0/src/lxc/lxc_driver.c @@ -4036,6 +4036,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -45,10 +45,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-3.0.0/src/lxc/lxc_process.c +Index: libvirt-3.1.0/src/lxc/lxc_process.c =================================================================== ---- libvirt-3.0.0.orig/src/lxc/lxc_process.c -+++ libvirt-3.0.0/src/lxc/lxc_process.c +--- libvirt-3.1.0.orig/src/lxc/lxc_process.c ++++ libvirt-3.1.0/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD } networkReleaseActualDevice(vm->def, iface); ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.670065734 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.674065169 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-3.0.0/src/util/virarch.c +Index: libvirt-3.1.0/src/util/virarch.c =================================================================== ---- libvirt-3.0.0.orig/src/util/virarch.c -+++ libvirt-3.0.0/src/util/virarch.c +--- libvirt-3.1.0.orig/src/util/virarch.c ++++ libvirt-3.1.0/src/util/virarch.c @@ -169,6 +169,8 @@ virArch virArchFromHost(void) arch = VIR_ARCH_I686; } else if (STREQ(ut.machine, "amd64")) { ++++++ qemu-apparmor-screenshot.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.682064037 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.682064037 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/examples/apparmor/libvirt-qemu +Index: libvirt-3.1.0/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-3.0.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-3.0.0/examples/apparmor/libvirt-qemu +--- libvirt-3.1.0.orig/examples/apparmor/libvirt-qemu ++++ libvirt-3.1.0/examples/apparmor/libvirt-qemu @@ -154,3 +154,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.690062905 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.690062905 +0100 @@ -8,10 +8,10 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-3.0.0/src/xenconfig/xen_common.c +Index: libvirt-3.1.0/src/xenconfig/xen_common.c =================================================================== ---- libvirt-3.0.0.orig/src/xenconfig/xen_common.c -+++ libvirt-3.0.0/src/xenconfig/xen_common.c +--- libvirt-3.1.0.orig/src/xenconfig/xen_common.c ++++ libvirt-3.1.0/src/xenconfig/xen_common.c @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); @@ -66,10 +66,10 @@ hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.bus = busID; -Index: libvirt-3.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.1.0/src/xenconfig/xen_sxpr.c @@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.702061207 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.702061207 +0100 @@ -7,10 +7,10 @@ etc.), but for now they are all lumped together in this single patch. -Index: libvirt-3.0.0/src/qemu/qemu.conf +Index: libvirt-3.1.0/src/qemu/qemu.conf =================================================================== ---- libvirt-3.0.0.orig/src/qemu/qemu.conf -+++ libvirt-3.0.0/src/qemu/qemu.conf +--- libvirt-3.1.0.orig/src/qemu/qemu.conf ++++ libvirt-3.1.0/src/qemu/qemu.conf @@ -283,11 +283,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.710060075 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.714059508 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-3.0.0/daemon/libvirtd.service.in +Index: libvirt-3.1.0/daemon/libvirtd.service.in =================================================================== ---- libvirt-3.0.0.orig/daemon/libvirtd.service.in -+++ libvirt-3.0.0/daemon/libvirtd.service.in -@@ -13,6 +13,7 @@ After=iscsid.service +--- libvirt-3.1.0.orig/daemon/libvirtd.service.in ++++ libvirt-3.1.0/daemon/libvirtd.service.in +@@ -14,6 +14,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target After=remote-fs.target ++++++ virt-create-rootfs.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.722058377 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.722058377 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/tools/Makefile.am +Index: libvirt-3.1.0/tools/Makefile.am =================================================================== ---- libvirt-3.0.0.orig/tools/Makefile.am -+++ libvirt-3.0.0/tools/Makefile.am +--- libvirt-3.1.0.orig/tools/Makefile.am ++++ libvirt-3.1.0/tools/Makefile.am @@ -43,6 +43,7 @@ PODFILES = \ virt-sanlock-cleanup.pod \ virt-xml-validate.pod \ @@ -28,10 +28,10 @@ virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \ -Index: libvirt-3.0.0/tools/virt-create-rootfs +Index: libvirt-3.1.0/tools/virt-create-rootfs =================================================================== --- /dev/null -+++ libvirt-3.0.0/tools/virt-create-rootfs ++++ libvirt-3.1.0/tools/virt-create-rootfs @@ -0,0 +1,214 @@ +#!/bin/sh +set -e @@ -247,10 +247,10 @@ + echo "pts/0" >> "$ROOT/etc/securetty" + chroot "$ROOT" /usr/bin/passwd +fi -Index: libvirt-3.0.0/tools/virt-create-rootfs.pod +Index: libvirt-3.1.0/tools/virt-create-rootfs.pod =================================================================== --- /dev/null -+++ libvirt-3.0.0/tools/virt-create-rootfs.pod ++++ libvirt-3.1.0/tools/virt-create-rootfs.pod @@ -0,0 +1,77 @@ +=head1 NAME + ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.734056679 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.734056679 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-3.0.0/src/locking/virtlockd.sysconf +Index: libvirt-3.1.0/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-3.0.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-3.0.0/src/locking/virtlockd.sysconf +--- libvirt-3.1.0.orig/src/locking/virtlockd.sysconf ++++ libvirt-3.1.0/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-3.0.0/src/locking/virtlockd.init.in +Index: libvirt-3.1.0/src/locking/virtlockd.init.in =================================================================== ---- libvirt-3.0.0.orig/src/locking/virtlockd.init.in -+++ libvirt-3.0.0/src/locking/virtlockd.init.in +--- libvirt-3.1.0.orig/src/locking/virtlockd.init.in ++++ libvirt-3.1.0/src/locking/virtlockd.init.in @@ -4,59 +4,57 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # ++++++ virtlogd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.746054981 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.746054981 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-3.0.0/src/logging/virtlogd.init.in +Index: libvirt-3.1.0/src/logging/virtlogd.init.in =================================================================== ---- libvirt-3.0.0.orig/src/logging/virtlogd.init.in -+++ libvirt-3.0.0/src/logging/virtlogd.init.in +--- libvirt-3.1.0.orig/src/logging/virtlogd.init.in ++++ libvirt-3.1.0/src/logging/virtlogd.init.in @@ -4,59 +4,56 @@ # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # @@ -126,10 +126,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-3.0.0/src/logging/virtlogd.sysconf +Index: libvirt-3.1.0/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-3.0.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-3.0.0/src/logging/virtlogd.sysconf +--- libvirt-3.1.0.orig/src/logging/virtlogd.sysconf ++++ libvirt-3.1.0/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.754053849 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.754053849 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-3.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.1.0/src/xenconfig/xen_sxpr.c @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.4zAIBD/_old 2017-03-11 15:17:55.762052717 +0100 +++ /var/tmp/diff_new_pack.4zAIBD/_new 2017-03-11 15:17:55.766052151 +0100 @@ -6,10 +6,10 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-3.0.0/src/xenconfig/xen_sxpr.c +Index: libvirt-3.1.0/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-3.0.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-3.0.0/src/xenconfig/xen_sxpr.c +--- libvirt-3.1.0.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-3.1.0/src/xenconfig/xen_sxpr.c @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */
