Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-05-06 07:49:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-22 01:18:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-05-06 07:49:56.000000000 +0200
@@ -1,0 +2,20 @@
+Tue May 5 09:35:12 MDT 2015 - jfehlig@suse.com
+
+- libxl: support virtual sound devices in HVM domains
+ c0d3f608-libxl-soundhw.patch
+ bsc#875216
+
+-------------------------------------------------------------------
+Mon May 4 09:00:24 MDT 2015 - jfehlig@suse.com
+
+- Update to libvirt 1.2.15
+ - Implement virDomainAddIOThread and virDomainDelIOThread
+ - libxl: Introduce configuration file for libxl driver
+ - Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop upstream patches da33a1ac-lxc-init-statedir.patch and
+ open-ns-files-readonly.patch
+- spec file fixups for building --without-driver-modules
+
+-------------------------------------------------------------------
Old:
----
da33a1ac-lxc-init-statedir.patch
libvirt-1.2.14.tar.gz
libvirt-1.2.14.tar.gz.asc
open-ns-files-readonly.patch
New:
----
c0d3f608-libxl-soundhw.patch
libvirt-1.2.15.tar.gz
libvirt-1.2.15.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -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
@@ -245,7 +245,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.2.14
+Version: 1.2.15
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -449,9 +449,8 @@
Source5: polkit-10-virt.rules
Source99: baselibs.conf
# Upstream patches
-Patch0: da33a1ac-lxc-init-statedir.patch
+Patch0: c0d3f608-libxl-soundhw.patch
# Patches pending upstream review
-Patch100: open-ns-files-readonly.patch
# Need to go upstream
Patch150: xen-pv-cdrom.patch
Patch151: blockcopy-check-dst-identical-device.patch
@@ -981,7 +980,6 @@
%prep
%setup -q
%patch0 -p1
-%patch100 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
@@ -1308,6 +1306,11 @@
of managing Xen.
EOF
%endif
+%if ! %{with_libxl}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
+%endif
%if ! %{with_sanlock}
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
@@ -1326,7 +1329,7 @@
ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT%{_sbindir}/rclibvirtd
%endif
mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
-rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/libvirtd.conf
+rm -f $RPM_BUILD_ROOT/usr/lib/sysctl.d/60-libvirtd.conf
# For other services, use the in-tree scripts
%if %{with_systemd}
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/virtlockd
@@ -1554,8 +1557,6 @@
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_leaseshelper
-%dir %{_datadir}/libvirt/networks/
-%{_datadir}/libvirt/networks/default.xml
%endif
%if %{with_nwfilter}
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
@@ -1566,8 +1567,6 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
-%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
-%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
@@ -1580,6 +1579,7 @@
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_lxc
%{_datadir}/augeas/lenses/libvirtd_lxc.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
+%attr(0755, root, root) %{_bindir}/virt-lxc-convert
%endif
%if %{with_uml}
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml
@@ -1587,8 +1587,12 @@
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/
%endif
%if %{with_libxl}
+%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
+%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
%endif
%if %{with_storage_disk}
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper
@@ -1677,8 +1681,6 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
-%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
-%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
@@ -1725,6 +1727,10 @@
%files daemon-driver-libxl
%defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
+%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
%dir %{_libdir}/%{name}/connection-driver
@@ -1862,6 +1868,9 @@
%if %{with_qemu}
%config(noreplace) %{_sysconfdir}/%{name}/qemu-sanlock.conf
%endif
+ %if %{with_libxl}
+%config(noreplace) %{_sysconfdir}/%{name}/libxl-sanlock.conf
+ %endif
%dir %{_libdir}/%{name}/lock-driver/
%attr(0755, root, root) %{_libdir}/%{name}/lock-driver/sanlock.so
%dir %{_datadir}/augeas/
++++++ apparmor-fixes.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,30 +1,11 @@
-Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu
-@@ -59,6 +59,7 @@
- # access to firmware's etc
- /usr/share/kvm/** r,
- /usr/share/qemu/** r,
-+ /usr/share/qemu-kvm/** r,
- /usr/share/bochs/** r,
- /usr/share/openbios/** r,
- /usr/share/openhackware/** r,
-@@ -73,6 +74,7 @@
- # the various binaries
- /usr/bin/kvm rmix,
- /usr/bin/qemu rmix,
-+ /usr/bin/qemu-kvm rmix,
- /usr/bin/qemu-system-arm rmix,
- /usr/bin/qemu-system-cris rmix,
- /usr/bin/qemu-system-i386 rmix,
-@@ -118,6 +120,12 @@
- /bin/dd rmix,
- /bin/cat rmix,
+--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.15/examples/apparmor/libvirt-qemu
+@@ -124,6 +124,9 @@
+ # for restore
+ /bin/bash rmix,
-+ # for restore
-+ /bin/bash rmix,
-+
+ /run/nscd/passwd r,
+ /run/nscd/group r,
+
++++++ apparmor-no-mount.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/examples/apparmor/libvirt-lxc
+Index: libvirt-1.2.15/examples/apparmor/libvirt-lxc
===================================================================
---- libvirt-1.2.14.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-1.2.14/examples/apparmor/libvirt-lxc
+--- libvirt-1.2.15.orig/examples/apparmor/libvirt-lxc
++++ libvirt-1.2.15/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include
++++++ blockcopy-check-dst-identical-device.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -11,11 +11,11 @@
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
-Index: libvirt-1.2.14/src/qemu/qemu_driver.c
+Index: libvirt-1.2.15/src/qemu/qemu_driver.c
===================================================================
---- libvirt-1.2.14.orig/src/qemu/qemu_driver.c
-+++ libvirt-1.2.14/src/qemu/qemu_driver.c
-@@ -16644,6 +16644,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
+--- libvirt-1.2.15.orig/src/qemu/qemu_driver.c
++++ libvirt-1.2.15/src/qemu/qemu_driver.c
+@@ -17019,6 +17019,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet"));
goto endjob;
}
++++++ c0d3f608-libxl-soundhw.patch ++++++
commit c0d3f608d6981c69f03d19252308a09545d1ab84
Author: Jim Fehlig
Date: Mon May 4 13:50:10 2015 -0600
libxl: support soundhw for hvm domains
The xend driver and the parsing/formating code in src/xenconfig
have long supported soundhw. Add support in the libxl driver too.
Index: libvirt-1.2.15/src/libxl/libxl_conf.c
===================================================================
--- libvirt-1.2.15.orig/src/libxl/libxl_conf.c
+++ libvirt-1.2.15/src/libxl/libxl_conf.c
@@ -678,6 +678,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr de
libxl_defbool_set(&b_info->u.hvm.hpet, 1);
}
}
+
+ if (def->nsounds > 0) {
+ /*
+ * Use first sound device. man xl.cfg(5) describes soundhw as
+ * a single device. From the man page: soundhw=DEVICE
+ */
+ virDomainSoundDefPtr snd = def->sounds[0];
+
+ if (VIR_STRDUP(b_info->u.hvm.soundhw,
+ virDomainSoundModelTypeToString(snd->model)) < 0)
+ return -1;
+ }
+
for (i = 0; i < def->os.nBootDevs; i++) {
switch (def->os.bootDevs[i]) {
case VIR_DOMAIN_BOOT_FLOPPY:
++++++ disable-virCgroupGetPercpuStats-test.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/tests/vircgrouptest.c
+Index: libvirt-1.2.15/tests/vircgrouptest.c
===================================================================
---- libvirt-1.2.14.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.14/tests/vircgrouptest.c
+--- libvirt-1.2.15.orig/tests/vircgrouptest.c
++++ libvirt-1.2.15/tests/vircgrouptest.c
@@ -34,7 +34,6 @@
# include "virfile.h"
# include "virbuffer.h"
@@ -10,8 +10,8 @@
# define VIR_FROM_THIS VIR_FROM_NONE
-@@ -586,91 +585,6 @@ static int testCgroupAvailable(const voi
- return 0;
+@@ -607,91 +606,6 @@ static int testCgroupControllerAvailable
+ return ret;
}
-static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED)
@@ -24,25 +24,25 @@
-
- unsigned long long expected[EXPECTED_NCPUS] = {
- 0, 0, 0, 0, 0, 0, 0, 0,
-- 7059492996, 0, 0, 0, 0, 0, 0, 0,
-- 4180532496, 0, 0, 0, 0, 0, 0, 0,
+- 7059492996ULL, 0, 0, 0, 0, 0, 0, 0,
+- 4180532496ULL, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
-- 1957541268, 0, 0, 0, 0, 0, 0, 0,
-- 2065932204, 0, 0, 0, 0, 0, 0, 0,
-- 18228689414, 0, 0, 0, 0, 0, 0, 0,
-- 4245525148, 0, 0, 0, 0, 0, 0, 0,
-- 2911161568, 0, 0, 0, 0, 0, 0, 0,
-- 1407758136, 0, 0, 0, 0, 0, 0, 0,
-- 1836807700, 0, 0, 0, 0, 0, 0, 0,
-- 1065296618, 0, 0, 0, 0, 0, 0, 0,
-- 2046213266, 0, 0, 0, 0, 0, 0, 0,
-- 747889778, 0, 0, 0, 0, 0, 0, 0,
-- 709566900, 0, 0, 0, 0, 0, 0, 0,
-- 444777342, 0, 0, 0, 0, 0, 0, 0,
-- 5683512916, 0, 0, 0, 0, 0, 0, 0,
-- 635751356, 0, 0, 0, 0, 0, 0, 0,
+- 1957541268ULL, 0, 0, 0, 0, 0, 0, 0,
+- 2065932204ULL, 0, 0, 0, 0, 0, 0, 0,
+- 18228689414ULL, 0, 0, 0, 0, 0, 0, 0,
+- 4245525148ULL, 0, 0, 0, 0, 0, 0, 0,
+- 2911161568ULL, 0, 0, 0, 0, 0, 0, 0,
+- 1407758136ULL, 0, 0, 0, 0, 0, 0, 0,
+- 1836807700ULL, 0, 0, 0, 0, 0, 0, 0,
+- 1065296618ULL, 0, 0, 0, 0, 0, 0, 0,
+- 2046213266ULL, 0, 0, 0, 0, 0, 0, 0,
+- 747889778ULL, 0, 0, 0, 0, 0, 0, 0,
+- 709566900ULL, 0, 0, 0, 0, 0, 0, 0,
+- 444777342ULL, 0, 0, 0, 0, 0, 0, 0,
+- 5683512916ULL, 0, 0, 0, 0, 0, 0, 0,
+- 635751356ULL, 0, 0, 0, 0, 0, 0, 0,
- };
-
- if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
@@ -102,7 +102,7 @@
static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED)
{
virCgroupPtr cgroup = NULL;
-@@ -895,9 +809,6 @@ mymain(void)
+@@ -919,9 +833,6 @@ mymain(void)
if (virtTestRun("virCgroupGetMemoryUsage works", testCgroupGetMemoryUsage, NULL) < 0)
ret = -1;
++++++ libvirt-1.2.14.tar.gz -> libvirt-1.2.15.tar.gz ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.14.tar.gz /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.15.tar.gz differ: char 13, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.2.14/tools/libvirt-guests.init.in
+Index: libvirt-1.2.15/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.2.14.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.14/tools/libvirt-guests.init.in
+--- libvirt-1.2.15.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.15/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.14/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.15/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.2.14.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.14/tools/libvirt-guests.sh.in
+--- libvirt-1.2.15.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.15/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.14/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.15/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.2.14.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.14/tools/libvirt-guests.sysconf
+--- libvirt-1.2.15.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.15/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-power8-models.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/src/cpu/cpu_map.xml
+Index: libvirt-1.2.15/src/cpu/cpu_map.xml
===================================================================
---- libvirt-1.2.14.orig/src/cpu/cpu_map.xml
-+++ libvirt-1.2.14/src/cpu/cpu_map.xml
+--- libvirt-1.2.15.orig/src/cpu/cpu_map.xml
++++ libvirt-1.2.15/src/cpu/cpu_map.xml
@@ -668,6 +668,16 @@
<pvr value='0x004d0000'/>
</model>
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/configure.ac
+Index: libvirt-1.2.15/configure.ac
===================================================================
---- libvirt-1.2.14.orig/configure.ac
-+++ libvirt-1.2.14/configure.ac
+--- libvirt-1.2.15.orig/configure.ac
++++ libvirt-1.2.15/configure.ac
@@ -237,6 +237,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.14/src/Makefile.am
+Index: libvirt-1.2.15/src/Makefile.am
===================================================================
---- libvirt-1.2.14.orig/src/Makefile.am
-+++ libvirt-1.2.14/src/Makefile.am
-@@ -847,6 +847,10 @@ if WITH_NETCF
+--- libvirt-1.2.15.orig/src/Makefile.am
++++ libvirt-1.2.15/src/Makefile.am
+@@ -848,6 +848,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
-@@ -1455,6 +1459,10 @@ if WITH_NETCF
+@@ -1464,6 +1468,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.2.14/tools/virsh.c
+Index: libvirt-1.2.15/tools/virsh.c
===================================================================
---- libvirt-1.2.14.orig/tools/virsh.c
-+++ libvirt-1.2.14/tools/virsh.c
-@@ -3360,6 +3360,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-1.2.15.orig/tools/virsh.c
++++ libvirt-1.2.15/tools/virsh.c
+@@ -3327,6 +3327,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
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.2.14/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.15/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.2.14.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.14/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.15.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.15/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -160,10 +160,10 @@
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0)
-Index: libvirt-1.2.14/src/interface/interface_driver.c
+Index: libvirt-1.2.15/src/interface/interface_driver.c
===================================================================
---- libvirt-1.2.14.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.14/src/interface/interface_driver.c
+--- libvirt-1.2.15.orig/src/interface/interface_driver.c
++++ libvirt-1.2.15/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.14/m4/virt-netcontrol.m4
+Index: libvirt-1.2.15/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.2.14/m4/virt-netcontrol.m4
++++ libvirt-1.2.15/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/daemon/libvirtd.conf
+Index: libvirt-1.2.15/daemon/libvirtd.conf
===================================================================
---- libvirt-1.2.14.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.14/daemon/libvirtd.conf
+--- libvirt-1.2.15.orig/daemon/libvirtd.conf
++++ libvirt-1.2.15/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.14/daemon/libvirtd-config.c
+Index: libvirt-1.2.15/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.2.14.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.14/daemon/libvirtd-config.c
+--- libvirt-1.2.15.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.15/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.14/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.15/daemon/test_libvirtd.aug.in
===================================================================
---- libvirt-1.2.14.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.14/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.15.orig/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.15/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.2.14/daemon/libvirtd.sysconf
+Index: libvirt-1.2.15/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.2.14.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.14/daemon/libvirtd.sysconf
+--- libvirt-1.2.15.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.15/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ ppc64le-canonical-name.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -2,10 +2,10 @@
See bnc#894956
-Index: libvirt-1.2.14/src/util/virarch.c
+Index: libvirt-1.2.15/src/util/virarch.c
===================================================================
---- libvirt-1.2.14.orig/src/util/virarch.c
-+++ libvirt-1.2.14/src/util/virarch.c
+--- libvirt-1.2.15.orig/src/util/virarch.c
++++ libvirt-1.2.15/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.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,8 +1,8 @@
-Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.15/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.2.14.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.14/examples/apparmor/libvirt-qemu
-@@ -132,6 +132,9 @@
+--- libvirt-1.2.15.orig/examples/apparmor/libvirt-qemu
++++ libvirt-1.2.15/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.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -8,10 +8,10 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.2.14/src/xenconfig/xen_common.c
+Index: libvirt-1.2.15/src/xenconfig/xen_common.c
===================================================================
---- libvirt-1.2.14.orig/src/xenconfig/xen_common.c
-+++ libvirt-1.2.14/src/xenconfig/xen_common.c
+--- libvirt-1.2.15.orig/src/xenconfig/xen_common.c
++++ libvirt-1.2.15/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.14/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c
@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@@ -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;
-@@ -2006,11 +2009,15 @@ static void
+@@ -2012,11 +2015,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
@@ -110,7 +110,7 @@
}
-@@ -2029,12 +2036,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
+@@ -2035,12 +2042,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@@ -123,7 +123,7 @@
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
-@@ -2089,12 +2090,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
+@@ -2095,12 +2096,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.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/src/qemu/qemu.conf
+Index: libvirt-1.2.15/src/qemu/qemu.conf
===================================================================
---- libvirt-1.2.14.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.14/src/qemu/qemu.conf
+--- libvirt-1.2.15.orig/src/qemu/qemu.conf
++++ libvirt-1.2.15/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.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/daemon/libvirtd.service.in
+Index: libvirt-1.2.15/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.2.14.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.14/daemon/libvirtd.service.in
+--- libvirt-1.2.15.orig/daemon/libvirtd.service.in
++++ libvirt-1.2.15/daemon/libvirtd.service.in
@@ -5,6 +5,8 @@ After=network.target
After=dbus.service
After=iscsid.service
++++++ virtlockd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.2.14/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.15/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.2.14.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.14/src/locking/virtlockd.sysconf
+--- libvirt-1.2.15.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.2.15/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.14/src/locking/virtlockd.init.in
+Index: libvirt-1.2.15/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.2.14.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.14/src/locking/virtlockd.init.in
+--- libvirt-1.2.15.orig/src/locking/virtlockd.init.in
++++ libvirt-1.2.15/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.c1Jpiz/_old 2015-05-06 07:49:58.000000000 +0200
+++ /var/tmp/diff_new_pack.c1Jpiz/_new 2015-05-06 07:49:58.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c
+Index: libvirt-1.2.15/src/xenconfig/xen_sxpr.c
===================================================================
---- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c
-+++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c
+--- libvirt-1.2.15.orig/src/xenconfig/xen_sxpr.c
++++ libvirt-1.2.15/src/xenconfig/xen_sxpr.c
@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
static int
xenParseSxprDisks(virDomainDefPtr def,