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

- Temporarily disable building libxl driver. The current

Browse Source 
implementation does not support libxl in Xen 4.2.

- Update to libvirt 0.10.2
  - network: define new API virNetworkUpdate
  - add support for QEmu sandbox support
  - blockjob: add virDomainBlockCommit
  - node_memory: Define the APIs to get/set memory parameters
  - list: Define new API virConnectListAllSecrets
  - list: Define new API virConnectListAllNWFilter
  - list: Define new API virConnectListAllNodeDevices
  - list: Define new API virConnectListAllInterfaces
  - list: Define new API virConnectListAllNetworks
  - list: Define new API virStoragePoolListAllVolumes
  - list: Define new API virStorageListAllStoragePools
  - parallels: add support of containers to the driver
  - Add PMSUSPENDED life cycle event
  - Add per-guest S3/S4 state configuration
  - qemu: Support for Block Device IO Limits

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=227
This commit is contained in:
James Fehlig 2012-09-25 22:22:08 +00:00 committed by Git OBS Bridge
parent 0027057c64
commit 794d4df5d5
14 changed files with 141 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AF_PACKET.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-0.10.1/src/util/virnetdev.c
Index: libvirt-0.10.2/src/util/virnetdev.c
===================================================================
--- libvirt-0.10.1.orig/src/util/virnetdev.c
+++ libvirt-0.10.1/src/util/virnetdev.c
@@ -83,7 +83,7 @@ static int virNetDevSetupControlFull(con
--- libvirt-0.10.2.orig/src/util/virnetdev.c
+++ libvirt-0.10.2/src/util/virnetdev.c
@@ -81,7 +81,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)
{
@ -11,10 +11,10 @@ Index: libvirt-0.10.1/src/util/virnetdev.c
}
#endif
Index: libvirt-0.10.1/src/util/virnetdevbridge.c
Index: libvirt-0.10.2/src/util/virnetdevbridge.c
===================================================================
--- libvirt-0.10.1.orig/src/util/virnetdevbridge.c
+++ libvirt-0.10.1/src/util/virnetdevbridge.c
--- libvirt-0.10.2.orig/src/util/virnetdevbridge.c
+++ libvirt-0.10.2/src/util/virnetdevbridge.c
@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr)

