Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2016-01-28 17:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01 19:50:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2016-01-28 17:25:52.000000000 +0100 @@ -1,0 +2,18 @@ +Sat Jan 23 01:19:22 UTC 2016 - [email protected] + +- qemu: set /usr/share/qemu/ovmf-x86_64-ms-{code,vars}.bin as + default UEFI firmwares for x86_64 + bsc#961853 + +------------------------------------------------------------------- +Mon Jan 18 18:30:52 UTC 2016 - [email protected] + +- Update to libvirt 1.3.1 + - CVE-2015-5313 + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Dropped patches: 034e47c3-CVE-2015-5313.patch, + ace1ee22-qemuxml2argv-test.patch, add-with-login-shell.patch, + virt-aa-helper-rw-mounts.patch + +------------------------------------------------------------------- Old: ---- 034e47c3-CVE-2015-5313.patch ace1ee22-qemuxml2argv-test.patch add-with-login-shell.patch libvirt-1.3.0.tar.gz libvirt-1.3.0.tar.gz.asc virt-aa-helper-rw-mounts.patch New: ---- libvirt-1.3.1.tar.gz libvirt-1.3.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libvirt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -215,6 +215,11 @@ %endif %endif +# Advertise OVMF for >= 13.1 +%if 0%{?suse_version} >= 1310 + %define with_loader_nvram --with-loader-nvram="/usr/share/qemu/ovmf-x86_64-ms-code.bin:/usr/share/qemu/ovmf-x86_64-ms-vars.bin" +%endif + %if %{with_macvtap} %define with_libnl 1 %endif @@ -240,7 +245,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 1.3.0 +Version: 1.3.1 Release: 0 Summary: Library providing a simple virtualization API License: LGPL-2.1+ @@ -453,11 +458,7 @@ Source4: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 034e47c3-CVE-2015-5313.patch -Patch1: ace1ee22-qemuxml2argv-test.patch # Patches pending upstream review -Patch100: add-with-login-shell.patch -Patch101: virt-aa-helper-rw-mounts.patch # Need to go upstream Patch150: xen-pv-cdrom.patch Patch151: blockcopy-check-dst-identical-device.patch @@ -973,10 +974,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch100 -p1 -%patch101 -p1 %patch150 -p1 %patch151 -p1 %patch152 -p1 @@ -1204,6 +1201,7 @@ --libexecdir=%{_libdir}/%{name} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ + %{?with_loader_nvram} \ --without-login-shell \ %{init_scripts} \ ac_cv_path_MODPROBE=/sbin/modprobe \ @@ -1214,10 +1212,7 @@ %install %makeinstall SYSTEMD_UNIT_DIR=%{_unitdir} DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap domtop rename -do - (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -done +make -C examples distclean cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %if %{with_wireshark} ++++++ apparmor-fixes.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.1/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.0/examples/apparmor/libvirt-qemu +--- libvirt-1.3.1.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.1/examples/apparmor/libvirt-qemu @@ -143,6 +143,9 @@ # for restore /bin/bash rmix, ++++++ apparmor-no-mount.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/examples/apparmor/libvirt-lxc +Index: libvirt-1.3.1/examples/apparmor/libvirt-lxc =================================================================== ---- libvirt-1.3.0.orig/examples/apparmor/libvirt-lxc -+++ libvirt-1.3.0/examples/apparmor/libvirt-lxc +--- libvirt-1.3.1.orig/examples/apparmor/libvirt-lxc ++++ libvirt-1.3.1/examples/apparmor/libvirt-lxc @@ -2,39 +2,15 @@ #include <abstractions/base> ++++++ blockcopy-check-dst-identical-device.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -11,11 +11,11 @@ src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: libvirt-1.3.0/src/qemu/qemu_driver.c +Index: libvirt-1.3.1/src/qemu/qemu_driver.c =================================================================== ---- libvirt-1.3.0.orig/src/qemu/qemu_driver.c -+++ libvirt-1.3.0/src/qemu/qemu_driver.c -@@ -16728,6 +16728,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt +--- 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 _("non-file destination not supported yet")); goto endjob; } ++++++ libvirt-1.3.0.tar.gz -> libvirt-1.3.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.3.0.tar.gz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.3.1.tar.gz differ: char 13, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,23 +1,25 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.3.0/tools/libvirt-guests.init.in +Index: libvirt-1.3.1/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.3.0.orig/tools/libvirt-guests.init.in -+++ libvirt-1.3.0/tools/libvirt-guests.init.in -@@ -3,15 +3,15 @@ - # the following is the LSB init header +--- libvirt-1.3.1.orig/tools/libvirt-guests.init.in ++++ libvirt-1.3.1/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 # ### BEGIN INIT INFO -# Provides: libvirt-guests +-# Default-Start: 3 4 5 +-# Default-Stop: 0 1 2 6 -# Required-Start: libvirtd -# Required-Stop: libvirtd --# Default-Start: 2 3 4 5 --# Default-Stop: 0 1 6 +# Provides: libvirt-guests +# Required-Start: $network $remote_fs libvirtd +# Required-Stop: $network $remote_fs libvirtd +# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 + # Should-Start: + # Should-Stop: # Short-Description: suspend/resume libvirt guests on shutdown/boot -# Description: This is a script for suspending active libvirt guests -# on shutdown and resuming them on next boot @@ -28,10 +30,25 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.3.0/tools/libvirt-guests.sh.in + # +-# libvirt-guests: suspend/resume libvirt guests on shutdown/boot ++# libvirt-guests: suspend/resume libvirt guests on shutdown/boot + # +-# chkconfig: 345 99 01 +-# description: This is a script for suspending active libvirt guests \ +-# on shutdown and resuming them on next boot \ +-# See http://libvirt.org ++# chkconfig: 345 99 01 ++# description: This is a script for suspending active libvirt guests \ ++# on shutdown and resuming them on next boot \ ++# See http://libvirt.org + # + + exec @libexecdir@/libvirt-guests.sh "$@" +Index: libvirt-1.3.1/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.3.0.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.3.0/tools/libvirt-guests.sh.in +--- libvirt-1.3.1.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.3.1/tools/libvirt-guests.sh.in @@ -16,14 +16,13 @@ # License along with this library. If not, see # <http://www.gnu.org/licenses/>. @@ -191,10 +208,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.0/tools/libvirt-guests.sysconf +Index: libvirt-1.3.1/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.3.0.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.3.0/tools/libvirt-guests.sysconf +--- libvirt-1.3.1.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.3.1/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-power8-models.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/src/cpu/cpu_map.xml +Index: libvirt-1.3.1/src/cpu/cpu_map.xml =================================================================== ---- libvirt-1.3.0.orig/src/cpu/cpu_map.xml -+++ libvirt-1.3.0/src/cpu/cpu_map.xml +--- libvirt-1.3.1.orig/src/cpu/cpu_map.xml ++++ libvirt-1.3.1/src/cpu/cpu_map.xml @@ -1424,6 +1424,16 @@ <pvr value='0x004d0000' mask='0xffff0000'/> </model> ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-1.3.0/configure.ac +Index: libvirt-1.3.1/configure.ac =================================================================== ---- libvirt-1.3.0.orig/configure.ac -+++ libvirt-1.3.0/configure.ac -@@ -242,6 +242,7 @@ LIBVIRT_CHECK_FUSE +--- libvirt-1.3.1.orig/configure.ac ++++ libvirt-1.3.1/configure.ac +@@ -246,6 +246,7 @@ LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_HAL LIBVIRT_CHECK_NETCF @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2495,11 +2496,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2507,11 +2508,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2893,6 +2895,7 @@ LIBVIRT_RESULT_FUSE +@@ -2890,6 +2892,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.0/src/Makefile.am +Index: libvirt-1.3.1/src/Makefile.am =================================================================== ---- libvirt-1.3.0.orig/src/Makefile.am -+++ libvirt-1.3.0/src/Makefile.am -@@ -922,6 +922,10 @@ if WITH_NETCF +--- libvirt-1.3.1.orig/src/Makefile.am ++++ libvirt-1.3.1/src/Makefile.am +@@ -923,6 +923,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 -@@ -1547,6 +1551,10 @@ if WITH_NETCF +@@ -1548,6 +1552,10 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) endif WITH_NETCF @@ -60,11 +60,11 @@ if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) -Index: libvirt-1.3.0/tools/virsh.c +Index: libvirt-1.3.1/tools/virsh.c =================================================================== ---- libvirt-1.3.0.orig/tools/virsh.c -+++ libvirt-1.3.0/tools/virsh.c -@@ -588,6 +588,8 @@ virshShowVersion(vshControl *ctl ATTRIBU +--- libvirt-1.3.1.orig/tools/virsh.c ++++ libvirt-1.3.1/tools/virsh.c +@@ -589,6 +589,8 @@ virshShowVersion(vshControl *ctl ATTRIBU vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -73,10 +73,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.3.0/src/interface/interface_backend_netcf.c +Index: libvirt-1.3.1/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.3.0.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.3.0/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 @@ -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.0/src/interface/interface_driver.c +Index: libvirt-1.3.1/src/interface/interface_driver.c =================================================================== ---- libvirt-1.3.0.orig/src/interface/interface_driver.c -+++ libvirt-1.3.0/src/interface/interface_driver.c +--- libvirt-1.3.1.orig/src/interface/interface_driver.c ++++ libvirt-1.3.1/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.0/m4/virt-netcontrol.m4 +Index: libvirt-1.3.1/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.3.0/m4/virt-netcontrol.m4 ++++ libvirt-1.3.1/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/daemon/libvirtd.conf +Index: libvirt-1.3.1/daemon/libvirtd.conf =================================================================== ---- libvirt-1.3.0.orig/daemon/libvirtd.conf -+++ libvirt-1.3.0/daemon/libvirtd.conf +--- libvirt-1.3.1.orig/daemon/libvirtd.conf ++++ libvirt-1.3.1/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.0/daemon/libvirtd-config.c +Index: libvirt-1.3.1/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.3.0.orig/daemon/libvirtd-config.c -+++ libvirt-1.3.0/daemon/libvirtd-config.c +--- libvirt-1.3.1.orig/daemon/libvirtd-config.c ++++ libvirt-1.3.1/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.0/daemon/test_libvirtd.aug.in +Index: libvirt-1.3.1/daemon/test_libvirtd.aug.in =================================================================== ---- libvirt-1.3.0.orig/daemon/test_libvirtd.aug.in -+++ libvirt-1.3.0/daemon/test_libvirtd.aug.in +--- libvirt-1.3.1.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.3.1/daemon/test_libvirtd.aug.in @@ -2,7 +2,7 @@ module Test_libvirtd = ::CONFIG:: ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.3.0/daemon/libvirtd.sysconf +Index: libvirt-1.3.1/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.3.0.orig/daemon/libvirtd.sysconf -+++ libvirt-1.3.0/daemon/libvirtd.sysconf +--- libvirt-1.3.1.orig/daemon/libvirtd.sysconf ++++ libvirt-1.3.1/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libvirtd-systemd-socket.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -9,10 +9,10 @@ See bsc#933043 -Index: libvirt-1.3.0/daemon/libvirtd.socket.in +Index: libvirt-1.3.1/daemon/libvirtd.socket.in =================================================================== ---- libvirt-1.3.0.orig/daemon/libvirtd.socket.in -+++ libvirt-1.3.0/daemon/libvirtd.socket.in +--- libvirt-1.3.1.orig/daemon/libvirtd.socket.in ++++ libvirt-1.3.1/daemon/libvirtd.socket.in @@ -2,10 +2,8 @@ ListenStream=@runstatedir@/libvirt/libvirt-sock ListenStream=@runstatedir@/libvirt/libvirt-sock-ro ++++++ lxc-wait-after-eth-del.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -13,10 +13,10 @@ src/lxc/lxc_process.c | 1 + 3 files changed, 4 insertions(+) -Index: libvirt-1.3.0/src/lxc/lxc_controller.c +Index: libvirt-1.3.1/src/lxc/lxc_controller.c =================================================================== ---- libvirt-1.3.0.orig/src/lxc/lxc_controller.c -+++ libvirt-1.3.0/src/lxc/lxc_controller.c +--- libvirt-1.3.1.orig/src/lxc/lxc_controller.c ++++ libvirt-1.3.1/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.0/src/lxc/lxc_driver.c +Index: libvirt-1.3.1/src/lxc/lxc_driver.c =================================================================== ---- libvirt-1.3.0.orig/src/lxc/lxc_driver.c -+++ libvirt-1.3.0/src/lxc/lxc_driver.c -@@ -4254,6 +4254,7 @@ lxcDomainAttachDeviceNetLive(virConnectP +--- 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 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: -@@ -4681,6 +4682,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb +@@ -4684,6 +4685,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.0/src/lxc/lxc_process.c +Index: libvirt-1.3.1/src/lxc/lxc_process.c =================================================================== ---- libvirt-1.3.0.orig/src/lxc/lxc_process.c -+++ libvirt-1.3.0/src/lxc/lxc_process.c +--- libvirt-1.3.1.orig/src/lxc/lxc_process.c ++++ libvirt-1.3.1/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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-1.3.0/src/util/virarch.c +Index: libvirt-1.3.1/src/util/virarch.c =================================================================== ---- libvirt-1.3.0.orig/src/util/virarch.c -+++ libvirt-1.3.0/src/util/virarch.c +--- libvirt-1.3.1.orig/src/util/virarch.c ++++ libvirt-1.3.1/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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/examples/apparmor/libvirt-qemu +Index: libvirt-1.3.1/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.3.0.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.3.0/examples/apparmor/libvirt-qemu +--- libvirt-1.3.1.orig/examples/apparmor/libvirt-qemu ++++ libvirt-1.3.1/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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.3.0/src/xenconfig/xen_common.c +Index: libvirt-1.3.1/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.3.0.orig/src/xenconfig/xen_common.c -+++ libvirt-1.3.0/src/xenconfig/xen_common.c -@@ -403,6 +403,8 @@ xenParsePCI(virConfPtr conf, virDomainDe +--- 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 { virConfValuePtr list = virConfGetValue(conf, "pci"); virDomainHostdevDefPtr hostdev = NULL; @@ -21,7 +21,7 @@ if (list && list->type == VIR_CONF_LIST) { list = list->list; -@@ -424,6 +426,11 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -414,6 +416,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) { -@@ -467,10 +474,31 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -457,10 +464,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.0/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.1/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.0/src/xenconfig/xen_sxpr.c -@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, +--- 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, int busID; int slotID; int funcID; @@ -78,7 +78,7 @@ node = cur->u.s.car; if (!sexpr_lookup(node, "dev")) -@@ -1046,11 +1047,13 @@ xenParseSxprPCI(virDomainDefPtr def, +@@ -1107,11 +1108,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; -@@ -2013,11 +2016,15 @@ static void +@@ -1976,11 +1979,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -110,7 +110,7 @@ } -@@ -2036,12 +2043,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -1999,12 +2006,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -123,7 +123,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2096,12 +2097,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2059,12 +2060,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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/src/qemu/qemu.conf +Index: libvirt-1.3.1/src/qemu/qemu.conf =================================================================== ---- libvirt-1.3.0.orig/src/qemu/qemu.conf -+++ libvirt-1.3.0/src/qemu/qemu.conf +--- libvirt-1.3.1.orig/src/qemu/qemu.conf ++++ libvirt-1.3.1/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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-1.3.0/daemon/libvirtd.service.in +Index: libvirt-1.3.1/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.3.0.orig/daemon/libvirtd.service.in -+++ libvirt-1.3.0/daemon/libvirtd.service.in +--- libvirt-1.3.1.orig/daemon/libvirtd.service.in ++++ libvirt-1.3.1/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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.3.0/src/locking/virtlockd.sysconf +Index: libvirt-1.3.1/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.3.0.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.3.0/src/locking/virtlockd.sysconf +--- libvirt-1.3.1.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.3.1/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,22 +12,28 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.3.0/src/locking/virtlockd.init.in +Index: libvirt-1.3.1/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.3.0.orig/src/locking/virtlockd.init.in -+++ libvirt-1.3.0/src/locking/virtlockd.init.in -@@ -4,12 +4,14 @@ - # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV +--- libvirt-1.3.1.orig/src/locking/virtlockd.init.in ++++ libvirt-1.3.1/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 # ### BEGIN INIT INFO -# Provides: virtlockd --# Default-Start: --# Default-Stop: 0 1 2 3 4 5 6 +-# Default-Start: 3 4 5 +-# Default-Stop: 0 1 2 6 +-# Required-Start: +-# Required-Stop: +-# Should-Start: $network $remote_fs +-# Should-Stop: $network $remote_fs +# Provides: virtlockd +# Required-Start: $network $remote_fs -+# Default-Start: 3 5 +# Required-Stop: $network $remote_fs ++# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 ++# Should-Start: ++# Should-Stop: # Short-Description: virtual machine lock manager -# Description: This is a daemon for managing locks -# on virtual machine disk images @@ -36,8 +42,21 @@ ### END INIT INFO # the following is chkconfig init header -@@ -24,35 +26,33 @@ - # pidfile: @localstatedir@/run/virtlockd.pid + # +-# virtlockd: virtual machine lock manager ++# virtlockd: virtual machine lock manager + # +-# chkconfig: 345 96 04 +-# description: This is a daemon for managing locks \ +-# on virtual machine disk images ++# chkconfig: 345 96 04 ++# description: This is a daemon for managing locks \ ++# on virtual machine disk images + # +-# processname: virtlockd +-# pidfile: @localstatedir@/run/virtlockd.pid ++# processname: virtlockd ++# pidfile: @localstatedir@/run/virtlockd.pid # -# Source function library. @@ -84,7 +103,7 @@ rm -f $PIDFILE fi } -@@ -66,9 +66,7 @@ reload() { +@@ -70,9 +68,7 @@ reload() { echo -n $"Reloading $SERVICE configuration: " killproc -p $PIDFILE $PROCESS -USR1 @@ -95,7 +114,7 @@ } # See how we were called. -@@ -77,18 +75,20 @@ case "$1" in +@@ -81,18 +77,20 @@ case "$1" in $1 ;; status) ++++++ virtlogd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,21 +1,27 @@ Adjust virtlogd init files to conform to SUSE standards -Index: libvirt-1.3.0/src/logging/virtlogd.init.in +Index: libvirt-1.3.1/src/logging/virtlogd.init.in =================================================================== ---- libvirt-1.3.0.orig/src/logging/virtlogd.init.in -+++ libvirt-1.3.0/src/logging/virtlogd.init.in -@@ -4,12 +4,14 @@ - # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV +--- libvirt-1.3.1.orig/src/logging/virtlogd.init.in ++++ libvirt-1.3.1/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 # ### BEGIN INIT INFO -# Provides: virtlogd --# Default-Start: --# Default-Stop: 0 1 2 3 4 5 6 +-# Default-Start: 3 4 5 +-# Default-Stop: 0 1 2 6 +-# Required-Start: +-# Required-Stop: +-# Should-Start: $network $remote_fs +-# Should-Stop: $network $remote_fs +# Provides: virtlogd +# Required-Start: $network $remote_fs -+# Default-Start: 3 5 +# Required-Stop: $network $remote_fs ++# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 ++# Should-Start ++# Should-Stop: # Short-Description: virtual machine log manager -# Description: This is a daemon for managing logs -# of virtual machine consoles @@ -24,8 +30,21 @@ ### END INIT INFO # the following is chkconfig init header -@@ -24,35 +26,32 @@ - # pidfile: @localstatedir@/run/virtlogd.pid + # +-# virtlogd: virtual machine log manager ++# virtlogd: virtual machine log manager + # +-# chkconfig: 345 96 04 +-# description: This is a daemon for managing logs \ +-# of virtual machine consoles ++# chkconfig: 345 96 04 ++# description: This is a daemon for managing logs \ ++# of virtual machine consoles + # +-# processname: virtlogd +-# pidfile: @localstatedir@/run/virtlogd.pid ++# processname: virtlogd ++# pidfile: @localstatedir@/run/virtlogd.pid # -# Source function library. @@ -49,7 +68,7 @@ - daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $VIRTLOGD_ARGS - RETVAL=$? - echo -- [ $RETVAL -eq 0 ] && touch @localstatedir@/log/subsys/$SERVICE +- [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE + echo -n $"Starting $SERVICE " + test -d $PIDDIR || mkdir -p $PIDDIR + startproc -p $PIDFILE $PROCESS --pid-file $PIDFILE --daemon $VIRTLOGD_ARGS @@ -66,11 +85,11 @@ - echo + rc_status -v if [ $RETVAL -eq 0 ]; then -- rm -f @localstatedir@/log/subsys/$SERVICE +- rm -f @localstatedir@/lock/subsys/$SERVICE rm -f $PIDFILE fi } -@@ -66,9 +65,7 @@ reload() { +@@ -70,9 +67,7 @@ reload() { echo -n $"Reloading $SERVICE configuration: " killproc -p $PIDFILE $PROCESS -USR1 @@ -81,7 +100,7 @@ } # See how we were called. -@@ -77,18 +74,20 @@ case "$1" in +@@ -81,18 +76,20 @@ case "$1" in $1 ;; status) @@ -95,7 +114,7 @@ reload ;; condrestart|try-restart) -- [ -f @localstatedir@/log/subsys/$SERVICE ] && restart || : +- [ -f @localstatedir@/lock/subsys/$SERVICE ] && restart || : + $0 status >/dev/null && restart || : ;; *) @@ -107,10 +126,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-1.3.0/src/logging/virtlogd.sysconf +Index: libvirt-1.3.1/src/logging/virtlogd.sysconf =================================================================== ---- libvirt-1.3.0.orig/src/logging/virtlogd.sysconf -+++ libvirt-1.3.0/src/logging/virtlogd.sysconf +--- libvirt-1.3.1.orig/src/logging/virtlogd.sysconf ++++ libvirt-1.3.1/src/logging/virtlogd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlogd + ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -1,17 +1,17 @@ -Index: libvirt-1.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.1/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.0/src/xenconfig/xen_sxpr.c -@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, +--- 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 static int xenParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, -- int hvm, -+ int hvm ATTRIBUTE_UNUSED, - int xendConfigVersion) +- int hvm) ++ int hvm ATTRIBUTE_UNUSED) { const struct sexpr *cur, *node; -@@ -385,7 +385,6 @@ xenParseSxprDisks(virDomainDefPtr def, + virDomainDiskDefPtr disk = NULL; +@@ -440,7 +440,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.iADqka/_old 2016-01-28 17:25:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iADqka/_new 2016-01-28 17:25:54.000000000 +0100 @@ -6,11 +6,11 @@ https://bugzilla.suse.com/show_bug.cgi?id=938228 -Index: libvirt-1.3.0/src/xenconfig/xen_sxpr.c +Index: libvirt-1.3.1/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.3.0.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.3.0/src/xenconfig/xen_sxpr.c -@@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def, +--- 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, omnipotent, we can revisit this, perhaps stat()'ing the src file in question */ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
