Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-04-10 09:54:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03-27 09:40:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-04-10 10:20:29.000000000 +0200
@@ -1,0 +2,38 @@
+Thu Apr 9 09:35:26 UTC 2015 - cbosdonnat@suse.com
+
+- boo#926153: make sure /var/run/libvirt/lxc folder exists when
+ starting the driver. da33a1ac-lxc-init-statedir.patch
+- Fix lxc-enter-namespace for 3.19+ kernels.
+ open-ns-files-readonly.patch
+
+
+-------------------------------------------------------------------
+Thu Apr 2 08:38:03 MDT 2015 - jfehlig@suse.com
+
+- Disable building wireshark dissector. Commit 37397320
+ requires wireshark pkgconfig, which SUSE wireshark packages
+ do not provide.
+- Disable building the legacy Xen driver since Xen no longer
+ provides the xend toolstack. Remove xend-specific patches
+ while at it: fix-pci-attach-xen-driver.patch,
+ xen-name-for-devid.patch
+
+-------------------------------------------------------------------
+Thu Apr 2 08:18:55 MDT 2015 - jfehlig@suse.com
+
+- Update to libvirt 1.2.14
+ - qemu: Implement memory device hotplug
+ - Implement public API for virDomainPinIOThread
+ - Implement public API for virDomainGetIOThreadsInfo
+ - SRIOV NIC offload feature discovery
+ - Many incremental improvements and bug fixes, see
+ http://libvirt.org/news.html
+ - Drop disable-hugepage-test.patch in favor of upstream fix
+
+-------------------------------------------------------------------
+Tue Mar 31 14:39:20 MDT 2015 - jfehlig@suse.com
+
+- Fix build on older distros containing a polkit package that lacks
+ support for /etc/polkit-1/rules.d drop directory
+
+-------------------------------------------------------------------
Old:
----
disable-hugepage-test.patch
fix-pci-attach-xen-driver.patch
libvirt-1.2.13.tar.gz
libvirt-1.2.13.tar.gz.asc
xen-name-for-devid.patch
New:
----
da33a1ac-lxc-init-statedir.patch
libvirt-1.2.14.tar.gz
libvirt-1.2.14.tar.gz.asc
open-ns-files-readonly.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200
+++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libvirt
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -77,6 +77,7 @@
%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
# A few optional bits off by default, we enable later
+%define with_polkit_rules 0
%define with_capng 0%{!?_without_capng:0}
%define with_fuse 0%{!?_without_fuse:0}
%define with_netcf 0%{!?_without_netcf:0}
@@ -90,8 +91,12 @@
%define with_numad 0%{!?_without_numad:0}
%define with_firewalld 0%{!?_without_firewalld:0}
%define with_libssh2 0%{!?_without_libssh2:0}
+%define with_wireshark 0%{!?_without_wireshark:0}
%define with_systemd_daemon 0%{!?_without_systemd_daemon:0}
+# Xen no longer contains xm/xend so disable building the legacy Xen driver
+%define with_xen 0%{!?_without_xen:0}
+
# Non-server/HV driver defaults which are always enabled
%define with_sasl 0%{!?_without_sasl:1}
@@ -168,6 +173,11 @@
%define with_libssh2 0%{!?_without_libssh2:1}
%endif
+# libvirt commit 37397320 changed the configure check for wireshark to
+# use pkgconfig, but our wireshark packages do not provide wireshark.pc.
+# Disable the dissector for now
+%define with_wireshark 0
+
# Disable some drivers when building without libvirt daemon.
# The logic is the same as in configure.ac
%if ! %{with_libvirtd}
@@ -235,7 +245,7 @@
Name: libvirt
Url: http://libvirt.org/
-Version: 1.2.13
+Version: 1.2.14
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@@ -362,6 +372,9 @@
BuildRequires: cyrus-sasl-devel
%endif
%if %{with_polkit}
+ %if 0%{?suse_version} > 1140
+%define with_polkit_rules 1
+ %endif
%if 0%{?suse_version} > 1110
BuildRequires: polkit >= 0.9
BuildRequires: polkit-devel >= 0.9
@@ -424,7 +437,7 @@
%if %{with_numad}
BuildRequires: numad
%endif
-%if 0%{?suse_version} >= 1210
+%if %{with_wireshark}
BuildRequires: wireshark-devel
%endif
@@ -436,28 +449,25 @@
Source5: polkit-10-virt.rules
Source99: baselibs.conf
# Upstream patches
+Patch0: da33a1ac-lxc-init-statedir.patch
# Patches pending upstream review
+Patch100: open-ns-files-readonly.patch
# Need to go upstream
-Patch150: xen-name-for-devid.patch
-Patch151: xen-pv-cdrom.patch
-Patch152: blockcopy-check-dst-identical-device.patch
-Patch153: libvirt-power8-models.patch
-Patch154: ppc64le-canonical-name.patch
-Patch155: apparmor-fixes.patch
+Patch150: xen-pv-cdrom.patch
+Patch151: blockcopy-check-dst-identical-device.patch
+Patch152: libvirt-power8-models.patch
+Patch153: ppc64le-canonical-name.patch
+Patch154: apparmor-fixes.patch
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: libvirtd-init-script.patch
Patch202: libvirt-guests-init-script.patch
Patch203: virtlockd-init-script.patch
Patch204: suse-qemu-conf.patch
-Patch205: fix-pci-attach-xen-driver.patch
-Patch206: support-managed-pci-xen-driver.patch
-Patch207: systemd-service-xen.patch
+Patch205: support-managed-pci-xen-driver.patch
+Patch206: systemd-service-xen.patch
# Disable failing virCgroupGetPercpuStats unit test
-Patch208: disable-virCgroupGetPercpuStats-test.patch
-%ifarch ppc ppc64 ppc64le
-Patch209: disable-hugepage-test.patch
-%endif
+Patch207: disable-virCgroupGetPercpuStats-test.patch
%if %{with_apparmor}
Patch250: apparmor-no-mount.patch
Patch251: qemu-apparmor-screenshot.patch
@@ -957,8 +967,7 @@
namespaces.
%endif
-# Older version contain too old wireshark
-%if 0%{?suse_version} >= 1210
+%if %{with_wireshark}
%package -n wireshark-plugin-libvirt
Summary: Wireshark plugin for Libvirt RPC protocol
@@ -971,12 +980,13 @@
%prep
%setup -q
+%patch0 -p1
+%patch100 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
%patch153 -p1
%patch154 -p1
-%patch155 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
@@ -985,10 +995,6 @@
%patch205 -p1
%patch206 -p1
%patch207 -p1
-%patch208 -p1
-%ifarch ppc ppc64 ppc64le
-%patch209 -p1
-%endif
%if %{with_apparmor}
%patch250 -p1
%patch251 -p1
@@ -1137,6 +1143,9 @@
%if %{with_firewalld}
%define _with_firewalld --with-firewalld
%endif
+%if ! %{with_wireshark}
+ %define _without_wireshark --without-wireshark-dissector
+%endif
%if ! %{with_systemd_daemon}
%define _without_systemd_daemon --without-systemd-daemon
%endif
@@ -1194,6 +1203,7 @@
%{?_without_dtrace} \
%{?_without_driver_modules} \
%{?_with_firewalld} \
+ %{?_without_wireshark} \
%{?_without_systemd_daemon} \
--libexecdir=%{_libdir}/%{name} \
--with-qemu-user=%{qemu_user} \
@@ -1213,7 +1223,7 @@
done
cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir}
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-%if 0%{?suse_version} >= 1210
+%if %{with_wireshark}
rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
%endif
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -1340,11 +1350,9 @@
ln -s %{_sysconfdir}/init.d/libvirt-guests $RPM_BUILD_ROOT%{_sbindir}/rclibvirt-guests
%endif
mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirt-guests $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
-%if %{with_polkit}
- %if 0%{?suse_version} > 1110
+%if %{with_polkit_rules}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/
install %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/rules.d/10-virt.rules
- %endif
%endif
%fdupes -s $RPM_BUILD_ROOT
@@ -1510,9 +1518,11 @@
%dir %attr(0755, root, root) %{_libdir}/%{name}/lock-driver
%attr(0755, root, root) %{_libdir}/%{name}/lock-driver/lockd.so
%if %{with_polkit}
+ %if %{with_polkit_rules}
+%{_sysconfdir}/polkit-1/rules.d/10-virt.rules
+ %endif
%if 0%{?suse_version} > 1110
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
-%{_sysconfdir}/polkit-1/rules.d/10-virt.rules
%else
%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
%endif
@@ -1876,7 +1886,7 @@
%{_bindir}/virt-login-shell
%endif
-%if 0%{?suse_version} >= 1210
+%if %{with_wireshark}
%files -n wireshark-plugin-libvirt
%defattr(-, root, root)
++++++ apparmor-fixes.patch ++++++
--- /var/tmp/diff_new_pack.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200
+++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.13/examples/apparmor/libvirt-qemu
+Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu
===================================================================
---- libvirt-1.2.13.orig/examples/apparmor/libvirt-qemu
-+++ libvirt-1.2.13/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,
++++++ apparmor-no-mount.patch ++++++
--- /var/tmp/diff_new_pack.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200
+++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-1.2.13/examples/apparmor/libvirt-lxc
+Index: libvirt-1.2.14/examples/apparmor/libvirt-lxc
===================================================================
---- libvirt-1.2.13.orig/examples/apparmor/libvirt-lxc
-+++ libvirt-1.2.13/examples/apparmor/libvirt-lxc
+--- libvirt-1.2.14.orig/examples/apparmor/libvirt-lxc
++++ libvirt-1.2.14/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include
From da33a1ac1f6c0ae2ebe72bc385bbc7c407026956 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel
Date: Wed, 8 Apr 2015 19:16:52 +0200 Subject: [PATCH] lxc: create the required directories upon driver start
/var/run may reside on a tmpfs and we fail to create the PID file if
/var/run/lxc does not exist.
Since commit 0a8addc1, the lxc driver's state directory isn't
automatically created before starting a domain. Now, the lxc driver
makes sure the state directory exists when it initializes.
Signed-off-by: Lubomir Rintel
From cc21badc5c30ddeeb89abfa9ecdfbacd512f33c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?=
Date: Thu, 9 Apr 2015 09:22:43 +0200 Subject: [PATCH] Open /proc/PID/ns/* read-only to avoid getting permission denied
lxc-enter-namespace stopped working on recent kernels (at least 3.19+) due to /proc/PID/ns/* file descriptors being opened RW. From outside the namespace these can only be opened RO. --- src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index ab1e039..7a79970 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -628,7 +628,7 @@ int virProcessGetNamespaces(pid_t pid, ns[i]) < 0) goto cleanup; - if ((fd = open(nsfile, O_RDWR)) >= 0) { + if ((fd = open(nsfile, O_RDONLY)) >= 0) { if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { VIR_FORCE_CLOSE(fd); goto cleanup; -- 2.1.4 ++++++ ppc64le-canonical-name.patch ++++++ --- /var/tmp/diff_new_pack.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -2,10 +2,10 @@ See bnc#894956 -Index: libvirt-1.2.13/src/util/virarch.c +Index: libvirt-1.2.14/src/util/virarch.c =================================================================== ---- libvirt-1.2.13.orig/src/util/virarch.c -+++ libvirt-1.2.13/src/util/virarch.c +--- libvirt-1.2.14.orig/src/util/virarch.c ++++ libvirt-1.2.14/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.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.13/examples/apparmor/libvirt-qemu +Index: libvirt-1.2.14/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.2.13.orig/examples/apparmor/libvirt-qemu -+++ libvirt-1.2.13/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 @@ /sys/bus/ r, /sys/class/ r, ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.2.13/src/xenconfig/xen_common.c +Index: libvirt-1.2.14/src/xenconfig/xen_common.c =================================================================== ---- libvirt-1.2.13.orig/src/xenconfig/xen_common.c -+++ libvirt-1.2.13/src/xenconfig/xen_common.c -@@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe +--- libvirt-1.2.14.orig/src/xenconfig/xen_common.c ++++ libvirt-1.2.14/src/xenconfig/xen_common.c +@@ -403,6 +403,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; -@@ -422,6 +424,11 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -424,6 +426,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) { -@@ -465,10 +472,31 @@ xenParsePCI(virConfPtr conf, virDomainDe +@@ -467,10 +474,31 @@ xenParsePCI(virConfPtr conf, virDomainDe goto skippci; if (virStrToLong_i(func, NULL, 16, &funcID) < 0) goto skippci; @@ -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.13/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.13.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.13/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.14/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; -@@ -2005,11 +2008,15 @@ static void +@@ -2006,11 +2009,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -110,7 +110,7 @@ } -@@ -2028,12 +2035,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2029,12 +2036,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -123,7 +123,7 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2088,12 +2089,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, +@@ -2089,12 +2090,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.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.13/src/qemu/qemu.conf +Index: libvirt-1.2.14/src/qemu/qemu.conf =================================================================== ---- libvirt-1.2.13.orig/src/qemu/qemu.conf -+++ libvirt-1.2.13/src/qemu/qemu.conf +--- libvirt-1.2.14.orig/src/qemu/qemu.conf ++++ libvirt-1.2.14/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.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.13/daemon/libvirtd.service.in +Index: libvirt-1.2.14/daemon/libvirtd.service.in =================================================================== ---- libvirt-1.2.13.orig/daemon/libvirtd.service.in -+++ libvirt-1.2.13/daemon/libvirtd.service.in +--- libvirt-1.2.14.orig/daemon/libvirtd.service.in ++++ libvirt-1.2.14/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.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.2.13/src/locking/virtlockd.sysconf +Index: libvirt-1.2.14/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.2.13.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.2.13/src/locking/virtlockd.sysconf +--- libvirt-1.2.14.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.2.14/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.13/src/locking/virtlockd.init.in +Index: libvirt-1.2.14/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.2.13.orig/src/locking/virtlockd.init.in -+++ libvirt-1.2.13/src/locking/virtlockd.init.in +--- libvirt-1.2.14.orig/src/locking/virtlockd.init.in ++++ libvirt-1.2.14/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.3cm8jM/_old 2015-04-10 10:20:32.000000000 +0200 +++ /var/tmp/diff_new_pack.3cm8jM/_new 2015-04-10 10:20:32.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.2.13/src/xenconfig/xen_sxpr.c +Index: libvirt-1.2.14/src/xenconfig/xen_sxpr.c =================================================================== ---- libvirt-1.2.13.orig/src/xenconfig/xen_sxpr.c -+++ libvirt-1.2.13/src/xenconfig/xen_sxpr.c +--- libvirt-1.2.14.orig/src/xenconfig/xen_sxpr.c ++++ libvirt-1.2.14/src/xenconfig/xen_sxpr.c @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, static int xenParseSxprDisks(virDomainDefPtr def,