8
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
@@ -1890,6 +1890,9 @@ int lxcContainerStart(virDomainDefPtr de
@@ -1932,6 +1932,9 @@ int lxcContainerStart(virDomainDefPtr de
ttyPaths, nttyPaths, handshakefd};
/* allocate a stack for the container */
@ -12,7 +12,7 @@ Index: src/lxc/lxc_container.c
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError();
return -1;
@@ -1909,7 +1912,11 @@ int lxcContainerStart(virDomainDefPtr de
@@ -1951,7 +1954,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@ -24,7 +24,7 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
@@ -1935,6 +1942,7 @@ int lxcContainerAvailable(int features)
@@ -1977,6 +1984,7 @@ int lxcContainerAvailable(int features)
int cpid;
char *childStack;
char *stack;
@ -32,7 +32,7 @@ Index: src/lxc/lxc_container.c
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
@@ -1942,14 +1950,21 @@ int lxcContainerAvailable(int features)
@@ -1984,14 +1992,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;

28
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.10.1/examples/apparmor/Makefile.am
Index: libvirt-0.10.2/examples/apparmor/Makefile.am
===================================================================
--- libvirt-0.10.1.orig/examples/apparmor/Makefile.am
+++ libvirt-0.10.1/examples/apparmor/Makefile.am
--- libvirt-0.10.2.orig/examples/apparmor/Makefile.am
+++ libvirt-0.10.2/examples/apparmor/Makefile.am
@@ -1,8 +1,39 @@
## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software
@ -47,10 +47,10 @@ Index: libvirt-0.10.1/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+
+endif
Index: libvirt-0.10.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
===================================================================
--- /dev/null
+++ libvirt-0.10.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+++ libvirt-0.10.2/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>
@ -92,9 +92,9 @@ Index: libvirt-0.10.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r,
+}
Index: libvirt-0.10.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper
===================================================================
--- libvirt-0.10.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
--- libvirt-0.10.2.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010
@ -135,9 +135,9 @@ Index: libvirt-0.10.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r,
-}
Index: libvirt-0.10.1/examples/apparmor/usr.sbin.libvirtd
Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd
===================================================================
--- libvirt-0.10.1.orig/examples/apparmor/usr.sbin.libvirtd
--- libvirt-0.10.2.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null
@@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010
@ -192,10 +192,10 @@ Index: libvirt-0.10.1/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-0.10.1/examples/apparmor/usr.sbin.libvirtd.in
Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd.in
===================================================================
--- /dev/null
+++ libvirt-0.10.1/examples/apparmor/usr.sbin.libvirtd.in
+++ libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,57 @@
+# Last Modified: Fri Aug 19 11:20:36 2011
+#include <tunables/global>
@ -254,10 +254,10 @@ Index: libvirt-0.10.1/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-0.10.1/examples/apparmor/libvirt-qemu
Index: libvirt-0.10.2/examples/apparmor/libvirt-qemu
===================================================================
--- libvirt-0.10.1.orig/examples/apparmor/libvirt-qemu
+++ libvirt-0.10.1/examples/apparmor/libvirt-qemu
--- libvirt-0.10.2.orig/examples/apparmor/libvirt-qemu
+++ libvirt-0.10.2/examples/apparmor/libvirt-qemu
@@ -52,6 +52,7 @@
# access to firmware's etc
/usr/share/kvm/** r,

3
libvirt-0.10.1.tar.bz2
View File

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

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

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

117
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.10.1/configure.ac
Index: libvirt-0.10.2/configure.ac
===================================================================
--- libvirt-0.10.1.orig/configure.ac
+++ libvirt-0.10.1/configure.ac
--- libvirt-0.10.2.orig/configure.ac
+++ libvirt-0.10.2/configure.ac
@@ -102,6 +102,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
@ -10,7 +10,7 @@ Index: libvirt-0.10.1/configure.ac
UDEV_REQUIRED=145
PCIACCESS_REQUIRED=0.10.0
XMLRPC_REQUIRED=1.14.0
@@ -1967,6 +1968,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
@@ -1948,6 +1949,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
AC_SUBST([NETCF_CFLAGS])
AC_SUBST([NETCF_LIBS])
@ -49,15 +49,7 @@ Index: libvirt-0.10.1/configure.ac
AC_ARG_WITH([secrets],
AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
@@ -3018,6 +3051,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
AC_MSG_NOTICE([ Network: $with_network])
AC_MSG_NOTICE([ Libvirtd: $with_libvirtd])
AC_MSG_NOTICE([ netcf: $with_netcf])
+AC_MSG_NOTICE([ netctrl: $with_netcontrol])
AC_MSG_NOTICE([ macvtap: $with_macvtap])
AC_MSG_NOTICE([ virtport: $with_virtualport])
AC_MSG_NOTICE([])
@@ -3152,6 +3186,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
@@ -3183,6 +3216,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
else
AC_MSG_NOTICE([ netcf: no])
fi
@ -69,52 +61,11 @@ Index: libvirt-0.10.1/configure.ac
if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
else
Index: libvirt-0.10.1/daemon/Makefile.am
Index: libvirt-0.10.2/src/Makefile.am
===================================================================
--- libvirt-0.10.1.orig/daemon/Makefile.am
+++ libvirt-0.10.1/daemon/Makefile.am
@@ -153,6 +153,10 @@ endif
if WITH_NETCF
libvirtd_LDADD += ../src/libvirt_driver_interface.la
+else
+if WITH_NETCONTROL
+ libvirtd_LDADD += ../src/libvirt_driver_interface.la
+endif
endif
if WITH_NODE_DEVICES
Index: libvirt-0.10.1/daemon/libvirtd.c
===================================================================
--- libvirt-0.10.1.orig/daemon/libvirtd.c
+++ libvirt-0.10.1/daemon/libvirtd.c
@@ -80,6 +80,10 @@
# endif
# ifdef WITH_NETCF
# include "interface/netcf_driver.h"
+# else
+# ifdef WITH_NETCONTROL
+# include "interface/netcf_driver.h"
+# endif
# endif
# ifdef WITH_STORAGE
# include "storage/storage_driver.h"
@@ -406,6 +410,10 @@ static void daemonInitialize(void)
# endif
# ifdef WITH_NETCF
interfaceRegister();
+#else
+# ifdef WITH_NETCONTROL
+ interfaceRegister();
+# endif
# endif
# ifdef WITH_STORAGE
storageRegister();
Index: libvirt-0.10.1/src/Makefile.am
===================================================================
--- libvirt-0.10.1.orig/src/Makefile.am
+++ libvirt-0.10.1/src/Makefile.am
@@ -1034,6 +1034,24 @@ libvirt_driver_interface_la_LIBADD += ..
--- libvirt-0.10.2.orig/src/Makefile.am
+++ libvirt-0.10.2/src/Makefile.am
@@ -1050,6 +1050,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
@ -139,25 +90,40 @@ Index: libvirt-0.10.1/src/Makefile.am
endif
if WITH_SECRETS
Index: libvirt-0.10.1/src/interface/netcf_driver.c
Index: libvirt-0.10.2/tools/virsh.c
===================================================================
--- libvirt-0.10.1.orig/src/interface/netcf_driver.c
+++ libvirt-0.10.1/src/interface/netcf_driver.c
@@ -23,7 +23,13 @@
--- libvirt-0.10.2.orig/tools/virsh.c
+++ libvirt-0.10.2/tools/virsh.c
@@ -2708,6 +2708,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf");
+# else
+# ifdef WITH_NETCONTROL
+ vshPrint(ctl, " Interface");
+# endif
# endif
#endif
#ifdef WITH_NWFILTER
Index: libvirt-0.10.2/src/interface/interface_backend_netcf.c
===================================================================
--- libvirt-0.10.2.orig/src/interface/interface_backend_netcf.c
+++ libvirt-0.10.2/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@
#include <config.h>
-#include <netcf.h>
+#ifdef WITH_NETCONTROL
+#include <netcontrol/netcf.h>
+#include <netcontrol/logger.h>
+#include "logging.h"
+# include <netcontrol/netcf.h>
+# include <netcontrol/logger.h>
+#else
#include <netcf.h>
+# include <netcf.h>
+#endif
#include "virterror_internal.h"
#include "datatypes.h"
@@ -51,6 +57,39 @@ static void interfaceDriverUnlock(struct
@@ -52,6 +57,39 @@ static void interfaceDriverUnlock(struct
virMutexUnlock(&driver->lock);
}
@ -197,7 +163,7 @@ Index: libvirt-0.10.1/src/interface/netcf_driver.c
static int netcf_to_vir_err(int netcf_errcode)
{
switch (netcf_errcode)
@@ -136,6 +175,10 @@ static virDrvOpenStatus interfaceOpenInt
@@ -137,6 +175,10 @@ static virDrvOpenStatus interfaceOpenInt
goto mutex_error;
}
@ -208,18 +174,3 @@ Index: libvirt-0.10.1/src/interface/netcf_driver.c
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
Index: libvirt-0.10.1/tools/virsh.c
===================================================================
--- libvirt-0.10.1.orig/tools/virsh.c
+++ libvirt-0.10.1/tools/virsh.c
@@ -2645,6 +2645,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
#endif
#ifdef WITH_NETCF
vshPrint(ctl, " Interface");
+#else
+# ifdef WITH_NETCONTROL
+ vshPrint(ctl, " Interface");
+# endif
#endif
#ifdef WITH_NWFILTER
vshPrint(ctl, " Nwfilter");

26
libvirt.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Tue Sep 25 16:20:43 MDT 2012 - jfehlig@suse.com
- Temporarily disable building libxl driver. The current
implementation does not support libxl in Xen 4.2.
-------------------------------------------------------------------
Tue Sep 25 16:17:29 MDT 2012 - jfehlig@suse.com
- Update to libvirt 0.10.2
- network: define new API virNetworkUpdate
- add support for QEmu sandbox support
- blockjob: add virDomainBlockCommit
- node_memory: Define the APIs to get/set memory parameters
- list: Define new API virConnectListAllSecrets
- list: Define new API virConnectListAllNWFilter
- list: Define new API virConnectListAllNodeDevices
- list: Define new API virConnectListAllInterfaces
- list: Define new API virConnectListAllNetworks
- list: Define new API virStoragePoolListAllVolumes
- list: Define new API virStorageListAllStoragePools
- parallels: add support of containers to the driver
- Add PMSUSPENDED life cycle event
- Add per-guest S3/S4 state configuration
- qemu: Support for Block Device IO Limits
-------------------------------------------------------------------
Fri Sep 7 13:42:10 MDT 2012 - jfehlig@suse.com

13
libvirt.spec
View File

@ -95,11 +95,9 @@
%define with_libxl 0
%endif
# libxenlight driver requires Xen >= 4.1, which is only
# available in openSUSE >= 12.1 or SLE >= 11sp2
%if 0%{?suse_version} < 1210
# Temporarily disable building the libxl driver since the current
# implementation only works with Xen 4.1
%define with_libxl 0
%endif
# numactl only on x86_64 and ia64
%ifnarch x86_64 ia64
@ -140,7 +138,7 @@
%if 0%{?suse_version} >= 1210
%define with_netcontrol 0%{!?_without_netcontrol:%{server_drivers}}
%endif
%define with_netcontrol 1
# libcapng is used to manage capabilities in 11.3 or newer.
# It is also used by lxc and needs to be enabled if lxc is enabled.
%if 0%{?suse_version} >= 1130 || %{with_lxc}
@ -330,7 +328,7 @@ BuildRequires: systemd
Name: libvirt
Url: http://libvirt.org/
Version: 0.10.1
Version: 0.10.2
Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+
@ -429,6 +427,8 @@ Patch250: install-apparmor-profiles.patch
%if %{with_netcontrol}
Patch300: libvirt-suse-netcontrol.patch
%endif
# Temporary patch to disable building libxl driver on Xen >= 4.2
#Patch500: xen-4.2-libxl-disable.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -562,6 +562,7 @@ Authors:
%if %{with_netcontrol}
%patch300 -p1
%endif
#%patch500 -p1
%build
%if ! %{with_xen}

12
libvirtd-defaults.patch
View File

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

10
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-0.10.1/src/qemu/qemu_conf.c
Index: libvirt-0.10.2/src/qemu/qemu_conf.c
===================================================================
--- libvirt-0.10.1.orig/src/qemu/qemu_conf.c
+++ libvirt-0.10.1/src/qemu/qemu_conf.c
@@ -349,9 +349,7 @@ int qemudLoadDriverConfig(struct qemud_d
--- libvirt-0.10.2.orig/src/qemu/qemu_conf.c
+++ libvirt-0.10.2/src/qemu/qemu_conf.c
@@ -350,9 +350,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}
if (virGetUserID(user, &driver->user) < 0) {
@ -22,7 +22,7 @@ Index: libvirt-0.10.1/src/qemu/qemu_conf.c
}
VIR_FREE(user);
@@ -364,9 +362,7 @@ int qemudLoadDriverConfig(struct qemud_d
@@ -365,9 +363,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}
if (virGetGroupID(group, &driver->group) < 0) {

16
suse-qemu-conf.patch
View File

@ -1,10 +1,10 @@
Index: libvirt-0.10.1/src/qemu/qemu.conf
Index: libvirt-0.10.2/src/qemu/qemu.conf
===================================================================
--- libvirt-0.10.1.orig/src/qemu/qemu.conf
+++ libvirt-0.10.1/src/qemu/qemu.conf
@@ -166,7 +166,16 @@
#
# Note: The DAC security driver is always enabled.
--- libvirt-0.10.2.orig/src/qemu/qemu.conf
+++ libvirt-0.10.2/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.
#
+# SUSE Note:
+# Currently, Apparmor is the default security framework in SUSE
@ -14,12 +14,12 @@ Index: libvirt-0.10.1/src/qemu/qemu.conf
+# confinement of qemu instances.
+#
#security_driver = "selinux"
+# security_driver = "apparmor"
+#security_driver = "apparmor"
+security_driver = "none"
# If set to non-zero, then the default security labeling
# will make guests confined. If set to zero, then guests
@@ -339,6 +348,15 @@
@@ -342,6 +351,15 @@
#allow_disk_format_probing = 1

30
use-init-script-redhat.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.10.1/tools/Makefile.am
Index: libvirt-0.10.2/tools/Makefile.am
===================================================================
--- libvirt-0.10.1.orig/tools/Makefile.am
+++ libvirt-0.10.1/tools/Makefile.am
--- libvirt-0.10.2.orig/tools/Makefile.am
+++ libvirt-0.10.2/tools/Makefile.am
@@ -169,24 +169,22 @@ install-data-local: install-init install
uninstall-local: uninstall-init uninstall-systemd
@ -33,10 +33,10 @@ Index: libvirt-0.10.1/tools/Makefile.am
if LIBVIRT_INIT_SCRIPT_RED_HAT
Index: libvirt-0.10.1/tools/libvirt-guests.sysconf
Index: libvirt-0.10.2/tools/libvirt-guests.sysconf
===================================================================
--- libvirt-0.10.1.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.10.1/tools/libvirt-guests.sysconf
--- libvirt-0.10.2.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.10.2/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt
+
@ -101,10 +101,10 @@ Index: libvirt-0.10.1/tools/libvirt-guests.sysconf
# some file systems.
-#BYPASS_CACHE=0
+BYPASS_CACHE=0
Index: libvirt-0.10.1/tools/libvirt-guests.init.sh
Index: libvirt-0.10.2/tools/libvirt-guests.init.sh
===================================================================
--- libvirt-0.10.1.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.10.1/tools/libvirt-guests.init.sh
--- libvirt-0.10.2.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.10.2/tools/libvirt-guests.init.sh
@@ -4,10 +4,10 @@
#
### BEGIN INIT INFO
@ -252,10 +252,10 @@ Index: libvirt-0.10.1/tools/libvirt-guests.init.sh
esac
-exit $RETVAL
+rc_exit
Index: libvirt-0.10.1/daemon/Makefile.am
Index: libvirt-0.10.2/daemon/Makefile.am
===================================================================
--- libvirt-0.10.1.orig/daemon/Makefile.am
+++ libvirt-0.10.1/daemon/Makefile.am
--- libvirt-0.10.2.orig/daemon/Makefile.am
+++ libvirt-0.10.2/daemon/Makefile.am
@@ -259,39 +259,23 @@ uninstall-logrotate:
rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
@ -300,10 +300,10 @@ Index: libvirt-0.10.1/daemon/Makefile.am
else
install-init-redhat:
uninstall-init-redhat:
Index: libvirt-0.10.1/daemon/libvirtd.sysconf
Index: libvirt-0.10.2/daemon/libvirtd.sysconf
===================================================================
--- libvirt-0.10.1.orig/daemon/libvirtd.sysconf
+++ libvirt-0.10.1/daemon/libvirtd.sysconf
--- libvirt-0.10.2.orig/daemon/libvirtd.sysconf
+++ libvirt-0.10.2/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt
+

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

@ -13,10 +13,10 @@ Date: Wed Jan 27 16:11:41 2010 -0700
This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive.
Index: libvirt-0.10.1/src/xen/xend_internal.c
Index: libvirt-0.10.2/src/xen/xend_internal.c
===================================================================
--- libvirt-0.10.1.orig/src/xen/xend_internal.c
+++ libvirt-0.10.1/src/xen/xend_internal.c
--- libvirt-0.10.2.orig/src/xen/xend_internal.c
+++ libvirt-0.10.2/src/xen/xend_internal.c
@@ -61,6 +61,7 @@
static int
@ -25,7 +25,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
virDomainDeviceDefPtr dev,
char *class,
char *ref,
@@ -2762,7 +2763,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
@@ -2764,7 +2765,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@ -34,7 +34,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
/* device doesn't exist, define it */
ret = xend_op(domain->conn, domain->name, "op", "device_create",
"config", sexpr, NULL);
@@ -2883,7 +2884,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
@@ -2885,7 +2886,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@ -43,7 +43,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("requested device does not exist"));
goto cleanup;
@@ -2978,7 +2979,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
@@ -2980,7 +2981,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE)))
goto cleanup;
@ -52,7 +52,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
@@ -3924,6 +3925,7 @@ struct xenUnifiedDriver xenDaemonDriver
@@ -3926,6 +3927,7 @@ struct xenUnifiedDriver xenDaemonDriver
*/
static int
virDomainXMLDevID(virDomainPtr domain,
@ -60,7 +60,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
virDomainDeviceDefPtr dev,
char *class,
char *ref,
@@ -3932,8 +3934,12 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3934,8 +3936,12 @@ virDomainXMLDevID(virDomainPtr domain,
xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref;
char *tmp;
@ -73,7 +73,7 @@ Index: libvirt-0.10.1/src/xen/xend_internal.c
if (dev->data.disk->driverName &&
STREQ(dev->data.disk->driverName, "tap"))
strcpy(class, "tap");
@@ -3943,19 +3949,21 @@ virDomainXMLDevID(virDomainPtr domain,
@@ -3945,19 +3951,21 @@ virDomainXMLDevID(virDomainPtr domain,
else
strcpy(class, "vbd");

6
xen-pv-cdrom.patch
View File

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