Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-11-05 11:35:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-10-20 00:05:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-11-05 11:36:04.000000000 +0100
@@ -1,0 +2,22 @@
+Wed Nov 4 20:05:21 UTC 2015 - normand@linux.vnet.ibm.com
+
+- Detect path of qemu-bridge-helper during %configure
+ - add qemu-tools as BuildRequires for suse_version > 1130
+ - add upstream patch 703ec1b7-qemu-bridge-helper-fix.patch
+
+-------------------------------------------------------------------
+Wed Nov 4 14:52:41 UTC 2015 - jfehlig@suse.com
+
+- Update to libvirt 1.2.21
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Dropped patches:
+ disable-virCgroupGetPercpuStats-test.patch
+
+-------------------------------------------------------------------
+Mon Nov 2 21:14:10 UTC 2015 - jfehlig@suse.com
+
+- spec: some minor wireshark fixups. Essentially a backport of
+ commit 7c8250d7.
+
+-------------------------------------------------------------------
Old:
----
disable-virCgroupGetPercpuStats-test.patch
libvirt-1.2.20.tar.gz
libvirt-1.2.20.tar.gz.asc
New:
----
703ec1b7-qemu-bridge-helper-fix.patch
libvirt-1.2.21.tar.gz
libvirt-1.2.21.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libvirt
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -240,7 +240,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.2.20
+Version: 1.2.21
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -436,6 +436,13 @@
%if %{with_wireshark}
BuildRequires: wireshark-devel
%endif
+%if %{with_qemu}
+ %if 0%{?suse_version} > 1130
+# BuildRequire qemu-tools so configure can detect qemu-bridge-helper
+# path. Ignore SLE11, which predates the qemu-tools package.
+BuildRequires: qemu-tools
+ %endif
+%endif
%global systemd_version %(pkg-config --modversion systemd)
@@ -446,6 +453,7 @@
Source4: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
+Patch0: 703ec1b7-qemu-bridge-helper-fix.patch
# Patches pending upstream review
# Need to go upstream
Patch150: xen-pv-cdrom.patch
@@ -462,11 +470,9 @@
Patch205: support-managed-pci-xen-driver.patch
Patch206: systemd-service-xen.patch
Patch207: xen-sxpr-disk-type.patch
-# Disable failing virCgroupGetPercpuStats unit test
-Patch208: disable-virCgroupGetPercpuStats-test.patch
-Patch209: apparmor-no-mount.patch
-Patch210: qemu-apparmor-screenshot.patch
-Patch211: libvirt-suse-netcontrol.patch
+Patch208: apparmor-no-mount.patch
+Patch209: qemu-apparmor-screenshot.patch
+Patch210: libvirt-suse-netcontrol.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
@@ -964,16 +970,18 @@
%if %{with_wireshark}
%package -n wireshark-plugin-libvirt
-Summary: Wireshark plugin for Libvirt RPC protocol
+Summary: Wireshark plugin for libvirt RPC protocol
Group: Productivity/Networking/Diagnostic
+Requires: %{name}-client = %{version}-%{release}
Requires: wireshark
%description -n wireshark-plugin-libvirt
-Provides a dissector for the libvirt RPC protocol to help debugging it.
+Wireshark dissector plugin for better analysis of libvirt RPC traffic.
%endif
%prep
%setup -q
+%patch0 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
@@ -990,7 +998,6 @@
%patch208 -p1
%patch209 -p1
%patch210 -p1
-%patch211 -p1
%if 0%{systemd_version} < 214
%patch300 -p1
%endif
@@ -1217,6 +1224,8 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%if %{with_wireshark}
rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
+mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
+ $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so
%endif
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la
@@ -1892,7 +1901,7 @@
%files -n wireshark-plugin-libvirt
%defattr(-, root, root)
-%{_libdir}/wireshark/plugins/*/libvirt.so
+%{_libdir}/wireshark/plugins/libvirt.so
%endif
%changelog
++++++ 703ec1b7-qemu-bridge-helper-fix.patch ++++++
commit 703ec1b73da3560374cba65017d9eaf58f92c695
Author: Michel Normand
Date: Wed Nov 4 10:01:24 2015 +0100
qemu: add /usr/lib to AC_PATH_PROG for qemu-bridge-helper
For openSUSE the qemu-bridge-helper is installed in /usr/lib
So libvirt has to search it in this directory.
Signed-off-by: Michel Normand
diff --git a/configure.ac b/configure.ac
index f01bb40..f481c50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2520,7 +2520,7 @@ AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
- [/usr/libexec:/usr/lib/qemu])
+ [/usr/libexec:/usr/lib/qemu:/usr/lib])
AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])
AC_ARG_WITH([macvtap],
++++++ apparmor-fixes.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.21/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.20/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.21/examples/apparmor/libvirt-qemu
@@ -124,6 +124,9 @@
# for restore
/bin/bash rmix,
++++++ apparmor-no-mount.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-lxc
+Index: libvirt-1.2.21/examples/apparmor/libvirt-lxc
===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-1.2.20/examples/apparmor/libvirt-lxc
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-lxc
++++ libvirt-1.2.21/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include
++++++ blockcopy-check-dst-identical-device.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -11,11 +11,11 @@
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
-Index: libvirt-1.2.20/src/qemu/qemu_driver.c
+Index: libvirt-1.2.21/src/qemu/qemu_driver.c
===================================================================
---- libvirt-1.2.20.orig/src/qemu/qemu_driver.c
-+++ libvirt-1.2.20/src/qemu/qemu_driver.c
-@@ -16715,6 +16715,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-1.2.21.orig/src/qemu/qemu_driver.c
++++ libvirt-1.2.21/src/qemu/qemu_driver.c
+@@ -16720,6 +16720,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet"));
goto endjob;
}
++++++ libvirt-1.2.20.tar.gz -> libvirt-1.2.21.tar.gz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.20.tar.gz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.21.tar.gz differ: char 13, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.2.20/tools/libvirt-guests.init.in
+Index: libvirt-1.2.21/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.20/tools/libvirt-guests.init.in
+--- libvirt-1.2.21.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.21/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@@ -28,10 +28,10 @@
### END INIT INFO
# the following is chkconfig init header
-Index: libvirt-1.2.20/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.21/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.20/tools/libvirt-guests.sh.in
+--- libvirt-1.2.21.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.21/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# http://www.gnu.org/licenses/.
@@ -191,10 +191,10 @@
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-1.2.20/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.21/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.2.20.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.20/tools/libvirt-guests.sysconf
+--- libvirt-1.2.21.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.21/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-power8-models.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/cpu/cpu_map.xml
+Index: libvirt-1.2.21/src/cpu/cpu_map.xml
===================================================================
---- libvirt-1.2.20.orig/src/cpu/cpu_map.xml
-+++ libvirt-1.2.20/src/cpu/cpu_map.xml
+--- libvirt-1.2.21.orig/src/cpu/cpu_map.xml
++++ libvirt-1.2.21/src/cpu/cpu_map.xml
@@ -1424,6 +1424,16 @@
<pvr value='0x004d0000' mask='0xffff0000'/>
</model>
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/configure.ac
+Index: libvirt-1.2.21/configure.ac
===================================================================
---- libvirt-1.2.20.orig/configure.ac
-+++ libvirt-1.2.20/configure.ac
+--- libvirt-1.2.21.orig/configure.ac
++++ libvirt-1.2.21/configure.ac
@@ -242,6 +242,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
@@ -34,11 +34,11 @@
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
-Index: libvirt-1.2.20/src/Makefile.am
+Index: libvirt-1.2.21/src/Makefile.am
===================================================================
---- libvirt-1.2.20.orig/src/Makefile.am
-+++ libvirt-1.2.20/src/Makefile.am
-@@ -880,6 +880,10 @@ if WITH_NETCF
+--- libvirt-1.2.21.orig/src/Makefile.am
++++ libvirt-1.2.21/src/Makefile.am
+@@ -878,6 +878,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
-@@ -1505,6 +1509,10 @@ if WITH_NETCF
+@@ -1503,6 +1507,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.2.20/tools/virsh.c
+Index: libvirt-1.2.21/tools/virsh.c
===================================================================
---- libvirt-1.2.20.orig/tools/virsh.c
-+++ libvirt-1.2.20/tools/virsh.c
+--- libvirt-1.2.21.orig/tools/virsh.c
++++ libvirt-1.2.21/tools/virsh.c
@@ -588,6 +588,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.2.20/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.21/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.2.20.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.20/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.21.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.21/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -140,7 +140,7 @@
/* open netcf */
if (ncf_init(&driver->netcf, NULL) != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -1146,6 +1186,19 @@ static virStateDriver interfaceStateDriv
+@@ -1140,6 +1180,19 @@ static virStateDriver interfaceStateDriv
int netcfIfaceRegister(void)
{
@@ -160,10 +160,10 @@
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
-Index: libvirt-1.2.20/src/interface/interface_driver.c
+Index: libvirt-1.2.21/src/interface/interface_driver.c
===================================================================
---- libvirt-1.2.20.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.20/src/interface/interface_driver.c
+--- libvirt-1.2.21.orig/src/interface/interface_driver.c
++++ libvirt-1.2.21/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.2.20/m4/virt-netcontrol.m4
+Index: libvirt-1.2.21/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.2.20/m4/virt-netcontrol.m4
++++ libvirt-1.2.21/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/daemon/libvirtd.conf
+Index: libvirt-1.2.21/daemon/libvirtd.conf
===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.20/daemon/libvirtd.conf
+--- libvirt-1.2.21.orig/daemon/libvirtd.conf
++++ libvirt-1.2.21/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.2.20/daemon/libvirtd-config.c
+Index: libvirt-1.2.21/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.20/daemon/libvirtd-config.c
+--- libvirt-1.2.21.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.21/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.2.20/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.21/daemon/test_libvirtd.aug.in
===================================================================
---- libvirt-1.2.20.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.20/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.21.orig/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.21/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.2.20/daemon/libvirtd.sysconf
+Index: libvirt-1.2.21/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.20/daemon/libvirtd.sysconf
+--- libvirt-1.2.21.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.21/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ libvirtd-systemd-socket.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -9,10 +9,10 @@
See bsc#933043
-Index: libvirt-1.2.20/daemon/libvirtd.socket.in
+Index: libvirt-1.2.21/daemon/libvirtd.socket.in
===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.socket.in
-+++ libvirt-1.2.20/daemon/libvirtd.socket.in
+--- libvirt-1.2.21.orig/daemon/libvirtd.socket.in
++++ libvirt-1.2.21/daemon/libvirtd.socket.in
@@ -2,10 +2,8 @@
ListenStream=@runstatedir@/libvirt/libvirt-sock
ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
++++++ ppc64le-canonical-name.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -2,10 +2,10 @@
See bnc#894956
-Index: libvirt-1.2.20/src/util/virarch.c
+Index: libvirt-1.2.21/src/util/virarch.c
===================================================================
---- libvirt-1.2.20.orig/src/util/virarch.c
-+++ libvirt-1.2.20/src/util/virarch.c
+--- libvirt-1.2.21.orig/src/util/virarch.c
++++ libvirt-1.2.21/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.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.21/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.2.20.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.20/examples/apparmor/libvirt-qemu
+--- libvirt-1.2.21.orig/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.21/examples/apparmor/libvirt-qemu
@@ -133,6 +133,9 @@
/sys/bus/ r,
/sys/class/ r,
++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -8,10 +8,10 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.2.20/src/xenconfig/xen_common.c
+Index: libvirt-1.2.21/src/xenconfig/xen_common.c
===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_common.c
-+++ libvirt-1.2.20/src/xenconfig/xen_common.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_common.c
++++ libvirt-1.2.21/src/xenconfig/xen_common.c
@@ -403,6 +403,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-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/qemu/qemu.conf
+Index: libvirt-1.2.21/src/qemu/qemu.conf
===================================================================
---- libvirt-1.2.20.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.20/src/qemu/qemu.conf
+--- libvirt-1.2.21.orig/src/qemu/qemu.conf
++++ libvirt-1.2.21/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.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/daemon/libvirtd.service.in
+Index: libvirt-1.2.21/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.2.20.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.20/daemon/libvirtd.service.in
+--- libvirt-1.2.21.orig/daemon/libvirtd.service.in
++++ libvirt-1.2.21/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.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.2.20/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.21/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.2.20.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.20/src/locking/virtlockd.sysconf
+--- libvirt-1.2.21.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.2.21/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.2.20/src/locking/virtlockd.init.in
+Index: libvirt-1.2.21/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.2.20.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.20/src/locking/virtlockd.init.in
+--- libvirt-1.2.21.orig/src/locking/virtlockd.init.in
++++ libvirt-1.2.21/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-gen...
#
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
static int
xenParseSxprDisks(virDomainDefPtr def,
++++++ xen-sxpr-disk-type.patch ++++++
--- /var/tmp/diff_new_pack.awbTqS/_old 2015-11-05 11:36:06.000000000 +0100
+++ /var/tmp/diff_new_pack.awbTqS/_new 2015-11-05 11:36:06.000000000 +0100
@@ -6,10 +6,10 @@
https://bugzilla.suse.com/show_bug.cgi?id=938228
-Index: libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.21/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-1.2.20.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.20/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.21.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.21/src/xenconfig/xen_sxpr.c
@@ -449,10 +449,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */