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

- Update to libvirt 1.0.5

Browse Source 
- PPC64: Add NVRAM device
  - Add XML config for resource partitions
  - Add support for TPM
  - NPIV storage migration support
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=261
This commit is contained in:
James Fehlig 2013-05-02 19:17:46 +00:00 committed by Git OBS Bridge
parent 5c86ebdada
commit 9f17752b70
17 changed files with 150 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clone.patch
View File

@ -2,7 +2,7 @@ Index: src/lxc/lxc_container.c
===================================================================
--- src/lxc/lxc_container.c.orig
+++ src/lxc/lxc_container.c
@@ -139,6 +139,7 @@ int lxcContainerHasReboot(void)
@@ -138,6 +138,7 @@ int lxcContainerHasReboot(void)
int cmd, v;
int status;
char *tmp;
@ -10,7 +10,7 @@ Index: src/lxc/lxc_container.c
if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0)
return -1;
@@ -155,14 +156,21 @@ int lxcContainerHasReboot(void)
@@ -154,14 +155,21 @@ int lxcContainerHasReboot(void)
VIR_FREE(buf);
cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF;
@ -34,7 +34,7 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack);
if (cpid < 0) {
virReportSystemError(errno, "%s",
@@ -2417,6 +2425,9 @@ int lxcContainerStart(virDomainDefPtr de
@@ -2116,6 +2124,9 @@ int lxcContainerStart(virDomainDefPtr de
ttyPaths, nttyPaths, handshakefd};
/* allocate a stack for the container */
@ -44,7 +44,7 @@ Index: src/lxc/lxc_container.c
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError();
return -1;
@@ -2436,7 +2447,11 @@ int lxcContainerStart(virDomainDefPtr de
@@ -2134,7 +2145,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@ -56,7 +56,7 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
@@ -2462,6 +2477,7 @@ int lxcContainerAvailable(int features)
@@ -2160,6 +2175,7 @@ int lxcContainerAvailable(int features)
int cpid;
char *childStack;
char *stack;
@ -64,7 +64,7 @@ Index: src/lxc/lxc_container.c
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
@@ -2469,14 +2485,21 @@ int lxcContainerAvailable(int features)
@@ -2167,14 +2183,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;

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.0.4/src/xen/xend_internal.c
Index: libvirt-1.0.5/src/xen/xend_internal.c
===================================================================
--- libvirt-1.0.4.orig/src/xen/xend_internal.c
+++ libvirt-1.0.4/src/xen/xend_internal.c
--- libvirt-1.0.5.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5/src/xen/xend_internal.c
@@ -2473,6 +2473,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80];

30
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.4/examples/apparmor/Makefile.am
Index: libvirt-1.0.5/examples/apparmor/Makefile.am
===================================================================
--- libvirt-1.0.4.orig/examples/apparmor/Makefile.am
+++ libvirt-1.0.4/examples/apparmor/Makefile.am
--- libvirt-1.0.5.orig/examples/apparmor/Makefile.am
+++ libvirt-1.0.5/examples/apparmor/Makefile.am
@@ -1,8 +1,45 @@
## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software
@ -53,10 +53,10 @@ Index: libvirt-1.0.4/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
+++ libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011
+#include <tunables/global>
@ -98,9 +98,9 @@ Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
Index: libvirt-1.0.5/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
--- libvirt-1.0.4.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
--- libvirt-1.0.5.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@ -141,9 +141,9 @@ Index: libvirt-1.0.4/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd
Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-1.0.4.orig/examples/apparmor/usr.sbin.libvirtd
--- libvirt-1.0.5.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@ -198,10 +198,10 @@ Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
-
-}
Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd.in
Index: libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
+++ libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd.in
+++ libvirt-1.0.5/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,58 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include <tunables/global>
@ -261,9 +261,9 @@ Index: libvirt-1.0.4/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+
+}
Index: libvirt-1.0.4/examples/apparmor/libvirt-qemu
Index: libvirt-1.0.5/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-1.0.4.orig/examples/apparmor/libvirt-qemu
--- libvirt-1.0.5.orig/examples/apparmor/libvirt-qemu
+++ /dev/null
@@ -1,129 +0,0 @@
-# Last Modified: Fri Mar 9 14:43:22 2012
@ -395,10 +395,10 @@ Index: libvirt-1.0.4/examples/apparmor/libvirt-qemu
-
- /usr/libexec/qemu-bridge-helper rmix,
- }
Index: libvirt-1.0.4/examples/apparmor/libvirt-qemu.in
Index: libvirt-1.0.5/examples/apparmor/libvirt-qemu.in
===================================================================
--- /dev/null
+++ libvirt-1.0.4/examples/apparmor/libvirt-qemu.in
+++ libvirt-1.0.5/examples/apparmor/libvirt-qemu.in
@@ -0,0 +1,132 @@
+# Last Modified: Fri Mar 9 14:43:22 2012
+

3
libvirt-1.0.4.tar.bz2
View File

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

3
libvirt-1.0.5.tar.bz2 Normal file
View File

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

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

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.0.4/tools/libvirt-guests.init.in
Index: libvirt-1.0.5/tools/libvirt-guests.init.in
===================================================================
--- libvirt-1.0.4.orig/tools/libvirt-guests.init.in
+++ libvirt-1.0.4/tools/libvirt-guests.init.in
--- libvirt-1.0.5.orig/tools/libvirt-guests.init.in
+++ libvirt-1.0.5/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@
# the following is the LSB init header
#
@ -28,10 +28,10 @@ Index: libvirt-1.0.4/tools/libvirt-guests.init.in
### END INIT INFO
# the following is chkconfig init header
Index: libvirt-1.0.4/tools/libvirt-guests.sh.in
Index: libvirt-1.0.5/tools/libvirt-guests.sh.in
===================================================================
--- libvirt-1.0.4.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.0.4/tools/libvirt-guests.sh.in
--- libvirt-1.0.5.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.0.5/tools/libvirt-guests.sh.in
@@ -1,13 +1,12 @@
#!/bin/sh
@ -174,23 +174,24 @@ Index: libvirt-1.0.4/tools/libvirt-guests.sh.in
else
if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then
gettext "started"; echo
- RETVAL=0
else
gettext "stopped, with no saved guests"; echo
- RETVAL=3
+ rc_failed 3
fi
- RETVAL=0
fi
}
@@ -571,4 +596,4 @@ case "$1" in
@@ -572,4 +597,4 @@ case "$1" in
usage
;;
esac
-exit $RETVAL
+rc_exit
Index: libvirt-1.0.4/tools/libvirt-guests.sysconf
Index: libvirt-1.0.5/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-1.0.4.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.0.4/tools/libvirt-guests.sysconf
--- libvirt-1.0.5.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.0.5/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests
+

