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

- Update to libvirt 0.9.1 RC2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=117
This commit is contained in:
James Fehlig 2011-05-04 21:55:21 +00:00 committed by Git OBS Bridge
parent 914265551a
commit 8603b1dd01
11 changed files with 59 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
2999bb06-iohelper-libvirtd.patch
View File

@ -1,33 +0,0 @@
commit 2999bb06f3fd448c65eba59a2f20128c9e46bf01
Author: Wen Congyang <wency@cn.fujitsu.com>
Date: Fri Apr 8 11:26:47 2011 +0800
do not build libvirt_iohelper when building without libvirtd
The libexec program libvirt_iohelper is only for libvirtd. If we build rpm
without libvirtd, we will receive the following messages:
Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/wency/rpmbuild/BUILDROOT/libvirt-0.9.0-1.el6.x86_64
error: Installed (but unpackaged) file(s) found:
/usr/libexec/libvirt_iohelper
diff --git a/src/Makefile.am b/src/Makefile.am
index 3649106..dce866e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1183,6 +1183,7 @@ EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE)
libexec_PROGRAMS =
+if WITH_LIBVIRTD
libexec_PROGRAMS += libvirt_iohelper
libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
libvirt_iohelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS)
@@ -1191,6 +1192,7 @@ libvirt_iohelper_LDADD = \
../gnulib/lib/libgnu.la
libvirt_iohelper_CFLAGS = $(AM_CFLAGS)
+endif
if WITH_STORAGE_DISK
if WITH_LIBVIRTD

4
clone.patch
View File

@ -24,7 +24,7 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack); VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid); VIR_DEBUG("clone() completed, new container PID is %d", pid);
@@ -927,6 +934,7 @@ int lxcContainerAvailable(int features) @@ -928,6 +935,7 @@ int lxcContainerAvailable(int features)
char *childStack; char *childStack;
char *stack; char *stack;
int childStatus; int childStatus;
@ -32,7 +32,7 @@ Index: src/lxc/lxc_container.c
if (features & LXC_CONTAINER_FEATURE_USER) if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER; flags |= CLONE_NEWUSER;
@@ -934,14 +942,21 @@ int lxcContainerAvailable(int features) @@ -935,14 +943,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET) if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET; flags |= CLONE_NEWNET;

28
f7e9b448-libxl-build.patch
View File

@ -1,28 +0,0 @@
commit f7e9b44812b3d3d8b16952d344eda187cb174c82
Author: Jim Fehlig <jfehlig@novell.com>
Date: Thu Apr 7 16:01:58 2011 -0600
build: Install libxenlight log dir
Add $localstatedir/log/libvirt/libxl when building libxenlight driver
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b54679..3649106 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1275,6 +1275,7 @@ endif
if WITH_LIBXL
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl"
+ $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl"
endif
if WITH_UML
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml"
@@ -1316,6 +1317,7 @@ endif
if WITH_LIBXL
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||:
rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||:
+ rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||:
endif
if WITH_UML
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||:

3
libvirt-0.9.0.tar.bz2
View File

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

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

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

5
libvirt.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 4 15:49:12 MDT 2011 - jfehlig@novell.com
- Update to libvirt 0.9.1 RC2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 12 15:26:02 MDT 2011 - jfehlig@suse.de Tue Apr 12 15:26:02 MDT 2011 - jfehlig@suse.de

6
libvirt.spec
View File

@ -265,7 +265,7 @@ Url: http://libvirt.org/
License: LGPLv2.1+ License: LGPLv2.1+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: yes AutoReqProv: yes
Version: 0.9.0 Version: 0.9.1
Release: 1 Release: 1
Summary: A C toolkit to interract with the virtualization capabilities of Linux Summary: A C toolkit to interract with the virtualization capabilities of Linux
@ -330,8 +330,6 @@ Recommends: device-mapper
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init Source1: libvirtd.init
# Upstream patches # Upstream patches
Patch0: f7e9b448-libxl-build.patch
Patch1: 2999bb06-iohelper-libvirtd.patch
# Need to go upstream # Need to go upstream
Patch100: xen-name-for-devid.patch Patch100: xen-name-for-devid.patch
Patch101: clone.patch Patch101: clone.patch
@ -447,8 +445,6 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch100 -p1 %patch100 -p1
%patch101 %patch101
%patch102 -p1 %patch102 -p1

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

