pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 288564 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 1.2.13
  - qemu: improved support for host and guest NUMA
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html

OBS-URL: https://build.opensuse.org/request/show/288564
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=439
This commit is contained in:
James Fehlig 2015-03-02 20:13:45 +00:00 committed by Git OBS Bridge
parent 919b8be388
commit b625df8512
23 changed files with 142 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/examples/apparmor/libvirt-lxc
Index: libvirt-1.2.13/examples/apparmor/libvirt-lxc
===================================================================
--- libvirt-1.2.12.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.2.12/examples/apparmor/libvirt-lxc
--- libvirt-1.2.13.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.2.13/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@
#include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
Index: libvirt-1.2.12/src/qemu/qemu_driver.c
Index: libvirt-1.2.13/src/qemu/qemu_driver.c
===================================================================
--- libvirt-1.2.12.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.12/src/qemu/qemu_driver.c
@@ -15954,6 +15954,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
--- libvirt-1.2.13.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.13/src/qemu/qemu_driver.c
@@ -16129,6 +16129,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("non-file destination not supported yet"));
}

6
disable-virCgroupGetPercpuStats-test.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/tests/vircgrouptest.c
Index: libvirt-1.2.13/tests/vircgrouptest.c
===================================================================
--- libvirt-1.2.12.orig/tests/vircgrouptest.c
+++ libvirt-1.2.12/tests/vircgrouptest.c
--- libvirt-1.2.13.orig/tests/vircgrouptest.c
+++ libvirt-1.2.13/tests/vircgrouptest.c
@@ -33,7 +33,6 @@
# include "virlog.h"
# include "virfile.h"

6
fix-pci-attach-xen-driver.patch
View File

@ -8,10 +8,10 @@ uses the 'device_configure' RPC.
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.12/src/xen/xend_internal.c
Index: libvirt-1.2.13/src/xen/xend_internal.c
===================================================================
--- libvirt-1.2.12.orig/src/xen/xend_internal.c
+++ libvirt-1.2.12/src/xen/xend_internal.c
--- libvirt-1.2.13.orig/src/xen/xend_internal.c
+++ libvirt-1.2.13/src/xen/xend_internal.c
@@ -2216,6 +2216,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];

3
libvirt-1.2.12.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eff5227f774560d97f0b44402a444e821c51e8cd44add89f74bc3c1f4dede66a
size 30710487

7
libvirt-1.2.12.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlTHRKkACgkQRga4pd6VvB9v3ACdFFlw9zp0ewEPOBt2e7cTDAL6
f7wAoJQBTFtnMKpgTMazQBUGBD9a02lb
=urda
-----END PGP SIGNATURE-----

3
libvirt-1.2.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:944163d93949db61f49eace85838b1bd55ce855e88b014df16c50fd2102bdaf6
size 30861600

7
libvirt-1.2.13.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlTz2rcACgkQRga4pd6VvB85+gCeLPbCKrp12D69dbcjucQ9JtOw
BfQAoI6GJ5ZSsudyTcIB76rt0haEA6Au
=KAmO
-----END PGP SIGNATURE-----