48
libvirt-suse-netcontrol.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.0.4/configure.ac
Index: libvirt-1.0.5/configure.ac
===================================================================
--- libvirt-1.0.4.orig/configure.ac
+++ libvirt-1.0.4/configure.ac
@@ -153,6 +153,7 @@ LIBVIRT_CHECK_DBUS
--- libvirt-1.0.5.orig/configure.ac
+++ libvirt-1.0.5/configure.ac
@@ -159,6 +159,7 @@ LIBVIRT_CHECK_DBUS
LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_HAL
LIBVIRT_CHECK_NETCF
@ -10,7 +10,7 @@ Index: libvirt-1.0.4/configure.ac
LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS
@@ -2199,11 +2200,12 @@ if test "$with_libvirtd" = "no" ; then
@@ -2205,11 +2206,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no
fi
@ -26,7 +26,7 @@ Index: libvirt-1.0.4/configure.ac
esac
if test "$with_interface" = "yes" ; then
@@ -2473,6 +2475,7 @@ LIBVIRT_RESULT_DBUS
@@ -2488,6 +2490,7 @@ LIBVIRT_RESULT_DBUS
LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF
@ -34,11 +34,11 @@ Index: libvirt-1.0.4/configure.ac
LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.0.4/src/Makefile.am
Index: libvirt-1.0.5/src/Makefile.am
===================================================================
--- libvirt-1.0.4.orig/src/Makefile.am
+++ libvirt-1.0.4/src/Makefile.am
@@ -648,6 +648,10 @@ if WITH_NETCF
--- libvirt-1.0.5.orig/src/Makefile.am
+++ libvirt-1.0.5/src/Makefile.am
@@ -715,6 +715,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c
endif
@ -49,7 +49,7 @@ Index: libvirt-1.0.4/src/Makefile.am
if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c
@@ -1133,11 +1137,16 @@ if WITH_NETCF
@@ -1200,11 +1204,16 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else
@ -66,11 +66,11 @@ Index: libvirt-1.0.4/src/Makefile.am
if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
Index: libvirt-1.0.4/tools/virsh.c
Index: libvirt-1.0.5/tools/virsh.c
===================================================================
--- libvirt-1.0.4.orig/tools/virsh.c
+++ libvirt-1.0.4/tools/virsh.c
@@ -2800,6 +2800,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
--- libvirt-1.0.5.orig/tools/virsh.c
+++ libvirt-1.0.5/tools/virsh.c
@@ -2888,6 +2888,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
@ -79,10 +79,10 @@ Index: libvirt-1.0.4/tools/virsh.c
# elif defined(WITH_UDEV)
vshPrint(ctl, " udev");
# endif
Index: libvirt-1.0.4/src/interface/interface_backend_netcf.c
Index: libvirt-1.0.5/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-1.0.4.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.0.4/src/interface/interface_backend_netcf.c
--- libvirt-1.0.5.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.0.5/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
@ -135,7 +135,7 @@ Index: libvirt-1.0.4/src/interface/interface_backend_netcf.c
static int netcf_to_vir_err(int netcf_errcode)
{
switch (netcf_errcode)
@@ -137,6 +173,10 @@ static virDrvOpenStatus interfaceOpenInt
@@ -137,6 +173,10 @@ static virDrvOpenStatus netcfInterfaceOp
goto mutex_error;
}
@ -146,10 +146,10 @@ Index: libvirt-1.0.4/src/interface/interface_backend_netcf.c
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
Index: libvirt-1.0.4/src/interface/interface_driver.c
Index: libvirt-1.0.5/src/interface/interface_driver.c
===================================================================
--- libvirt-1.0.4.orig/src/interface/interface_driver.c
+++ libvirt-1.0.4/src/interface/interface_driver.c
--- libvirt-1.0.5.orig/src/interface/interface_driver.c
+++ libvirt-1.0.5/src/interface/interface_driver.c
@@ -28,8 +28,15 @@ interfaceRegister(void) {
if (netcfIfaceRegister() == 0)
return 0;
@ -167,10 +167,10 @@ Index: libvirt-1.0.4/src/interface/interface_driver.c
if (udevIfaceRegister() == 0)
return 0;
#endif /* WITH_UDEV */
Index: libvirt-1.0.4/m4/virt-netcontrol.m4
Index: libvirt-1.0.5/m4/virt-netcontrol.m4
===================================================================
--- /dev/null
+++ libvirt-1.0.4/m4/virt-netcontrol.m4
+++ libvirt-1.0.5/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@
+dnl The libnetcontrol library
+dnl

11
libvirt.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu May 2 13:14:00 MDT 2013 - jfehlig@suse.com
- Update to libvirt 1.0.5
- PPC64: Add NVRAM device
- Add XML config for resource partitions
- Add support for TPM
- NPIV storage migration support
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
-------------------------------------------------------------------
Tue Apr 2 15:26:18 MDT 2013 - jfehlig@suse.com

9
libvirt.spec
View File

@ -334,10 +334,16 @@ BuildRequires: sanlock-devel >= 2.4
%if %{with_systemd}
BuildRequires: systemd
%endif
%if %{with_libvirtd}
%if 0%{?suse_version} >= 1210
# For pool-build probing for existing pools
BuildRequires: libblkid-devel >= 2.17
%endif
%endif
Name: libvirt
Url: http://libvirt.org/
Version: 1.0.4
Version: 1.0.5
Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+
@ -1066,6 +1072,7 @@ fi
%{_datadir}/libvirt/schemas/storagepool.rng
%{_datadir}/libvirt/schemas/storagevol.rng
%{_datadir}/libvirt/cpu_map.xml
%{_datadir}/libvirt/libvirtLogo.png
%if %{with_sasl}
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
%endif

12
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.4/daemon/libvirtd.conf
Index: libvirt-1.0.5/daemon/libvirtd.conf
===================================================================
--- libvirt-1.0.4.orig/daemon/libvirtd.conf
+++ libvirt-1.0.4/daemon/libvirtd.conf
--- libvirt-1.0.5.orig/daemon/libvirtd.conf
+++ libvirt-1.0.5/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.0.4/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.0.4/daemon/libvirtd-config.c
Index: libvirt-1.0.5/daemon/libvirtd-config.c
===================================================================
--- libvirt-1.0.4.orig/daemon/libvirtd-config.c
+++ libvirt-1.0.4/daemon/libvirtd-config.c
--- libvirt-1.0.5.orig/daemon/libvirtd-config.c
+++ libvirt-1.0.5/daemon/libvirtd-config.c
@@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}

