Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2014-08-05 10:24:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-07-17 06:58:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2014-08-05 10:24:42.000000000 +0200
@@ -1,0 +2,18 @@
+Mon Aug 4 09:32:57 MDT 2014 - jfehlig@suse.com
+
+- Update to libvirt 1.2.7
+ - Introduce virConnectGetDomainCapabilities
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop upstream patches: dba3432b-virt-lxc-convert-fix.patch,
+ 9b1e4cd5-skip-useless-apparmor-files.patch,
+ 9265f8ab-apparmor-lxc-rework.patch,
+ add-nocow-to-vol-xml.patch,
+ lxc-keep-caps-feature.patch,
+ lxc-keep-caps-feature-conversion.patch,
+ lxc-keep-caps-feature-doc.patch,
+ lxc-net-target-name.patch,
+ lxc-net-target-name-conversion.patch,
+ lxc-net-target-name-doc.patch
+
+-------------------------------------------------------------------
Old:
----
9265f8ab-apparmor-lxc-rework.patch
9b1e4cd5-skip-useless-apparmor-files.patch
add-nocow-to-vol-xml.patch
dba3432b-virt-lxc-convert-fix.patch
libvirt-1.2.6.tar.bz2
lxc-keep-caps-feature-conversion.patch
lxc-keep-caps-feature-doc.patch
lxc-keep-caps-feature.patch
lxc-net-target-name-conversion.patch
lxc-net-target-name-doc.patch
lxc-net-target-name.patch
New:
----
libvirt-1.2.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -235,7 +235,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.2.6
+Version: 1.2.7
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -428,20 +428,9 @@
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
-Patch0: dba3432b-virt-lxc-convert-fix.patch
-Patch1: 9b1e4cd5-skip-useless-apparmor-files.patch
-Patch2: 9265f8ab-apparmor-lxc-rework.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: xen-pv-cdrom.patch
-Patch102: add-nocow-to-vol-xml.patch
-# pending review upstream patches
-Patch150: lxc-keep-caps-feature.patch
-Patch151: lxc-keep-caps-feature-conversion.patch
-Patch152: lxc-keep-caps-feature-doc.patch
-Patch153: lxc-net-target-name.patch
-Patch154: lxc-net-target-name-conversion.patch
-Patch155: lxc-net-target-name-doc.patch
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: libvirtd-init-script.patch
@@ -953,18 +942,8 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%patch100 -p1
%patch101 -p1
-%patch102 -p1
-%patch150 -p1
-%patch151 -p1
-%patch152 -p1
-%patch153 -p1
-%patch154 -p1
-%patch155 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
@@ -1191,7 +1170,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
+for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap domtop
do
(cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in)
done
@@ -1769,6 +1748,7 @@
%{_datadir}/libvirt/schemas/basictypes.rng
%{_datadir}/libvirt/schemas/capability.rng
%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domaincaps.rng
%{_datadir}/libvirt/schemas/domaincommon.rng
%{_datadir}/libvirt/schemas/domainsnapshot.rng
%{_datadir}/libvirt/schemas/interface.rng
++++++ disable-virCgroupGetPercpuStats-test.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/tests/vircgrouptest.c
+Index: libvirt-1.2.7/tests/vircgrouptest.c
===================================================================
---- libvirt-1.2.6.orig/tests/vircgrouptest.c
-+++ libvirt-1.2.6/tests/vircgrouptest.c
+--- libvirt-1.2.7.orig/tests/vircgrouptest.c
++++ libvirt-1.2.7/tests/vircgrouptest.c
@@ -33,7 +33,6 @@
# include "virlog.h"
# include "virfile.h"
++++++ fix-pci-attach-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -8,11 +8,11 @@
This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools.
-Index: libvirt-1.2.6/src/xen/xend_internal.c
+Index: libvirt-1.2.7/src/xen/xend_internal.c
===================================================================
---- libvirt-1.2.6.orig/src/xen/xend_internal.c
-+++ libvirt-1.2.6/src/xen/xend_internal.c
-@@ -2222,6 +2222,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
+--- libvirt-1.2.7.orig/src/xen/xend_internal.c
++++ libvirt-1.2.7/src/xen/xend_internal.c
+@@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];
char *target = NULL;
@@ -20,7 +20,7 @@
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
-@@ -2320,8 +2321,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
+@@ -2319,8 +2320,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
}
sexpr = virBufferContentAndReset(&buf);
++++++ install-apparmor-profiles.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/examples/apparmor/Makefile.am
+Index: libvirt-1.2.7/examples/apparmor/Makefile.am
===================================================================
---- libvirt-1.2.6.orig/examples/apparmor/Makefile.am
-+++ libvirt-1.2.6/examples/apparmor/Makefile.am
+--- libvirt-1.2.7.orig/examples/apparmor/Makefile.am
++++ libvirt-1.2.7/examples/apparmor/Makefile.am
@@ -19,10 +19,22 @@ EXTRA_DIST= \
TEMPLATE.lxc \
libvirt-qemu \
@@ -27,10 +27,10 @@
apparmordir = $(sysconfdir)/apparmor.d/
apparmor_DATA = \
usr.lib.libvirt.virt-aa-helper \
-Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+Index: libvirt-1.2.7/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
-+++ libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ libvirt-1.2.7/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,48 @@
+# Last Modified: Mon Apr 5 15:10:27 2010
+#include
@@ -80,10 +80,10 @@
+ /**.[iI][sS][oO] r,
+ /**/disk{,.*} r,
+}
-Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
+Index: libvirt-1.2.7/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
-+++ libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd.in
++++ libvirt-1.2.7/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,67 @@
+# Last Modified: Mon Apr 5 15:03:58 2010
+#include
@@ -152,9 +152,9 @@
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
-Index: libvirt-1.2.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+Index: libvirt-1.2.7/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
---- libvirt-1.2.6.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+--- libvirt-1.2.7.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,48 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@@ -205,9 +205,9 @@
- /**.[iI][sS][oO] r,
- /**/disk{,.*} r,
-}
-Index: libvirt-1.2.6/examples/apparmor/usr.sbin.libvirtd
+Index: libvirt-1.2.7/examples/apparmor/usr.sbin.libvirtd
===================================================================
---- libvirt-1.2.6.orig/examples/apparmor/usr.sbin.libvirtd
+--- libvirt-1.2.7.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,63 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
++++++ libvirt-1.2.6.tar.bz2 -> libvirt-1.2.7.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libvirt/libvirt-1.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.2.7.tar.bz2 differ: char 11, line 1
++++++ libvirt-guests-init-script.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
-Index: libvirt-1.2.6/tools/libvirt-guests.init.in
+Index: libvirt-1.2.7/tools/libvirt-guests.init.in
===================================================================
---- libvirt-1.2.6.orig/tools/libvirt-guests.init.in
-+++ libvirt-1.2.6/tools/libvirt-guests.init.in
+--- libvirt-1.2.7.orig/tools/libvirt-guests.init.in
++++ libvirt-1.2.7/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.6/tools/libvirt-guests.sh.in
+Index: libvirt-1.2.7/tools/libvirt-guests.sh.in
===================================================================
---- libvirt-1.2.6.orig/tools/libvirt-guests.sh.in
-+++ libvirt-1.2.6/tools/libvirt-guests.sh.in
+--- libvirt-1.2.7.orig/tools/libvirt-guests.sh.in
++++ libvirt-1.2.7/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# http://www.gnu.org/licenses/.
@@ -189,10 +189,10 @@
esac
-exit $RETVAL
+rc_exit
-Index: libvirt-1.2.6/tools/libvirt-guests.sysconf
+Index: libvirt-1.2.7/tools/libvirt-guests.sysconf
===================================================================
---- libvirt-1.2.6.orig/tools/libvirt-guests.sysconf
-+++ libvirt-1.2.6/tools/libvirt-guests.sysconf
+--- libvirt-1.2.7.orig/tools/libvirt-guests.sysconf
++++ libvirt-1.2.7/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/configure.ac
+Index: libvirt-1.2.7/configure.ac
===================================================================
---- libvirt-1.2.6.orig/configure.ac
-+++ libvirt-1.2.6/configure.ac
+--- libvirt-1.2.7.orig/configure.ac
++++ libvirt-1.2.7/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
@@ -26,7 +26,7 @@
esac
if test "$with_interface" = "yes" ; then
-@@ -2822,6 +2824,7 @@ LIBVIRT_RESULT_FUSE
+@@ -2834,6 +2836,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.2.6/src/Makefile.am
+Index: libvirt-1.2.7/src/Makefile.am
===================================================================
---- libvirt-1.2.6.orig/src/Makefile.am
-+++ libvirt-1.2.6/src/Makefile.am
-@@ -818,6 +818,10 @@ if WITH_NETCF
+--- libvirt-1.2.7.orig/src/Makefile.am
++++ libvirt-1.2.7/src/Makefile.am
+@@ -820,6 +820,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
-@@ -1414,10 +1418,15 @@ if WITH_NETCF
+@@ -1416,10 +1420,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF
@@ -65,10 +65,10 @@
endif ! WITH_NETCF
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
-Index: libvirt-1.2.6/tools/virsh.c
+Index: libvirt-1.2.7/tools/virsh.c
===================================================================
---- libvirt-1.2.6.orig/tools/virsh.c
-+++ libvirt-1.2.6/tools/virsh.c
+--- libvirt-1.2.7.orig/tools/virsh.c
++++ libvirt-1.2.7/tools/virsh.c
@@ -3320,6 +3320,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
@@ -78,10 +78,10 @@
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
-Index: libvirt-1.2.6/src/interface/interface_backend_netcf.c
+Index: libvirt-1.2.7/src/interface/interface_backend_netcf.c
===================================================================
---- libvirt-1.2.6.orig/src/interface/interface_backend_netcf.c
-+++ libvirt-1.2.6/src/interface/interface_backend_netcf.c
+--- libvirt-1.2.7.orig/src/interface/interface_backend_netcf.c
++++ libvirt-1.2.7/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include
@@ -165,10 +165,10 @@
return 0;
}
-Index: libvirt-1.2.6/src/interface/interface_driver.c
+Index: libvirt-1.2.7/src/interface/interface_driver.c
===================================================================
---- libvirt-1.2.6.orig/src/interface/interface_driver.c
-+++ libvirt-1.2.6/src/interface/interface_driver.c
+--- libvirt-1.2.7.orig/src/interface/interface_driver.c
++++ libvirt-1.2.7/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@@ -186,10 +186,10 @@
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
-Index: libvirt-1.2.6/m4/virt-netcontrol.m4
+Index: libvirt-1.2.7/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
-+++ libvirt-1.2.6/m4/virt-netcontrol.m4
++++ libvirt-1.2.7/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/daemon/libvirtd.conf
+Index: libvirt-1.2.7/daemon/libvirtd.conf
===================================================================
---- libvirt-1.2.6.orig/daemon/libvirtd.conf
-+++ libvirt-1.2.6/daemon/libvirtd.conf
+--- libvirt-1.2.7.orig/daemon/libvirtd.conf
++++ libvirt-1.2.7/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.6/daemon/libvirtd-config.c
+Index: libvirt-1.2.7/daemon/libvirtd-config.c
===================================================================
---- libvirt-1.2.6.orig/daemon/libvirtd-config.c
-+++ libvirt-1.2.6/daemon/libvirtd-config.c
+--- libvirt-1.2.7.orig/daemon/libvirtd-config.c
++++ libvirt-1.2.7/daemon/libvirtd-config.c
@@ -229,7 +229,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.6/daemon/test_libvirtd.aug.in
+Index: libvirt-1.2.7/daemon/test_libvirtd.aug.in
===================================================================
---- libvirt-1.2.6.orig/daemon/test_libvirtd.aug.in
-+++ libvirt-1.2.6/daemon/test_libvirtd.aug.in
+--- libvirt-1.2.7.orig/daemon/test_libvirtd.aug.in
++++ libvirt-1.2.7/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
++++++ libvirtd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
-Index: libvirt-1.2.6/daemon/libvirtd.sysconf
+Index: libvirt-1.2.7/daemon/libvirtd.sysconf
===================================================================
---- libvirt-1.2.6.orig/daemon/libvirtd.sysconf
-+++ libvirt-1.2.6/daemon/libvirtd.sysconf
+--- libvirt-1.2.7.orig/daemon/libvirtd.sysconf
++++ libvirt-1.2.7/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+
++++++ support-managed-pci-xen-driver.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -8,10 +8,10 @@
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
-Index: libvirt-1.2.6/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.7/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.2.6.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.2.6/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.7.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.7/src/xenxs/xen_sxpr.c
@@ -997,6 +997,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
@@ -35,7 +35,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;
-@@ -1991,11 +1994,15 @@ static void
+@@ -1990,11 +1993,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
@@ -52,7 +52,7 @@
}
-@@ -2014,12 +2021,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
+@@ -2013,12 +2020,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@@ -65,7 +65,7 @@
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
-@@ -2074,12 +2075,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
+@@ -2073,12 +2074,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) {
@@ -78,11 +78,11 @@
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
-Index: libvirt-1.2.6/src/xenxs/xen_xm.c
+Index: libvirt-1.2.7/src/xenxs/xen_xm.c
===================================================================
---- libvirt-1.2.6.orig/src/xenxs/xen_xm.c
-+++ libvirt-1.2.6/src/xenxs/xen_xm.c
-@@ -819,6 +819,8 @@ xenParseXM(virConfPtr conf, int xendConf
+--- libvirt-1.2.7.orig/src/xenxs/xen_xm.c
++++ libvirt-1.2.7/src/xenxs/xen_xm.c
+@@ -815,6 +815,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;
int funcID;
@@ -91,7 +91,7 @@
domain[0] = bus[0] = slot[0] = func[0] = '\0';
-@@ -828,6 +830,11 @@ xenParseXM(virConfPtr conf, int xendConf
+@@ -824,6 +826,11 @@ xenParseXM(virConfPtr conf, int xendConf
/* pci=['0000:00:1b.0','0000:00:13.0'] */
if (!(key = list->str))
goto skippci;
@@ -103,7 +103,7 @@
if (!(nextkey = strchr(key, ':')))
goto skippci;
-@@ -876,10 +883,30 @@ xenParseXM(virConfPtr conf, int xendConf
+@@ -872,10 +879,30 @@ xenParseXM(virConfPtr conf, int xendConf
if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
goto skippci;
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:43.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:43.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/src/qemu/qemu.conf
+Index: libvirt-1.2.7/src/qemu/qemu.conf
===================================================================
---- libvirt-1.2.6.orig/src/qemu/qemu.conf
-+++ libvirt-1.2.6/src/qemu/qemu.conf
+--- libvirt-1.2.7.orig/src/qemu/qemu.conf
++++ libvirt-1.2.7/src/qemu/qemu.conf
@@ -200,7 +200,16 @@
# a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers.
@@ -19,7 +19,7 @@
# If set to non-zero, then the default security labeling
# will make guests confined. If set to zero, then guests
-@@ -402,11 +411,22 @@
+@@ -409,11 +418,22 @@
#allow_disk_format_probing = 1
++++++ systemd-service-xen.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:44.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:44.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/daemon/libvirtd.service.in
+Index: libvirt-1.2.7/daemon/libvirtd.service.in
===================================================================
---- libvirt-1.2.6.orig/daemon/libvirtd.service.in
-+++ libvirt-1.2.6/daemon/libvirtd.service.in
+--- libvirt-1.2.7.orig/daemon/libvirtd.service.in
++++ libvirt-1.2.7/daemon/libvirtd.service.in
@@ -10,6 +10,8 @@ After=network.target
After=dbus.service
After=iscsid.service
++++++ virtlockd-init-script.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:44.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:44.000000000 +0200
@@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
-Index: libvirt-1.2.6/src/locking/virtlockd.sysconf
+Index: libvirt-1.2.7/src/locking/virtlockd.sysconf
===================================================================
---- libvirt-1.2.6.orig/src/locking/virtlockd.sysconf
-+++ libvirt-1.2.6/src/locking/virtlockd.sysconf
+--- libvirt-1.2.7.orig/src/locking/virtlockd.sysconf
++++ libvirt-1.2.7/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.6/src/locking/virtlockd.init.in
+Index: libvirt-1.2.7/src/locking/virtlockd.init.in
===================================================================
---- libvirt-1.2.6.orig/src/locking/virtlockd.init.in
-+++ libvirt-1.2.6/src/locking/virtlockd.init.in
+--- libvirt-1.2.7.orig/src/locking/virtlockd.init.in
++++ libvirt-1.2.7/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-gen...
#
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:44.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:44.000000000 +0200
@@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
-Index: libvirt-1.2.6/src/xen/xend_internal.c
+Index: libvirt-1.2.7/src/xen/xend_internal.c
===================================================================
---- libvirt-1.2.6.orig/src/xen/xend_internal.c
-+++ libvirt-1.2.6/src/xen/xend_internal.c
+--- libvirt-1.2.7.orig/src/xen/xend_internal.c
++++ libvirt-1.2.7/src/xen/xend_internal.c
@@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal");
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)
@@ -27,7 +27,7 @@
virDomainDeviceDefPtr dev, char *class,
char *ref, int ref_len);
-@@ -3331,37 +3331,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c
+@@ -3328,37 +3328,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c
* Returns 0 in case of success, -1 in case of failure.
*/
static int
@@ -80,7 +80,7 @@
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
char mac[VIR_MAC_STRING_BUFLEN];
virDomainNetDefPtr netdef = dev->data.net;
-@@ -3369,16 +3367,22 @@ virDomainXMLDevID(virConnectPtr conn,
+@@ -3366,16 +3364,22 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "vif");
@@ -113,7 +113,7 @@
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-@@ -3394,17 +3398,44 @@ virDomainXMLDevID(virConnectPtr conn,
+@@ -3391,17 +3395,44 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "pci");
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.wEIxpd/_old 2014-08-05 10:24:44.000000000 +0200
+++ /var/tmp/diff_new_pack.wEIxpd/_new 2014-08-05 10:24:44.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.6/src/xenxs/xen_sxpr.c
+Index: libvirt-1.2.7/src/xenxs/xen_sxpr.c
===================================================================
---- libvirt-1.2.6.orig/src/xenxs/xen_sxpr.c
-+++ libvirt-1.2.6/src/xenxs/xen_sxpr.c
+--- libvirt-1.2.7.orig/src/xenxs/xen_sxpr.c
++++ libvirt-1.2.7/src/xenxs/xen_sxpr.c
@@ -332,7 +332,7 @@ xenParseSxprChar(const char *value,
static int
xenParseSxprDisks(virDomainDefPtr def,
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org