42
libvirt-guests-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.2.12/tools/libvirt-guests.init.in
Index: libvirt-1.2.13/tools/libvirt-guests.init.in
===================================================================
--- libvirt-1.2.12.orig/tools/libvirt-guests.init.in
+++ libvirt-1.2.12/tools/libvirt-guests.init.in
--- libvirt-1.2.13.orig/tools/libvirt-guests.init.in
+++ libvirt-1.2.13/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@ -28,10 +28,10 @@ Index: libvirt-1.2.12/tools/libvirt-guests.init.in
### END INIT INFO
# the following is chkconfig init header
Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
Index: libvirt-1.2.13/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-1.2.12.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.2.12/tools/libvirt-guests.sh.in
--- libvirt-1.2.13.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.2.13/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@
# License along with this library. If not, see
# <http://www.gnu.org/licenses/>.
@ -119,7 +119,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
return 1
fi
@@ -190,6 +211,13 @@ start() {
@@ -192,6 +213,13 @@ start() {
test_connect "$uri" || continue
@ -133,7 +133,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do
name=$(guest_name "$uri" "$guest")
@@ -403,7 +431,7 @@ shutdown_guests_parallel()
@@ -408,7 +436,7 @@ shutdown_guests_parallel()
timeout=$(($timeout - 1))
if [ $timeout -le 0 ]; then
eval_gettext "Timeout expired while shutting down domains"; echo
@ -142,7 +142,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
return
fi
else
@@ -431,7 +459,7 @@ stop() {
@@ -436,7 +464,7 @@ stop() {
if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then
gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0"
echo
@ -151,7 +151,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
return
fi
fi
@@ -479,14 +507,14 @@ stop() {
@@ -484,14 +512,14 @@ stop() {
if [ $? -ne 0 ]; then
eval_gettext "Failed to list persistent guests on \$uri"
echo
@ -168,7 +168,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
set +f
return
fi
@@ -545,14 +573,13 @@ gueststatus() {
@@ -550,14 +578,13 @@ gueststatus() {
rh_status() {
if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo
@ -185,16 +185,16 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sh.in
fi
fi
}
@@ -597,4 +624,4 @@ case "$1" in
@@ -602,4 +629,4 @@ case "$1" in
usage
;;
esac
-exit $RETVAL
+rc_exit
Index: libvirt-1.2.12/tools/libvirt-guests.sysconf
Index: libvirt-1.2.13/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-1.2.12.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.2.12/tools/libvirt-guests.sysconf
--- libvirt-1.2.13.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.2.13/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+
@ -247,7 +247,7 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sysconf
# Number of seconds we're willing to wait for a guest to shut down. If parallel
# shutdown is enabled, this timeout applies as a timeout for shutting down all
# guests on a single URI defined in the variable URIS. If this is 0, then there
@@ -35,7 +49,9 @@
@@ -35,14 +49,18 @@
# request). The default value is 300 seconds (5 minutes).
#SHUTDOWN_TIMEOUT=300
@ -258,3 +258,13 @@ Index: libvirt-1.2.12/tools/libvirt-guests.sysconf
# some file systems.
-#BYPASS_CACHE=0
+BYPASS_CACHE=0
+## Type: integer
+## Default: 0
# If non-zero, try to sync guest time on domain resume. Be aware, that
# this requires guest agent with support for time synchronization
# running in the guest. For instance, qemu-ga doesn't support guest time
# synchronization on Windows guests, but Linux ones. By default, this
# functionality is turned off.
-#SYNC_TIME=1
+SYNC_TIME=0

13
libvirt-power8-models.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.2.12/src/cpu/cpu_map.xml
Index: libvirt-1.2.13/src/cpu/cpu_map.xml
===================================================================
--- libvirt-1.2.12.orig/src/cpu/cpu_map.xml
+++ libvirt-1.2.12/src/cpu/cpu_map.xml
@@ -657,5 +657,15 @@
--- libvirt-1.2.13.orig/src/cpu/cpu_map.xml
+++ libvirt-1.2.13/src/cpu/cpu_map.xml
@@ -658,6 +658,16 @@
<pvr value='0x004d0000'/>
</model>
@ -16,5 +16,6 @@ Index: libvirt-1.2.12/src/cpu/cpu_map.xml
+ <pvr value='0x004b0201'/>
+ </model>
+
</arch>
</cpus>
<!-- Freescale-based CPU models -->
<model name='POWERPC_e5500'>
<vendor name='Freescale'/>

44
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/configure.ac
Index: libvirt-1.2.13/configure.ac
===================================================================
--- libvirt-1.2.12.orig/configure.ac
+++ libvirt-1.2.12/configure.ac
--- libvirt-1.2.13.orig/configure.ac
+++ libvirt-1.2.13/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL
@ -10,7 +10,7 @@ Index: libvirt-1.2.12/configure.ac
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
@@ -2459,11 +2460,12 @@ if test "$with_libvirtd" = "no" ; then
@@ -2466,11 +2467,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@ -26,7 +26,7 @@ Index: libvirt-1.2.12/configure.ac
esac
if test "$with_interface" = "yes" ; then
@@ -2898,6 +2900,7 @@ LIBVIRT_RESULT_FUSE
@@ -2922,6 +2924,7 @@ LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
@ -34,11 +34,11 @@ Index: libvirt-1.2.12/configure.ac
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.2.12/src/Makefile.am
Index: libvirt-1.2.13/src/Makefile.am
===================================================================
--- libvirt-1.2.12.orig/src/Makefile.am
+++ libvirt-1.2.12/src/Makefile.am
@@ -860,6 +860,10 @@ if WITH_NETCF
--- libvirt-1.2.13.orig/src/Makefile.am
+++ libvirt-1.2.13/src/Makefile.am
@@ -845,6 +845,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif WITH_NETCF
@ -49,7 +49,7 @@ Index: libvirt-1.2.12/src/Makefile.am
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
@@ -1508,10 +1512,15 @@ if WITH_NETCF
@@ -1457,10 +1461,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF
@ -65,11 +65,11 @@ Index: libvirt-1.2.12/src/Makefile.am
endif ! WITH_NETCF
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
Index: libvirt-1.2.12/tools/virsh.c
Index: libvirt-1.2.13/tools/virsh.c
===================================================================
--- libvirt-1.2.12.orig/tools/virsh.c
+++ libvirt-1.2.12/tools/virsh.c
@@ -3348,6 +3348,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
--- libvirt-1.2.13.orig/tools/virsh.c
+++ libvirt-1.2.13/tools/virsh.c
@@ -3360,6 +3360,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@ -78,10 +78,10 @@ Index: libvirt-1.2.12/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
Index: libvirt-1.2.12/src/interface/interface_backend_netcf.c
Index: libvirt-1.2.13/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-1.2.12.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.2.12/src/interface/interface_backend_netcf.c
--- libvirt-1.2.13.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.2.13/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
@ -165,10 +165,10 @@ Index: libvirt-1.2.12/src/interface/interface_backend_netcf.c
return 0;
}
Index: libvirt-1.2.12/src/interface/interface_driver.c
Index: libvirt-1.2.13/src/interface/interface_driver.c
===================================================================
--- libvirt-1.2.12.orig/src/interface/interface_driver.c
+++ libvirt-1.2.12/src/interface/interface_driver.c
--- libvirt-1.2.13.orig/src/interface/interface_driver.c
+++ libvirt-1.2.13/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0)
return 0;
@ -186,10 +186,10 @@ Index: libvirt-1.2.12/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
Index: libvirt-1.2.12/m4/virt-netcontrol.m4
Index: libvirt-1.2.13/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
+++ libvirt-1.2.12/m4/virt-netcontrol.m4
+++ libvirt-1.2.13/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl

8
libvirt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Mar 2 12:05:43 MST 2015 - jfehlig@suse.com
- Update to libvirt 1.2.13
- qemu: improved support for host and guest NUMA
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
-------------------------------------------------------------------
Tue Jan 27 15:45:56 MST 2015 - jfehlig@suse.com

8
libvirt.spec
View File

@ -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
@ -235,7 +235,7 @@
Name: libvirt
Url: http://libvirt.org/
Version: 1.2.12
Version: 1.2.13
Release: 0
Summary: Library providing a simple virtualization API
License: LGPL-2.1+
@ -956,6 +956,7 @@ namespaces.
# Older version contain too old wireshark
%if 0%{?suse_version} >= 1210
%package -n wireshark-plugin-libvirt
Summary: Wireshark plugin for Libvirt RPC protocol
Group: Productivity/Networking/Diagnostic
@ -1714,8 +1715,6 @@ fi
%files daemon-driver-vbox
%defattr(-, root, root)
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_network.so
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_storage.so
%endif
%endif # with_driver_modules
@ -1867,6 +1866,7 @@ fi
%endif
%if 0%{?suse_version} >= 1210
%files -n wireshark-plugin-libvirt
%defattr(-, root, root)
%{_libdir}/wireshark/plugins/*/libvirt.so

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/daemon/libvirtd.conf
Index: libvirt-1.2.13/daemon/libvirtd.conf
===================================================================
--- libvirt-1.2.12.orig/daemon/libvirtd.conf
+++ libvirt-1.2.12/daemon/libvirtd.conf
--- libvirt-1.2.13.orig/daemon/libvirtd.conf
+++ libvirt-1.2.13/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 @@ Index: libvirt-1.2.12/daemon/libvirtd.conf
# 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.12/daemon/libvirtd-config.c
Index: libvirt-1.2.13/daemon/libvirtd-config.c
===================================================================
--- libvirt-1.2.12.orig/daemon/libvirtd-config.c
+++ libvirt-1.2.12/daemon/libvirtd-config.c
--- libvirt-1.2.13.orig/daemon/libvirtd-config.c
+++ libvirt-1.2.13/daemon/libvirtd-config.c
@@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
@ -26,10 +26,10 @@ Index: libvirt-1.2.12/daemon/libvirtd-config.c
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-1.2.12/daemon/test_libvirtd.aug.in
Index: libvirt-1.2.13/daemon/test_libvirtd.aug.in
===================================================================
--- libvirt-1.2.12.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.2.12/daemon/test_libvirtd.aug.in
--- libvirt-1.2.13.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.2.13/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::

6
libvirtd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-1.2.12/daemon/libvirtd.sysconf
Index: libvirt-1.2.13/daemon/libvirtd.sysconf
===================================================================
--- libvirt-1.2.12.orig/daemon/libvirtd.sysconf
+++ libvirt-1.2.12/daemon/libvirtd.sysconf
--- libvirt-1.2.13.orig/daemon/libvirtd.sysconf
+++ libvirt-1.2.13/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956
Index: libvirt-1.2.12/src/util/virarch.c
Index: libvirt-1.2.13/src/util/virarch.c
===================================================================
--- libvirt-1.2.12.orig/src/util/virarch.c
+++ libvirt-1.2.12/src/util/virarch.c
--- libvirt-1.2.13.orig/src/util/virarch.c
+++ libvirt-1.2.13/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/examples/apparmor/libvirt-qemu
Index: libvirt-1.2.13/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-1.2.12.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.2.12/examples/apparmor/libvirt-qemu
--- libvirt-1.2.13.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.2.13/examples/apparmor/libvirt-qemu
@@ -124,6 +124,9 @@
/sys/bus/ r,
/sys/class/ r,

12
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-1.2.12/src/xenconfig/xen_common.c
Index: libvirt-1.2.13/src/xenconfig/xen_common.c
===================================================================
--- libvirt-1.2.12.orig/src/xenconfig/xen_common.c
+++ libvirt-1.2.12/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
{
virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-1.2.12/src/xenconfig/xen_common.c
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.12/src/xenconfig/xen_sxpr.c
Index: libvirt-1.2.13/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.2.12.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.12/src/xenconfig/xen_sxpr.c
--- libvirt-1.2.13.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.13/src/xenconfig/xen_sxpr.c
@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;

14
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/src/qemu/qemu.conf
Index: libvirt-1.2.13/src/qemu/qemu.conf
===================================================================
--- libvirt-1.2.12.orig/src/qemu/qemu.conf
+++ libvirt-1.2.12/src/qemu/qemu.conf
--- libvirt-1.2.13.orig/src/qemu/qemu.conf
+++ libvirt-1.2.13/src/qemu/qemu.conf
@@ -204,7 +204,7 @@
# If set to non-zero, then the default security labeling
@ -39,11 +39,11 @@ Index: libvirt-1.2.12/src/qemu/qemu.conf
#
#lock_manager = "lockd"
Index: libvirt-1.2.12/src/qemu/qemu_conf.c
Index: libvirt-1.2.13/src/qemu/qemu_conf.c
===================================================================
--- libvirt-1.2.12.orig/src/qemu/qemu_conf.c
+++ libvirt-1.2.12/src/qemu/qemu_conf.c
@@ -249,7 +249,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
--- libvirt-1.2.13.orig/src/qemu/qemu_conf.c
+++ libvirt-1.2.13/src/qemu/qemu_conf.c
@@ -293,7 +293,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
cfg->clearEmulatorCapabilities = true;

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/daemon/libvirtd.service.in
Index: libvirt-1.2.13/daemon/libvirtd.service.in
===================================================================
--- libvirt-1.2.12.orig/daemon/libvirtd.service.in
+++ libvirt-1.2.12/daemon/libvirtd.service.in
--- libvirt-1.2.13.orig/daemon/libvirtd.service.in
+++ libvirt-1.2.13/daemon/libvirtd.service.in
@@ -5,6 +5,8 @@ After=network.target
After=dbus.service
After=iscsid.service

12
virtlockd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards
Index: libvirt-1.2.12/src/locking/virtlockd.sysconf
Index: libvirt-1.2.13/src/locking/virtlockd.sysconf
===================================================================
--- libvirt-1.2.12.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.2.12/src/locking/virtlockd.sysconf
--- libvirt-1.2.13.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.2.13/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd
+
@ -12,10 +12,10 @@ Index: libvirt-1.2.12/src/locking/virtlockd.sysconf
#
# Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS=
Index: libvirt-1.2.12/src/locking/virtlockd.init.in
Index: libvirt-1.2.13/src/locking/virtlockd.init.in
===================================================================
--- libvirt-1.2.12.orig/src/locking/virtlockd.init.in
+++ libvirt-1.2.12/src/locking/virtlockd.init.in
--- libvirt-1.2.13.orig/src/locking/virtlockd.init.in
+++ libvirt-1.2.13/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
#

17
xen-name-for-devid.patch
View File

@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is
inactive.
Index: libvirt-1.2.12/src/xen/xend_internal.c
Index: libvirt-1.2.13/src/xen/xend_internal.c
===================================================================
--- libvirt-1.2.12.orig/src/xen/xend_internal.c
+++ libvirt-1.2.12/src/xen/xend_internal.c
--- libvirt-1.2.13.orig/src/xen/xend_internal.c
+++ libvirt-1.2.13/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 @@ Index: libvirt-1.2.12/src/xen/xend_internal.c
virDomainDeviceDefPtr dev, char *class,
char *ref, int ref_len);
@@ -3319,37 +3319,35 @@ xenDaemonDomainBlockPeek(virConnectPtr c
@@ -3319,18 +3319,18 @@ xenDaemonDomainBlockPeek(virConnectPtr c
* Returns 0 in case of success, -1 in case of failure.
*/
static int
@ -43,13 +43,14 @@ Index: libvirt-1.2.12/src/xen/xend_internal.c
- char *xref;
- char *tmp;
+ size_t i;
const char *driver = virDomainDiskGetDriver(dev->data.disk);
if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
+ if (dev->data.disk->dst == NULL)
+ return -1;
const char *driver = virDomainDiskGetDriver(dev->data.disk);
if (STREQ_NULLABLE(driver, "tap") || STREQ_NULLABLE(driver, "tap2"))
strcpy(class, driver);
@@ -3338,19 +3338,17 @@ virDomainXMLDevID(virConnectPtr conn,
else
strcpy(class, "vbd");
@ -80,7 +81,7 @@ Index: libvirt-1.2.12/src/xen/xend_internal.c
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
char mac[VIR_MAC_STRING_BUFLEN];
virDomainNetDefPtr netdef = dev->data.net;
@@ -3357,16 +3355,22 @@ virDomainXMLDevID(virConnectPtr conn,
@@ -3358,16 +3356,22 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "vif");
@ -113,7 +114,7 @@ Index: libvirt-1.2.12/src/xen/xend_internal.c
} 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) {
@@ -3382,17 +3386,43 @@ virDomainXMLDevID(virConnectPtr conn,
@@ -3383,17 +3387,43 @@ virDomainXMLDevID(virConnectPtr conn,
strcpy(class, "pci");

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.12/src/xenconfig/xen_sxpr.c
Index: libvirt-1.2.13/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.2.12.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.12/src/xenconfig/xen_sxpr.c
--- libvirt-1.2.13.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.13/src/xenconfig/xen_sxpr.c
@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
static int
xenParseSxprDisks(virDomainDefPtr def,