Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2016-03-07 13:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2016-01-28 17:25:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2016-03-07 13:28:28.000000000 +0100 @@ -1,0 +2,21 @@ +Thu Mar 3 18:40:08 UTC 2016 - jfeh...@suse.com + +- libxl: advertise system qemu instead of qemu-xen in caps + libxl-qemu-emulator-caps.patch + FATE#320638 + +------------------------------------------------------------------- +Tue Mar 1 16:07:08 UTC 2016 - jfeh...@suse.com + +- Update to libvirt 1.3.2 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + +------------------------------------------------------------------- +Thu Feb 18 16:49:00 UTC 2016 - jfeh...@suse.com + +- libxl: Add support for block-{dmmd,drbd,npiv} scripts + libxl-support-block-script.patch + bsc#954872 + +------------------------------------------------------------------- Old: ---- libvirt-1.3.1.tar.gz libvirt-1.3.1.tar.gz.asc New: ---- libvirt-1.3.2.tar.gz libvirt-1.3.2.tar.gz.asc libxl-qemu-emulator-caps.patch libxl-support-block-script.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -245,7 +245,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.3.1 +Version: 1.3.2 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -475,10 +475,12 @@ Patch206: support-managed-pci-xen-driver.patch Patch207: systemd-service-xen.patch Patch208: xen-sxpr-disk-type.patch -Patch209: apparmor-no-mount.patch -Patch210: qemu-apparmor-screenshot.patch -Patch211: libvirt-suse-netcontrol.patch -Patch212: lxc-wait-after-eth-del.patch +Patch209: libxl-support-block-script.patch +Patch210: apparmor-no-mount.patch +Patch211: qemu-apparmor-screenshot.patch +Patch212: libvirt-suse-netcontrol.patch +Patch213: lxc-wait-after-eth-del.patch +Patch214: libxl-qemu-emulator-caps.patch # SocketUser and SocketGroup settings were added to systemd.socket in # version 214. Patch the setting away in earlier systemd %if 0%{systemd_version} < 214 @@ -992,6 +994,8 @@ %patch210 -p1 %patch211 -p1 %patch212 -p1 +%patch213 -p1 +%patch214 -p1 %if 0%{systemd_version} < 214 %patch300 -p1 %endif ++++++ apparmor-fixes.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.2/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.1.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.1/examples/apparmor/libvirt-qemu +--- libvirt-1.3.2.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.2/examples/apparmor/libvirt-qemu @@ -143,6 +143,9 @@ # for restore /bin/bash rmix, ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/examples/apparmor/libvirt-lxc +Index: libvirt-1.3.2/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.3.1.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.3.1/examples/apparmor/libvirt-lxc +--- libvirt-1.3.2.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.3.2/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-1.3.1/src/qemu/qemu_driver.c +Index: libvirt-1.3.2/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.3.1.orig/src/qemu/qemu_driver.c -+++ libvirt-1.3.1/src/qemu/qemu_driver.c -@@ -16698,6 +16698,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- libvirt-1.3.2.orig/src/qemu/qemu_driver.c ++++ libvirt-1.3.2/src/qemu/qemu_driver.c +@@ -16595,6 +16595,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt _("non-file destination not supported yet")); goto endjob; } ++++++ libvirt-1.3.1.tar.gz -> libvirt-1.3.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.3.1.tar.gz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.3.2.tar.gz differ: char 15, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.3.1/tools/libvirt-guests.init.in +Index: libvirt-1.3.2/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.3.1.orig/tools/libvirt-guests.init.in -+++ libvirt-1.3.1/tools/libvirt-guests.init.in +--- libvirt-1.3.2.orig/tools/libvirt-guests.init.in ++++ libvirt-1.3.2/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-1.3.1/tools/libvirt-guests.sh.in +Index: libvirt-1.3.2/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.3.1.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.3.1/tools/libvirt-guests.sh.in +--- libvirt-1.3.2.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.3.2/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-1.3.1/tools/libvirt-guests.sysconf +Index: libvirt-1.3.2/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.3.1.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.3.1/tools/libvirt-guests.sysconf +--- libvirt-1.3.2.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.3.2/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/src/cpu/cpu_map.xml +Index: libvirt-1.3.2/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.3.1.orig/src/cpu/cpu_map.xml -+++ libvirt-1.3.1/src/cpu/cpu_map.xml +--- libvirt-1.3.2.orig/src/cpu/cpu_map.xml ++++ libvirt-1.3.2/src/cpu/cpu_map.xml @@ -1424,6 +1424,16 @@ <pvr value='0x004d0000' mask='0xffff0000'/> </model> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/configure.ac +Index: libvirt-1.3.2/configure.ac =================================================================== ---- libvirt-1.3.1.orig/configure.ac -+++ libvirt-1.3.1/configure.ac +--- libvirt-1.3.2.orig/configure.ac ++++ libvirt-1.3.2/configure.ac @@ -246,6 +246,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2507,11 +2508,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2449,11 +2450,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2890,6 +2892,7 @@ LIBVIRT_RESULT_FUSE +@@ -2832,6 +2834,7 @@ LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.3.1/src/Makefile.am +Index: libvirt-1.3.2/src/Makefile.am =================================================================== ---- libvirt-1.3.1.orig/src/Makefile.am -+++ libvirt-1.3.1/src/Makefile.am -@@ -923,6 +923,10 @@ if WITH_NETCF +--- libvirt-1.3.2.orig/src/Makefile.am ++++ libvirt-1.3.2/src/Makefile.am +@@ -928,6 +928,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif WITH_NETCF @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1548,6 +1552,10 @@ if WITH_NETCF +@@ -1553,6 +1557,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -60,10 +60,10 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.3.1/tools/virsh.c +Index: libvirt-1.3.2/tools/virsh.c =================================================================== ---- libvirt-1.3.1.orig/tools/virsh.c -+++ libvirt-1.3.1/tools/virsh.c +--- libvirt-1.3.2.orig/tools/virsh.c ++++ libvirt-1.3.2/tools/virsh.c @@ -589,6 +589,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) @@ -73,10 +73,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.3.1/src/interface/interface_backend_netcf.c +Index: libvirt-1.3.2/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.3.1.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.3.1/src/interface/interface_backend_netcf.c +--- libvirt-1.3.2.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.3.2/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -160,10 +160,10 @@ if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) return -1; if (virRegisterStateDriver(&interfaceStateDriver) < 0) -Index: libvirt-1.3.1/src/interface/interface_driver.c +Index: libvirt-1.3.2/src/interface/interface_driver.c =================================================================== ---- libvirt-1.3.1.orig/src/interface/interface_driver.c -+++ libvirt-1.3.1/src/interface/interface_driver.c +--- libvirt-1.3.2.orig/src/interface/interface_driver.c ++++ libvirt-1.3.2/src/interface/interface_driver.c @@ -30,8 +30,15 @@ interfaceRegister(void) if (netcfIfaceRegister() == 0) return 0; @@ -181,10 +181,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.3.1/m4/virt-netcontrol.m4 +Index: libvirt-1.3.2/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.3.1/m4/virt-netcontrol.m4 ++++ libvirt-1.3.2/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/daemon/libvirtd.conf +Index: libvirt-1.3.2/daemon/libvirtd.conf =================================================================== ---- libvirt-1.3.1.orig/daemon/libvirtd.conf -+++ libvirt-1.3.1/daemon/libvirtd.conf +--- libvirt-1.3.2.orig/daemon/libvirtd.conf ++++ libvirt-1.3.2/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,10 +13,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-1.3.1/daemon/libvirtd-config.c +Index: libvirt-1.3.2/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.3.1.orig/daemon/libvirtd-config.c -+++ libvirt-1.3.1/daemon/libvirtd-config.c +--- libvirt-1.3.2.orig/daemon/libvirtd-config.c ++++ libvirt-1.3.2/daemon/libvirtd-config.c @@ -242,7 +242,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-1.3.1/daemon/test_libvirtd.aug.in +Index: libvirt-1.3.2/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.3.1.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.3.1/daemon/test_libvirtd.aug.in +--- libvirt-1.3.2.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.3.2/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.3.1/daemon/libvirtd.sysconf +Index: libvirt-1.3.2/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.3.1.orig/daemon/libvirtd.sysconf -+++ libvirt-1.3.1/daemon/libvirtd.sysconf +--- libvirt-1.3.2.orig/daemon/libvirtd.sysconf ++++ libvirt-1.3.2/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libvirtd-systemd-socket.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:29.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:29.000000000 +0100 @@ -9,10 +9,10 @@ See bsc#933043 -Index: libvirt-1.3.1/daemon/libvirtd.socket.in +Index: libvirt-1.3.2/daemon/libvirtd.socket.in =================================================================== ---- libvirt-1.3.1.orig/daemon/libvirtd.socket.in -+++ libvirt-1.3.1/daemon/libvirtd.socket.in +--- libvirt-1.3.2.orig/daemon/libvirtd.socket.in ++++ libvirt-1.3.2/daemon/libvirtd.socket.in @@ -2,10 +2,8 @@ ListenStream=@runstatedir@/libvirt/libvirt-sock ListenStream=@runstatedir@/libvirt/libvirt-sock-ro ++++++ libxl-qemu-emulator-caps.patch ++++++ libxl: advertise system qemu instead of qemu-xen in caps Xen in SLE12 SP2, openSUSE Leap 42.2, and Tumbleweed will no longer provide qemu-xen (aka qemu-upstream). Instead, the qemu binary from the distro qemu package will be used. Change the libvirt capabilities to advertise /usr/bin/qemu-system-x86_64 as the default <emulator>, instead of the qemu-xen one. See FATE#320638 for details. Index: libvirt-1.3.2/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.3.2.orig/src/libxl/libxl_conf.c +++ libvirt-1.3.2/src/libxl/libxl_conf.c @@ -439,7 +439,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_EXECBIN_DIR "/qemu-system-i386", + BINDIR "/qemu-system-x86_64", (guest_archs[i].hvm ? LIBXL_FIRMWARE_DIR "/hvmloader" : NULL), ++++++ libxl-support-block-script.patch ++++++ libxl: set script field of libxl_device_disk Add a hack to the libvirt libxl driver to set libxl_device_disk->script when the disk configuration starts with some well-known Xen external block scripts: dmmd, drbd, and npiv. For more details, see bsc#954872 and FATE#319810 Index: libvirt-1.3.2/src/libxl/libxl_conf.c =================================================================== --- libvirt-1.3.2.orig/src/libxl/libxl_conf.c +++ libvirt-1.3.2/src/libxl/libxl_conf.c @@ -891,6 +891,25 @@ libxlDiskSetDiscard(libxl_device_disk *x } +static int +libxlDiskSetScript(libxl_device_disk *x_disk, const char *disk_spec) +{ + if (disk_spec == NULL) + return 0; + + if (STRPREFIX(disk_spec, "dmmd:")) { + if (VIR_STRDUP(x_disk->script, "block-dmmd") < 0) + return -1; + } else if (STRPREFIX(disk_spec, "drbd:")) { + if (VIR_STRDUP(x_disk->script, "block-drbd") < 0) + return -1; + } else if (STRPREFIX(disk_spec, "npiv:")) { + if (VIR_STRDUP(x_disk->script, "block-npiv") < 0) + return -1; + } + return 0; +} + #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" int @@ -1108,6 +1127,7 @@ libxlMakeNetworkDiskSrc(virStorageSource int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { + const char *src = virDomainDiskGetSource(l_disk); const char *driver; int format; int actual_type = virStorageSourceGetActualType(l_disk->src); @@ -1118,7 +1138,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { - if (VIR_STRDUP(x_disk->pdev_path, virDomainDiskGetSource(l_disk)) < 0) + if (VIR_STRDUP(x_disk->pdev_path, src) < 0) return -1; } @@ -1227,6 +1247,9 @@ 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; + if (libxlDiskSetScript(x_disk, src) < 0) + return -1; + /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY; ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-1.3.1/src/lxc/lxc_controller.c +Index: libvirt-1.3.2/src/lxc/lxc_controller.c =================================================================== ---- libvirt-1.3.1.orig/src/lxc/lxc_controller.c -+++ libvirt-1.3.1/src/lxc/lxc_controller.c +--- libvirt-1.3.2.orig/src/lxc/lxc_controller.c ++++ libvirt-1.3.2/src/lxc/lxc_controller.c @@ -2002,6 +2002,7 @@ static int virLXCControllerDeleteInterfa if (virNetDevVethDelete(ctrl->veths[i]) < 0) ret = -1; @@ -25,11 +25,11 @@ return ret; } -Index: libvirt-1.3.1/src/lxc/lxc_driver.c +Index: libvirt-1.3.2/src/lxc/lxc_driver.c =================================================================== ---- libvirt-1.3.1.orig/src/lxc/lxc_driver.c -+++ libvirt-1.3.1/src/lxc/lxc_driver.c -@@ -4257,6 +4257,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +--- libvirt-1.3.2.orig/src/lxc/lxc_driver.c ++++ libvirt-1.3.2/src/lxc/lxc_driver.c +@@ -4261,6 +4261,7 @@ lxcDomainAttachDeviceNetLive(virConnectP case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: ignore_value(virNetDevVethDelete(veth)); @@ -37,7 +37,7 @@ break; case VIR_DOMAIN_NET_TYPE_DIRECT: -@@ -4684,6 +4685,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4689,6 +4690,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; } @@ -45,10 +45,10 @@ break; /* It'd be nice to support this, but with macvlan -Index: libvirt-1.3.1/src/lxc/lxc_process.c +Index: libvirt-1.3.2/src/lxc/lxc_process.c =================================================================== ---- libvirt-1.3.1.orig/src/lxc/lxc_process.c -+++ libvirt-1.3.1/src/lxc/lxc_process.c +--- libvirt-1.3.2.orig/src/lxc/lxc_process.c ++++ libvirt-1.3.2/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.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-1.3.1/src/util/virarch.c +Index: libvirt-1.3.2/src/util/virarch.c =================================================================== ---- libvirt-1.3.1.orig/src/util/virarch.c -+++ libvirt-1.3.1/src/util/virarch.c +--- libvirt-1.3.2.orig/src/util/virarch.c ++++ libvirt-1.3.2/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.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.2/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.1.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.1/examples/apparmor/libvirt-qemu +--- libvirt-1.3.2.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.2/examples/apparmor/libvirt-qemu @@ -152,6 +152,9 @@ /sys/bus/ r, /sys/class/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.3.1/src/xenconfig/xen_common.c +Index: libvirt-1.3.2/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.3.1.orig/src/xenconfig/xen_common.c -+++ libvirt-1.3.1/src/xenconfig/xen_common.c -@@ -393,6 +393,8 @@ xenParsePCI(virConfPtr conf, virDomainDe +--- libvirt-1.3.2.orig/src/xenconfig/xen_common.c ++++ libvirt-1.3.2/src/xenconfig/xen_common.c +@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe { virConfValuePtr list = virConfGetValue(conf, "pci"); virDomainHostdevDefPtr hostdev = NULL; @@ -21,7 +21,7 @@ if (list && list->type == VIR_CONF_LIST) { list = list->list; -@@ -414,6 +416,11 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -415,6 +417,11 @@ xenParsePCI(virConfPtr conf, virDomainDe /* pci=['0000:00:1b.0','0000:00:13.0'] */ if (!(key = list->str)) goto skippci; @@ -33,7 +33,7 @@ if (!(nextkey = strchr(key, ':'))) goto skippci; if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) == NULL) { -@@ -457,10 +464,31 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -458,10 +465,31 @@ xenParsePCI(virConfPtr conf, virDomainDe goto skippci; if (virStrToLong_i(func, NULL, 16, &funcID) < 0) goto skippci; @@ -66,11 +66,11 @@ 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-1.3.1/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.2/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.1.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.1/src/xenconfig/xen_sxpr.c -@@ -1060,6 +1060,7 @@ xenParseSxprPCI(virDomainDefPtr def, +--- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.2/src/xenconfig/xen_sxpr.c +@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; int funcID; @@ -78,7 +78,7 @@ node = cur->u.s.car; if (!sexpr_lookup(node, "dev")) -@@ -1107,11 +1108,13 @@ xenParseSxprPCI(virDomainDefPtr def, +@@ -1109,11 +1110,13 @@ xenParseSxprPCI(virDomainDefPtr def, goto error; } @@ -93,7 +93,7 @@ dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -1976,11 +1979,15 @@ static void +@@ -1978,11 +1981,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -110,7 +110,7 @@ } -@@ -1999,12 +2006,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2001,12 +2008,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -123,7 +123,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2059,12 +2060,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2061,12 +2062,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/src/qemu/qemu.conf +Index: libvirt-1.3.2/src/qemu/qemu.conf =================================================================== ---- libvirt-1.3.1.orig/src/qemu/qemu.conf -+++ libvirt-1.3.1/src/qemu/qemu.conf +--- libvirt-1.3.2.orig/src/qemu/qemu.conf ++++ libvirt-1.3.2/src/qemu/qemu.conf @@ -201,11 +201,20 @@ # isolation, but it cannot appear in a list of drivers. # ++++++ systemd-service-xen.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.1/daemon/libvirtd.service.in +Index: libvirt-1.3.2/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.3.1.orig/daemon/libvirtd.service.in -+++ libvirt-1.3.1/daemon/libvirtd.service.in +--- libvirt-1.3.2.orig/daemon/libvirtd.service.in ++++ libvirt-1.3.2/daemon/libvirtd.service.in @@ -7,6 +7,7 @@ After=iscsid.service After=apparmor.service After=local-fs.target ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.3.1/src/locking/virtlockd.sysconf +Index: libvirt-1.3.2/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.3.1.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.3.1/src/locking/virtlockd.sysconf +--- libvirt-1.3.2.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.3.2/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-1.3.1/src/locking/virtlockd.init.in +Index: libvirt-1.3.2/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.3.1.orig/src/locking/virtlockd.init.in -+++ libvirt-1.3.1/src/locking/virtlockd.init.in +--- libvirt-1.3.2.orig/src/locking/virtlockd.init.in ++++ libvirt-1.3.2/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.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,9 +1,9 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-1.3.1/src/logging/virtlogd.init.in +Index: libvirt-1.3.2/src/logging/virtlogd.init.in =================================================================== ---- libvirt-1.3.1.orig/src/logging/virtlogd.init.in -+++ libvirt-1.3.1/src/logging/virtlogd.init.in +--- libvirt-1.3.2.orig/src/logging/virtlogd.init.in ++++ libvirt-1.3.2/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-1.3.1/src/logging/virtlogd.sysconf +Index: libvirt-1.3.2/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-1.3.1.orig/src/logging/virtlogd.sysconf -+++ libvirt-1.3.1/src/logging/virtlogd.sysconf +--- libvirt-1.3.2.orig/src/logging/virtlogd.sysconf ++++ libvirt-1.3.2/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-1.3.1/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.2/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.1.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.1/src/xenconfig/xen_sxpr.c -@@ -390,7 +390,7 @@ xenParseSxprVifRate(const char *rate, un +--- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.2/src/xenconfig/xen_sxpr.c +@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un static int xenParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, @@ -11,7 +11,7 @@ { const struct sexpr *cur, *node; virDomainDiskDefPtr disk = NULL; -@@ -440,7 +440,6 @@ xenParseSxprDisks(virDomainDefPtr def, +@@ -442,7 +442,6 @@ xenParseSxprDisks(virDomainDefPtr def, /* There is a case without the uname to the CD-ROM device */ offset = strchr(dst, ':'); if (!offset || ++++++ xen-sxpr-disk-type.patch ++++++ --- /var/tmp/diff_new_pack.N8AAKq/_old 2016-03-07 13:28:30.000000000 +0100 +++ /var/tmp/diff_new_pack.N8AAKq/_new 2016-03-07 13:28:30.000000000 +0100 @@ -6,11 +6,11 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-1.3.1/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.2/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.1.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.1/src/xenconfig/xen_sxpr.c -@@ -504,10 +504,11 @@ xenParseSxprDisks(virDomainDefPtr def, +--- libvirt-1.3.2.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.3.2/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 */ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