@ -1,7 +1,7 @@
Index: libvirt-0.9.0/tools/Makefile.am Index: libvirt-0.9.1/tools/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/tools/Makefile.am --- libvirt-0.9.1.orig/tools/Makefile.am
+++ libvirt-0.9.0/tools/Makefile.am +++ libvirt-0.9.1/tools/Makefile.am
@@ -131,16 +131,17 @@ uninstall-local: uninstall-init @@ -131,16 +131,17 @@ uninstall-local: uninstall-init
if LIBVIRT_INIT_SCRIPT_RED_HAT if LIBVIRT_INIT_SCRIPT_RED_HAT
@ -26,11 +26,11 @@ Index: libvirt-0.9.0/tools/Makefile.am
BUILT_SOURCES += libvirt-guests.init BUILT_SOURCES += libvirt-guests.init
Index: libvirt-0.9.0/tools/libvirt-guests.sysconf Index: libvirt-0.9.1/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/tools/libvirt-guests.sysconf --- libvirt-0.9.1.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.9.0/tools/libvirt-guests.sysconf +++ libvirt-0.9.1/tools/libvirt-guests.sysconf
@@ -1,15 +1,23 @@ @@ -1,18 +1,28 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +
+## Type: string +## Type: string
@ -51,12 +51,18 @@ Index: libvirt-0.9.0/tools/libvirt-guests.sysconf
-#ON_BOOT=start -#ON_BOOT=start
+ON_BOOT=start +ON_BOOT=start
+## Type: integer
+## Default: 0
# number of seconds to wait between each guest start
-#START_DELAY=0
+START_DELAY=0
+## Type: string +## Type: string
+## Default: suspend +## Default: suspend
# action taken on host shutdown # action taken on host shutdown
# - suspend all running guests are suspended using virsh managedsave # - suspend all running guests are suspended using virsh managedsave
# - shutdown all running guests are asked to shutdown. Please be careful with # - shutdown all running guests are asked to shutdown. Please be careful with
@@ -18,7 +26,9 @@ @@ -21,7 +31,9 @@
# which just needs a long time to shutdown. When setting # which just needs a long time to shutdown. When setting
# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a # ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
# value suitable for your guests. # value suitable for your guests.
@ -68,10 +74,10 @@ Index: libvirt-0.9.0/tools/libvirt-guests.sysconf
# number of seconds we're willing to wait for a guest to shut down # number of seconds we're willing to wait for a guest to shut down
-#SHUTDOWN_TIMEOUT=0 -#SHUTDOWN_TIMEOUT=0
+SHUTDOWN_TIMEOUT=120 +SHUTDOWN_TIMEOUT=120
Index: libvirt-0.9.0/tools/libvirt-guests.init.sh Index: libvirt-0.9.1/tools/libvirt-guests.init.sh
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/tools/libvirt-guests.init.sh --- libvirt-0.9.1.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.9.0/tools/libvirt-guests.init.sh +++ libvirt-0.9.1/tools/libvirt-guests.init.sh
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
@ -105,7 +111,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
# Source gettext library. # Source gettext library.
# Make sure this file is recognized as having translations: _("dummy") # Make sure this file is recognized as having translations: _("dummy")
. "@bindir@"/gettext.sh . "@bindir@"/gettext.sh
@@ -49,12 +48,10 @@ test -f "$sysconfdir"/sysconfig/libvirt- @@ -50,12 +49,10 @@ test -f "$sysconfdir"/sysconfig/libvirt-
LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
@ -119,7 +125,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
return 1 return 1
else else
return 0 return 0
@@ -76,12 +73,31 @@ run_virsh_c() { @@ -77,12 +74,31 @@ run_virsh_c() {
( export LC_ALL=C; run_virsh "$@" ) ( export LC_ALL=C; run_virsh "$@" )
} }
@ -152,7 +158,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
return 1 return 1
fi fi
@@ -89,7 +105,7 @@ list_guests() { @@ -90,7 +106,7 @@ list_guests() {
for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do
uuid=$(run_virsh_c "$uri" dominfo "$id" | awk '/^UUID:/{print $2}') uuid=$(run_virsh_c "$uri" dominfo "$id" | awk '/^UUID:/{print $2}')
if [ -z "$uuid" ]; then if [ -z "$uuid" ]; then
@ -161,7 +167,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
return 1 return 1
fi fi
uuids="$uuids $uuid" uuids="$uuids $uuid"
@@ -116,7 +132,7 @@ guest_is_on() { @@ -117,7 +133,7 @@ guest_is_on() {
guest_running=false guest_running=false
info=$(run_virsh_c "$uri" dominfo "$uuid") info=$(run_virsh_c "$uri" dominfo "$uuid")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -170,7 +176,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
return 1 return 1
fi fi
@@ -157,6 +173,12 @@ start() { @@ -159,6 +175,12 @@ start() {
continue continue
fi fi
@ -183,7 +189,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
eval_gettext "Resuming guests on \$uri URI..."; echo eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do for guest in $list; do
name=$(guest_name "$uri" "$guest") name=$(guest_name "$uri" "$guest")
@@ -238,7 +260,7 @@ stop() { @@ -245,7 +267,7 @@ stop() {
if [ $SHUTDOWN_TIMEOUT -le 0 ]; then if [ $SHUTDOWN_TIMEOUT -le 0 ]; then
gettext "Shutdown action requested but SHUTDOWN_TIMEOUT was not set" gettext "Shutdown action requested but SHUTDOWN_TIMEOUT was not set"
echo echo
@ -192,7 +198,7 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
return return
fi fi
fi fi
@@ -308,14 +330,13 @@ gueststatus() { @@ -315,14 +337,13 @@ gueststatus() {
rh_status() { rh_status() {
if [ -f "$LISTFILE" ]; then if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo gettext "stopped, with saved guests"; echo
@ -208,17 +214,17 @@ Index: libvirt-0.9.0/tools/libvirt-guests.init.sh
fi fi
} }
@@ -359,4 +380,4 @@ case "$1" in @@ -366,4 +387,4 @@ case "$1" in
usage usage
;; ;;
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-0.9.0/daemon/Makefile.am Index: libvirt-0.9.1/daemon/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/daemon/Makefile.am --- libvirt-0.9.1.orig/daemon/Makefile.am
+++ libvirt-0.9.0/daemon/Makefile.am +++ libvirt-0.9.1/daemon/Makefile.am
@@ -280,16 +280,12 @@ install-logrotate: $(LOGROTATE_CONFS) @@ -281,16 +281,12 @@ install-logrotate: $(LOGROTATE_CONFS)
if LIBVIRT_INIT_SCRIPT_RED_HAT if LIBVIRT_INIT_SCRIPT_RED_HAT
install-init: libvirtd.init install-init: libvirtd.init

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 This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive. obviously can't search xenstore when the domain is inactive.
Index: libvirt-0.9.0/src/xen/xend_internal.c Index: libvirt-0.9.1/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/src/xen/xend_internal.c --- libvirt-0.9.1.orig/src/xen/xend_internal.c
+++ libvirt-0.9.0/src/xen/xend_internal.c +++ libvirt-0.9.1/src/xen/xend_internal.c
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
static int static int
@ -25,7 +25,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
char *class, char *class,
char *ref, char *ref,
@@ -2725,7 +2726,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr @@ -2731,7 +2732,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf); sexpr = virBufferContentAndReset(&buf);
@ -34,7 +34,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
/* device doesn't exist, define it */ /* device doesn't exist, define it */
ret = xend_op(domain->conn, domain->name, "op", "device_create", ret = xend_op(domain->conn, domain->name, "op", "device_create",
"config", sexpr, NULL); "config", sexpr, NULL);
@@ -2848,7 +2849,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr @@ -2854,7 +2855,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf); sexpr = virBufferContentAndReset(&buf);
@ -43,7 +43,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
virXendError(VIR_ERR_OPERATION_INVALID, "%s", virXendError(VIR_ERR_OPERATION_INVALID, "%s",
_("requested device does not exist")); _("requested device does not exist"));
goto cleanup; goto cleanup;
@@ -2941,7 +2942,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr @@ -2947,7 +2948,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE))) def, xml, VIR_DOMAIN_XML_INACTIVE)))
goto cleanup; goto cleanup;
@ -52,7 +52,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
goto cleanup; goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
@@ -3883,6 +3884,7 @@ struct xenUnifiedDriver xenDaemonDriver @@ -3900,6 +3901,7 @@ struct xenUnifiedDriver xenDaemonDriver
*/ */
static int static int
virDomainXMLDevID(virDomainPtr domain, virDomainXMLDevID(virDomainPtr domain,
@ -60,7 +60,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
char *class, char *class,
char *ref, char *ref,
@@ -3891,8 +3893,12 @@ virDomainXMLDevID(virDomainPtr domain, @@ -3908,8 +3910,12 @@ virDomainXMLDevID(virDomainPtr domain,
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref; char *xref;
char *tmp; char *tmp;
@ -73,7 +73,7 @@ Index: libvirt-0.9.0/src/xen/xend_internal.c
if (dev->data.disk->driverName && if (dev->data.disk->driverName &&
STREQ(dev->data.disk->driverName, "tap")) STREQ(dev->data.disk->driverName, "tap"))
strcpy(class, "tap"); strcpy(class, "tap");
@@ -3902,19 +3908,21 @@ virDomainXMLDevID(virDomainPtr domain, @@ -3919,19 +3925,21 @@ virDomainXMLDevID(virDomainPtr domain,
else else
strcpy(class, "vbd"); strcpy(class, "vbd");

10
xen-pv-cdrom.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-0.9.0/src/xenxs/xen_sxpr.c Index: libvirt-0.9.1/src/xenxs/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/src/xenxs/xen_sxpr.c --- libvirt-0.9.1.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.9.0/src/xenxs/xen_sxpr.c +++ libvirt-0.9.1/src/xenxs/xen_sxpr.c
@@ -326,7 +326,7 @@ error: @@ -324,7 +324,7 @@ error:
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,
const struct sexpr *root, const struct sexpr *root,
@ -11,7 +11,7 @@ Index: libvirt-0.9.0/src/xenxs/xen_sxpr.c
int xendConfigVersion) int xendConfigVersion)
{ {
const struct sexpr *cur, *node; const struct sexpr *cur, *node;
@@ -373,7 +373,6 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -371,7 +371,6 @@ xenParseSxprDisks(virDomainDefPtr def,
/* There is a case without the uname to the CD-ROM device */ /* There is a case without the uname to the CD-ROM device */
offset = strchr(dst, ':'); offset = strchr(dst, ':');
if (!offset || if (!offset ||

10
xend-disk-order.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-0.9.0/src/xenxs/xen_sxpr.c Index: libvirt-0.9.1/src/xenxs/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-0.9.0.orig/src/xenxs/xen_sxpr.c --- libvirt-0.9.1.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.9.0/src/xenxs/xen_sxpr.c +++ libvirt-0.9.1/src/xenxs/xen_sxpr.c
@@ -344,20 +344,24 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -342,20 +342,24 @@ xenParseSxprDisks(virDomainDefPtr def,
const char *src = NULL; const char *src = NULL;
const char *dst = NULL; const char *dst = NULL;
const char *mode = NULL; const char *mode = NULL;
@ -27,7 +27,7 @@ Index: libvirt-0.9.0/src/xenxs/xen_sxpr.c
} }
if (VIR_ALLOC(disk) < 0) if (VIR_ALLOC(disk) < 0)
@@ -482,7 +486,13 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -480,7 +484,13 @@ xenParseSxprDisks(virDomainDefPtr def,
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
goto no_memory; goto no_memory;