6
libvirtd-init-script.patch
View File

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

8
relax-qemu-usergroup-check.patch
View File

@ -7,11 +7,11 @@ drivers as loadable modules instead of built-in to the
daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration.
Index: libvirt-1.0.4/src/qemu/qemu_conf.c
Index: libvirt-1.0.5/src/qemu/qemu_conf.c
===================================================================
--- libvirt-1.0.4.orig/src/qemu/qemu_conf.c
+++ libvirt-1.0.4/src/qemu/qemu_conf.c
@@ -439,15 +439,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD
--- libvirt-1.0.5.orig/src/qemu/qemu_conf.c
+++ libvirt-1.0.5/src/qemu/qemu_conf.c
@@ -435,15 +435,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD
p = virConfGetValue(conf, "user");
CHECK_TYPE("user", VIR_CONF_STRING);

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

@ -8,15 +8,15 @@ 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.0.4/src/xenxs/xen_sxpr.c
Index: libvirt-1.0.5/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-1.0.4.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.4/src/xenxs/xen_sxpr.c
--- libvirt-1.0.5.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5/src/xenxs/xen_sxpr.c
@@ -1035,6 +1035,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID;
int slotID;
int funcID;
+ int managed;
+ bool managed;
node = cur->u.s.car;
if (!sexpr_lookup(node, "dev"))
@ -30,28 +30,29 @@ Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c
goto error;
dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
- dev->managed = 0;
+ dev->managed = managed;
- dev->managed = false;
+ dev->managed = managed ? true : false;
dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
dev->source.subsys.u.pci.domain = domainID;
dev->source.subsys.u.pci.bus = busID;
@@ -2044,11 +2047,14 @@ static void
dev->source.subsys.u.pci.addr.domain = domainID;
dev->source.subsys.u.pci.addr.bus = busID;
@@ -2042,11 +2045,15 @@ static void
xenFormatSxprPCI(virDomainHostdevDefPtr def,
virBufferPtr buf)
{
- virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x))",
+ virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x)",
def->source.subsys.u.pci.domain,
def->source.subsys.u.pci.bus,
def->source.subsys.u.pci.slot,
def->source.subsys.u.pci.function);
def->source.subsys.u.pci.addr.domain,
def->source.subsys.u.pci.addr.bus,
def->source.subsys.u.pci.addr.slot,
def->source.subsys.u.pci.addr.function);
+
+ if (def->managed)
+ virBufferAddLit(buf, "(opts (managed 1))");
+ virBufferAddLit(buf, ")");
}
@@ -2067,12 +2073,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
@@ -2065,12 +2072,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
virBufferPtr buf,
int detach)
{
@ -64,7 +65,7 @@ Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c
virBufferAddLit(buf, "(pci ");
xenFormatSxprPCI(def, buf);
if (detach)
@@ -2127,12 +2127,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
@@ -2125,12 +2126,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) {
@ -77,16 +78,16 @@ Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c
xenFormatSxprPCI(def->hostdevs[i], buf);
}
}
Index: libvirt-1.0.4/src/xenxs/xen_xm.c
Index: libvirt-1.0.5/src/xenxs/xen_xm.c
===================================================================
--- libvirt-1.0.4.orig/src/xenxs/xen_xm.c
+++ libvirt-1.0.4/src/xenxs/xen_xm.c
--- libvirt-1.0.5.orig/src/xenxs/xen_xm.c
+++ libvirt-1.0.5/src/xenxs/xen_xm.c
@@ -815,6 +815,8 @@ xenParseXM(virConfPtr conf, int xendConf
int busID;
int slotID;
int funcID;
+ char *opt;
+ int managed=0;
+ int managed = 0;
domain[0] = bus[0] = slot[0] = func[0] = '\0';
@ -129,8 +130,8 @@ Index: libvirt-1.0.4/src/xenxs/xen_xm.c
if (!(hostdev = virDomainHostdevDefAlloc()))
goto cleanup;
- hostdev->managed = 0;
+ hostdev->managed = managed;
- hostdev->managed = false;
+ hostdev->managed = managed ? true : false;
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.domain = domainID;
hostdev->source.subsys.u.pci.bus = busID;
hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID;

8
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.4/src/qemu/qemu.conf
Index: libvirt-1.0.5/src/qemu/qemu.conf
===================================================================
--- libvirt-1.0.4.orig/src/qemu/qemu.conf
+++ libvirt-1.0.4/src/qemu/qemu.conf
--- libvirt-1.0.5.orig/src/qemu/qemu.conf
+++ libvirt-1.0.5/src/qemu/qemu.conf
@@ -169,7 +169,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 @@ Index: libvirt-1.0.4/src/qemu/qemu.conf
# If set to non-zero, then the default security labeling
# will make guests confined. If set to zero, then guests
@@ -357,6 +366,15 @@
@@ -365,6 +374,15 @@
#allow_disk_format_probing = 1

12
virtlockd-init-script.patch
View File

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

35
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.0.4/src/xen/xend_internal.c
Index: libvirt-1.0.5/src/xen/xend_internal.c
===================================================================
--- libvirt-1.0.4.orig/src/xen/xend_internal.c
+++ libvirt-1.0.4/src/xen/xend_internal.c
--- libvirt-1.0.5.orig/src/xen/xend_internal.c
+++ libvirt-1.0.5/src/xen/xend_internal.c
@@ -60,8 +60,8 @@
#define XEND_RCV_BUF_MAX_LEN (256 * 1024)
@ -48,7 +48,7 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
_("requested device does not exist"));
goto cleanup;
@@ -2790,7 +2790,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE)))
VIR_DOMAIN_XML_INACTIVE)))
goto cleanup;
- if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref)))
@ -56,7 +56,7 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
@@ -3682,21 +3682,22 @@ struct xenUnifiedDriver xenDaemonDriver
@@ -3682,31 +3682,32 @@ struct xenUnifiedDriver xenDaemonDriver
/**
* virDomainXMLDevID:
* @domain: pointer to domain object
@ -83,10 +83,10 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
virDomainDeviceDefPtr dev,
char *class,
char *ref,
@@ -3704,9 +3705,11 @@ virDomainXMLDevID(virDomainPtr domain,
int ref_len)
{
xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref;
- xenUnifiedPrivatePtr priv = domain->conn->privateData;
- char *xref;
- char *tmp;
+ unsigned int i;
@ -96,7 +96,7 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
if (dev->data.disk->driverName &&
STREQ(dev->data.disk->driverName, "tap"))
strcpy(class, "tap");
@@ -3716,19 +3719,17 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3716,19 +3717,17 @@ virDomainXMLDevID(virDomainPtr domain,
else
strcpy(class, "vbd");
@ -125,15 +125,14 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
+ }
+ return -1;
} else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
char mac[30];
char mac[VIR_MAC_STRING_BUFLEN];
virDomainNetDefPtr def = dev->data.net;
@@ -3738,17 +3739,22 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3736,16 +3735,22 @@ virDomainXMLDevID(virDomainPtr domain,
strcpy(class, "vif");
- xenUnifiedLock(priv);
- xref = xenStoreDomainGetNetworkID(domain->conn, domain->id,
- mac);
- xref = xenStoreDomainGetNetworkID(domain->conn, domain->id, mac);
- xenUnifiedUnlock(priv);
- if (xref == NULL)
- return -1;
@ -161,7 +160,7 @@ Index: libvirt-1.0.4/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) {
@@ -3766,17 +3772,44 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3763,17 +3768,44 @@ virDomainXMLDevID(virDomainPtr domain,
strcpy(class, "pci");
@ -182,10 +181,10 @@ Index: libvirt-1.0.4/src/xen/xend_internal.c
+ continue;
+
+ if (virAsprintf(&dst_bdf, "%04x:%02x:%02x.%0x",
+ hostdev->source.subsys.u.pci.domain,
+ hostdev->source.subsys.u.pci.bus,
+ hostdev->source.subsys.u.pci.slot,
+ hostdev->source.subsys.u.pci.function) < 0) {
+ hostdev->source.subsys.u.pci.addr.domain,
+ hostdev->source.subsys.u.pci.addr.bus,
+ hostdev->source.subsys.u.pci.addr.slot,
+ hostdev->source.subsys.u.pci.addr.function) < 0) {
+ virReportOOMError();
+ VIR_FREE(bdf);
+ return -1;

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.0.4/src/xenxs/xen_sxpr.c
Index: libvirt-1.0.5/src/xenxs/xen_sxpr.c
===================================================================
--- libvirt-1.0.4.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.4/src/xenxs/xen_sxpr.c
--- libvirt-1.0.5.orig/src/xenxs/xen_sxpr.c
+++ libvirt-1.0.5/src/xenxs/xen_sxpr.c
@@ -341,7 +341,7 @@ error:
static int
xenParseSxprDisks(virDomainDefPtr def,