Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Sun Feb 20 19:50:16 CET 2011. -------- --- libvirt/libvirt.changes 2011-01-31 17:21:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2011-02-18 04:40:17.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Feb 17 20:39:22 MST 2011 - jfehlig@novell.com + +- Do not add drive 'boot=on' param when a kernel is specified + efc2594b-boot-param.patch + +------------------------------------------------------------------- +Thu Feb 17 10:26:11 MST 2011 - jfehlig@novell.com + +- Update to libvirt 0.8.8 final + - sysinfo: expose new API + - cgroup blkio weight support + - smartcard device support + - qemu: Support per-device boot ordering + +------------------------------------------------------------------- +Tue Feb 15 09:02:30 MST 2011 - jfehlig@novell.com + +- Update to libvirt 0.8.8 RC3 + +------------------------------------------------------------------- +Fri Feb 11 11:43:16 MST 2011 - jfehlig@novell.com + +- Update to libvirt 0.8.8 RC1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 04197350-hap2.patch 094c6f4a-hap-fix.patch 4301b95a-json-cont-cmd.patch 48a5dccd-hap1.patch 79f56c66-hap4.patch a43c7338-dnsmasq-hostfile-fix.patch af521a01-hap3.patch libvirt-0.8.7.tar.bz2 New: ---- efc2594b-boot-param.patch libvirt-0.8.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -144,8 +144,8 @@ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.8.7 -Release: 3 +Version: 0.8.8 +Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage Requires: %{name}-client = %{version}-%{release} @@ -169,13 +169,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init # Upstream patches -Patch0: a43c7338-dnsmasq-hostfile-fix.patch -Patch1: 48a5dccd-hap1.patch -Patch2: 04197350-hap2.patch -Patch3: af521a01-hap3.patch -Patch4: 79f56c66-hap4.patch -Patch5: 094c6f4a-hap-fix.patch -Patch6: 4301b95a-json-cont-cmd.patch +Patch0: efc2594b-boot-param.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch102: clone.patch @@ -289,12 +283,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch100 -p1 %patch102 %patch103 -p1 @@ -361,6 +349,7 @@ %if ! %{with_virtualport} %define _without_virtualport --without-virtualport %endif + autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static --with-pic \ ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -838,6 +838,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -845,6 +845,9 @@ int lxcContainerStart(virDomainDefPtr de lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; /* allocate a stack for the container */ @@ -12,7 +12,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -856,7 +859,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -863,7 +866,11 @@ int lxcContainerStart(virDomainDefPtr de flags |= CLONE_NEWNET; } @@ -24,7 +24,7 @@ VIR_FREE(stack); DEBUG("clone() completed, new container PID is %d", pid); -@@ -882,6 +889,7 @@ int lxcContainerAvailable(int features) +@@ -889,6 +896,7 @@ int lxcContainerAvailable(int features) char *childStack; char *stack; int childStatus; @@ -32,7 +32,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -889,14 +897,21 @@ int lxcContainerAvailable(int features) +@@ -896,14 +904,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ efc2594b-boot-param.patch ++++++ commit efc2594b4e0cbcdd6947fafeeed41accd5b611e0 Author: Jim Fehlig <jfehlig@novell.com> Date: Thu Feb 17 14:22:55 2011 -0700 Do not add drive 'boot=on' param when a kernel is specified libvirt-tck was failing several domain tests [1] with qemu 0.14, which is now less tolerable of specifying 2 bootroms with the same boot index [2]. Drop the 'boot=on' param if kernel has been specfied. [1] https://www.redhat.com/archives/libvir-list/2011-February/msg00559.html [2] http://lists.nongnu.org/archive/html/qemu-devel/2011-02/msg01892.html Index: libvirt-0.8.8/src/qemu/qemu_command.c =================================================================== --- libvirt-0.8.8.orig/src/qemu/qemu_command.c +++ libvirt-0.8.8/src/qemu/qemu_command.c @@ -3116,7 +3116,7 @@ qemuBuildCommandLine(virConnectPtr conn, int bootCD = 0, bootFloppy = 0, bootDisk = 0; /* If QEMU supports boot=on for -drive param... */ - if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT) { + if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT && !def->os.kernel) { for (i = 0 ; i < def->os.nBootDevs ; i++) { switch (def->os.bootDevs[i]) { case VIR_DOMAIN_BOOT_CDROM: ++++++ libvirt-0.8.7.tar.bz2 -> libvirt-0.8.8.tar.bz2 ++++++ libvirt/libvirt-0.8.7.tar.bz2 /mounts/work_src_done/STABLE/libvirt/libvirt-0.8.8.tar.bz2 differ: char 11, line 1 ++++++ use-libvirt-guests-on-suse.patch ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.8.7/tools/Makefile.am +Index: libvirt-0.8.8/tools/Makefile.am =================================================================== ---- libvirt-0.8.7.orig/tools/Makefile.am -+++ libvirt-0.8.7/tools/Makefile.am +--- libvirt-0.8.8.orig/tools/Makefile.am ++++ libvirt-0.8.8/tools/Makefile.am @@ -129,18 +129,18 @@ install-data-local: install-init uninstall-local: uninstall-init @@ -28,7 +28,7 @@ BUILT_SOURCES += libvirt-guests.init -@@ -152,11 +152,6 @@ libvirt-guests.init: libvirt-guests.init +@@ -155,11 +155,6 @@ libvirt-guests.init: libvirt-guests.init < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ @@ -40,10 +40,10 @@ CLEANFILES = $(bin_SCRIPTS) $(man1_MANS) -Index: libvirt-0.8.7/tools/libvirt-guests.sysconf +Index: libvirt-0.8.8/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-0.8.7.orig/tools/libvirt-guests.sysconf -+++ libvirt-0.8.7/tools/libvirt-guests.sysconf +--- libvirt-0.8.8.orig/tools/libvirt-guests.sysconf ++++ libvirt-0.8.8/tools/libvirt-guests.sysconf @@ -1,15 +1,23 @@ +## Path: System/Virtualization/libvirt + @@ -82,10 +82,10 @@ # number of seconds we're willing to wait for a guest to shut down -#SHUTDOWN_TIMEOUT=0 +SHUTDOWN_TIMEOUT=120 -Index: libvirt-0.8.7/tools/libvirt-guests.init.in +Index: libvirt-0.8.8/tools/libvirt-guests.init.sh =================================================================== ---- libvirt-0.8.7.orig/tools/libvirt-guests.init.in -+++ libvirt-0.8.7/tools/libvirt-guests.init.in +--- libvirt-0.8.8.orig/tools/libvirt-guests.init.sh ++++ libvirt-0.8.8/tools/libvirt-guests.init.sh @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO @@ -108,18 +108,18 @@ +. /etc/rc.status +rc_reset + - sysconfdir=@sysconfdir@ - localstatedir=@localstatedir@ - libvirtd=@sbindir@/libvirtd + sysconfdir="@sysconfdir@" + localstatedir="@localstatedir@" + libvirtd="@sbindir@"/libvirtd -# Source function library. -test ! -r "$sysconfdir"/rc.d/init.d/functions || -- . "$sysconfdir"/rc.d/init.d/functions +- . "$sysconfdir"/rc.d/init.d/functions - - URIS=default - ON_BOOT=start - ON_SHUTDOWN=suspend -@@ -42,12 +41,10 @@ test -f "$sysconfdir"/sysconfig/libvirt- + # Source gettext library. + # Make sure this file is recognized as having translations: _("dummy") + . "@bindir@"/gettext.sh +@@ -49,12 +48,10 @@ test -f "$sysconfdir"/sysconfig/libvirt- LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests @@ -133,7 +133,7 @@ return 1 else return 0 -@@ -71,12 +68,31 @@ run_virsh_c() { +@@ -78,12 +75,31 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } @@ -166,7 +166,7 @@ return 1 fi -@@ -84,7 +100,7 @@ list_guests() { +@@ -91,7 +107,7 @@ list_guests() { for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do uuid=$(run_virsh_c $uri dominfo $id | awk '/^UUID:/{print $2}') if [ -z "$uuid" ]; then @@ -175,7 +175,7 @@ return 1 fi uuids="$uuids $uuid" -@@ -111,7 +127,7 @@ guest_is_on() { +@@ -118,7 +134,7 @@ guest_is_on() { guest_running=false info=$(run_virsh_c $uri dominfo $uuid) if [ $? -ne 0 ]; then @@ -184,7 +184,7 @@ return 1 fi -@@ -148,6 +164,12 @@ start() { +@@ -156,6 +172,12 @@ start() { continue fi @@ -194,35 +194,35 @@ + continue + fi + - echo $"Resuming guests on $uri URI..." + eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name $uri $guest) -@@ -227,7 +249,7 @@ stop() { - suspending=false +@@ -237,7 +259,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -le 0 ]; then - echo $"Shutdown action requested but SHUTDOWN_TIMEOUT was not set" + gettext "Shutdown action requested but SHUTDOWN_TIMEOUT was not set" + echo - RETVAL=6 + rc_failed 6 return fi fi -@@ -291,14 +313,13 @@ gueststatus() { +@@ -301,14 +323,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then - echo $"stopped, with saved guests" + gettext "stopped, with saved guests"; echo - RETVAL=3 + rc_failed 3 else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - echo $"started" + gettext "started"; echo else - echo $"stopped, with no saved guests" + gettext "stopped, with no saved guests"; echo fi - RETVAL=0 fi } -@@ -340,4 +361,4 @@ case "$1" in +@@ -352,4 +373,4 @@ case "$1" in usage ;; esac ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -13,10 +13,10 @@ This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-0.8.7/src/xen/xend_internal.c +Index: libvirt-0.8.8/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.7.orig/src/xen/xend_internal.c -+++ libvirt-0.8.7/src/xen/xend_internal.c +--- libvirt-0.8.8.orig/src/xen/xend_internal.c ++++ libvirt-0.8.8/src/xen/xend_internal.c @@ -89,6 +89,7 @@ xenDaemonFormatSxprOnePCI(virDomainHostd static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -4054,7 +4055,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -4088,7 +4089,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -34,7 +34,7 @@ /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); -@@ -4172,7 +4173,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -4211,7 +4212,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -4265,7 +4266,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -4304,7 +4305,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -6037,6 +6038,7 @@ error: +@@ -6085,6 +6086,7 @@ error: */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -6045,8 +6047,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -6093,8 +6095,12 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; @@ -73,7 +73,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -6056,19 +6062,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -6104,19 +6110,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-0.8.6/src/xen/xend_internal.c +Index: libvirt-0.8.8/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.6.orig/src/xen/xend_internal.c -+++ libvirt-0.8.6/src/xen/xend_internal.c -@@ -1358,7 +1358,7 @@ error: +--- libvirt-0.8.8.orig/src/xen/xend_internal.c ++++ libvirt-0.8.8/src/xen/xend_internal.c +@@ -1365,7 +1365,7 @@ error: static int xenDaemonParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, @@ -11,7 +11,7 @@ int xendConfigVersion) { const struct sexpr *cur, *node; -@@ -1405,7 +1405,6 @@ xenDaemonParseSxprDisks(virDomainDefPtr +@@ -1412,7 +1412,6 @@ xenDaemonParseSxprDisks(virDomainDefPtr /* There is a case without the uname to the CD-ROM device */ offset = strchr(dst, ':'); if (!offset || ++++++ xend-disk-order.patch ++++++ --- /var/tmp/diff_new_pack.nLw5S1/_old 2011-02-20 19:50:15.000000000 +0100 +++ /var/tmp/diff_new_pack.nLw5S1/_new 2011-02-20 19:50:15.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-0.8.6/src/xen/xend_internal.c +Index: libvirt-0.8.8/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.6.orig/src/xen/xend_internal.c -+++ libvirt-0.8.6/src/xen/xend_internal.c -@@ -1376,20 +1376,24 @@ xenDaemonParseSxprDisks(virDomainDefPtr +--- libvirt-0.8.8.orig/src/xen/xend_internal.c ++++ libvirt-0.8.8/src/xen/xend_internal.c +@@ -1383,20 +1383,24 @@ xenDaemonParseSxprDisks(virDomainDefPtr const char *src = NULL; const char *dst = NULL; const char *mode = NULL; @@ -27,7 +27,7 @@ } if (VIR_ALLOC(disk) < 0) -@@ -1514,7 +1518,12 @@ xenDaemonParseSxprDisks(virDomainDefPtr +@@ -1521,7 +1525,12 @@ xenDaemonParseSxprDisks(virDomainDefPtr if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) goto no_memory; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org