Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2012-01-19 09:43:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2012-01-05 13:51:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-01-19 09:43:24.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 11 09:32:28 MST 2012 - [email protected] + +- During configure, libvirt checks for availability of iptables + binary and doesn't actually use anything from iptables-devel + package, hence only need 'BuildRequires: iptables'. + +------------------------------------------------------------------- +Mon Jan 9 15:45:33 MST 2012 - [email protected] + +- Update to libvirt 0.9.9 + - Add new API virDomain{S,G}etInterfaceParameters + - Add new API virDomain{G,S}etNumaParameters + - Add support for ppc64 qemu + - Support Xen domctl v8 + +------------------------------------------------------------------- Old: ---- 10404671-systemd-build-fix.patch 478a4d07-systemd-build-fix.patch ae1232b2-CVE-2011-4600.patch libvirt-0.9.8.tar.bz2 xen-domctl-ver8.patch New: ---- 9ae4ac7a-PolicyKit.patch libvirt-0.9.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -263,12 +263,13 @@ %if %{with_netcf} BuildRequires: netcf-devel >= 0.1.4 %endif +%define with_netcontrol 1 %if %{with_netcontrol} BuildRequires: libnetcontrol-devel >= 0.2.0 %endif %if %{with_network} BuildRequires: dnsmasq >= 2.41 -BuildRequires: iptables-devel +BuildRequires: iptables BuildRequires: radvd %endif %if %{with_nwfilter} @@ -323,7 +324,7 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.9.8 +Version: 0.9.9 Release: 1 Summary: A C toolkit to interact with the virtualization capabilities of Linux Conflicts: kvm < 0.14.1 @@ -397,15 +398,12 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: ae1232b2-CVE-2011-4600.patch -Patch1: 478a4d07-systemd-build-fix.patch -Patch2: 10404671-systemd-build-fix.patch +Patch0: 9ae4ac7a-PolicyKit.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch Patch102: xen-pv-cdrom.patch -Patch103: xen-domctl-ver8.patch -Patch104: AF_PACKET.patch +Patch103: AF_PACKET.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: use-init-script-redhat.patch @@ -541,13 +539,10 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %patch100 -p1 %patch101 %patch102 -p1 %patch103 -p1 -%patch104 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 ++++++ 9ae4ac7a-PolicyKit.patch ++++++ commit 9ae4ac7ac07d872cd32d0a3a1b1b44730b04bda7 Author: Jim Fehlig <[email protected]> Date: Tue Jan 3 11:35:06 2012 -0700 PolicyKit: Check auth before asking client to obtain it I previously mentioned [1] a PolicyKit issue where libvirt would proceed with authentication even though polkit-auth failed: testusr xen134:~> virsh list --all Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Id Name State ---------------------------------- 0 Domain-0 running - sles11sp1-pv shut off AFAICT, libvirt attempts to obtain a privilege it already has, causing polkit-auth to fail with above message. Instead of calling obtain and then checking auth, IMO the workflow should be for the server to check auth first, and if that fails ask the client to obtain it and check again. This workflow also allows for checking only successful exit of polkit-auth in virConnectAuthGainPolkit(). [1] https://www.redhat.com/archives/libvir-list/2011-December/msg00837.html Index: libvirt-0.9.9/src/libvirt.c =================================================================== --- libvirt-0.9.9.orig/src/libvirt.c +++ libvirt-0.9.9/src/libvirt.c @@ -119,7 +119,7 @@ static int virConnectAuthGainPolkit(cons cmd = virCommandNewArgList(POLKIT_AUTH, "--obtain", privilege, NULL); if (virCommandRun(cmd, &status) < 0 || - status > 1) + status > 0) goto cleanup; ret = 0; Index: libvirt-0.9.9/src/remote/remote_driver.c =================================================================== --- libvirt-0.9.9.orig/src/remote/remote_driver.c +++ libvirt-0.9.9/src/remote/remote_driver.c @@ -3121,6 +3121,14 @@ remoteAuthPolkit (virConnectPtr conn, st }; VIR_DEBUG("Client initialize PolicyKit-0 authentication"); + /* Check auth first and if it succeeds we are done. */ + memset (&ret, 0, sizeof ret); + if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, + (xdrproc_t) xdr_void, (char *)NULL, + (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) == 0) + goto out; + + /* Auth failed. Ask client to obtain it and check again. */ if (auth && auth->cb) { /* Check if the necessary credential type for PolicyKit is supported */ for (i = 0 ; i < auth->ncredtype ; i++) { @@ -3138,9 +3146,11 @@ remoteAuthPolkit (virConnectPtr conn, st } } else { VIR_DEBUG("Client auth callback does not support PolicyKit"); + return -1; } } else { VIR_DEBUG("No auth callback provided"); + return -1; } memset (&ret, 0, sizeof ret); @@ -3150,6 +3160,7 @@ remoteAuthPolkit (virConnectPtr conn, st return -1; /* virError already set by call */ } +out: VIR_DEBUG("PolicyKit-0 authentication complete"); return 0; } ++++++ AF_PACKET.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/src/util/virnetdev.c +Index: libvirt-0.9.9/src/util/virnetdev.c =================================================================== ---- libvirt-0.9.8.orig/src/util/virnetdev.c -+++ libvirt-0.9.8/src/util/virnetdev.c +--- libvirt-0.9.9.orig/src/util/virnetdev.c ++++ libvirt-0.9.9/src/util/virnetdev.c @@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) @@ -11,10 +11,10 @@ } #endif -Index: libvirt-0.9.8/src/util/virnetdevbridge.c +Index: libvirt-0.9.9/src/util/virnetdevbridge.c =================================================================== ---- libvirt-0.9.8.orig/src/util/virnetdevbridge.c -+++ libvirt-0.9.8/src/util/virnetdevbridge.c +--- libvirt-0.9.9.orig/src/util/virnetdevbridge.c ++++ libvirt-0.9.9/src/util/virnetdevbridge.c @@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/examples/apparmor/Makefile.am +Index: libvirt-0.9.9/examples/apparmor/Makefile.am =================================================================== ---- libvirt-0.9.8.orig/examples/apparmor/Makefile.am -+++ libvirt-0.9.8/examples/apparmor/Makefile.am +--- libvirt-0.9.9.orig/examples/apparmor/Makefile.am ++++ libvirt-0.9.9/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 @@ + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + +endif -Index: libvirt-0.9.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-0.9.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-0.9.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-0.9.9/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 @@ + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-0.9.8/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-0.9.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-0.9.8.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-0.9.9.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 @@ - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-0.9.8/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-0.9.9/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-0.9.8.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-0.9.9.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 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-0.9.8/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-0.9.9/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-0.9.8/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-0.9.9/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,54 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> @@ -251,10 +251,10 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-0.9.8/examples/apparmor/libvirt-qemu +Index: libvirt-0.9.9/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-0.9.8.orig/examples/apparmor/libvirt-qemu -+++ libvirt-0.9.8/examples/apparmor/libvirt-qemu +--- libvirt-0.9.9.orig/examples/apparmor/libvirt-qemu ++++ libvirt-0.9.9/examples/apparmor/libvirt-qemu @@ -52,6 +52,7 @@ # access to firmware's etc /usr/share/kvm/** r, ++++++ libvirt-0.9.8.tar.bz2 -> libvirt-0.9.9.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-0.9.8.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-0.9.9.tar.bz2 differ: char 11, line 1 ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/configure.ac +Index: libvirt-0.9.9/configure.ac =================================================================== ---- libvirt-0.9.8.orig/configure.ac -+++ libvirt-0.9.8/configure.ac +--- libvirt-0.9.9.orig/configure.ac ++++ libvirt-0.9.9/configure.ac @@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" @@ -10,7 +10,7 @@ UDEV_REQUIRED=145 PCIACCESS_REQUIRED=0.10.0 XMLRPC_REQUIRED=1.14.0 -@@ -1639,6 +1640,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit +@@ -1637,6 +1638,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) @@ -49,7 +49,7 @@ AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) -@@ -2567,6 +2600,7 @@ AC_MSG_NOTICE([ Remote: $with_remote]) +@@ -2565,6 +2598,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]) @@ -57,7 +57,7 @@ AC_MSG_NOTICE([ macvtap: $with_macvtap]) AC_MSG_NOTICE([virtport: $with_virtualport]) AC_MSG_NOTICE([]) -@@ -2698,6 +2732,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ +@@ -2696,6 +2730,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ else AC_MSG_NOTICE([ netcf: no]) fi @@ -69,10 +69,10 @@ if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else -Index: libvirt-0.9.8/daemon/Makefile.am +Index: libvirt-0.9.9/daemon/Makefile.am =================================================================== ---- libvirt-0.9.8.orig/daemon/Makefile.am -+++ libvirt-0.9.8/daemon/Makefile.am +--- libvirt-0.9.9.orig/daemon/Makefile.am ++++ libvirt-0.9.9/daemon/Makefile.am @@ -143,6 +143,10 @@ endif if WITH_NETCF @@ -84,10 +84,10 @@ endif if WITH_NODE_DEVICES -Index: libvirt-0.9.8/daemon/libvirtd.c +Index: libvirt-0.9.9/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.8.orig/daemon/libvirtd.c -+++ libvirt-0.9.8/daemon/libvirtd.c +--- libvirt-0.9.9.orig/daemon/libvirtd.c ++++ libvirt-0.9.9/daemon/libvirtd.c @@ -75,6 +75,10 @@ # endif # ifdef WITH_NETCF @@ -99,7 +99,7 @@ # endif # ifdef WITH_STORAGE_DIR # include "storage/storage_driver.h" -@@ -393,6 +397,10 @@ static void daemonInitialize(void) +@@ -414,6 +418,10 @@ static void daemonInitialize(void) # endif # ifdef WITH_NETCF interfaceRegister(); @@ -110,11 +110,11 @@ # endif # ifdef WITH_STORAGE_DIR storageRegister(); -Index: libvirt-0.9.8/src/Makefile.am +Index: libvirt-0.9.9/src/Makefile.am =================================================================== ---- libvirt-0.9.8.orig/src/Makefile.am -+++ libvirt-0.9.8/src/Makefile.am -@@ -950,6 +950,24 @@ libvirt_driver_interface_la_LIBADD += .. +--- libvirt-0.9.9.orig/src/Makefile.am ++++ libvirt-0.9.9/src/Makefile.am +@@ -955,6 +955,24 @@ libvirt_driver_interface_la_LIBADD += .. libvirt_driver_interface_la_LDFLAGS += -module -avoid-version endif libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) @@ -139,10 +139,10 @@ endif if WITH_SECRETS -Index: libvirt-0.9.8/src/interface/netcf_driver.c +Index: libvirt-0.9.9/src/interface/netcf_driver.c =================================================================== ---- libvirt-0.9.8.orig/src/interface/netcf_driver.c -+++ libvirt-0.9.8/src/interface/netcf_driver.c +--- libvirt-0.9.9.orig/src/interface/netcf_driver.c ++++ libvirt-0.9.9/src/interface/netcf_driver.c @@ -23,7 +23,13 @@ #include <config.h> @@ -208,11 +208,11 @@ /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-0.9.8/tools/virsh.c +Index: libvirt-0.9.9/tools/virsh.c =================================================================== ---- libvirt-0.9.8.orig/tools/virsh.c -+++ libvirt-0.9.8/tools/virsh.c -@@ -17646,6 +17646,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-0.9.9.orig/tools/virsh.c ++++ libvirt-0.9.9/tools/virsh.c +@@ -18328,6 +18328,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE #endif #ifdef WITH_NETCF vshPrint(ctl, " Netcf"); ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/daemon/libvirtd.conf +Index: libvirt-0.9.9/daemon/libvirtd.conf =================================================================== ---- libvirt-0.9.8.orig/daemon/libvirtd.conf -+++ libvirt-0.9.8/daemon/libvirtd.conf +--- libvirt-0.9.9.orig/daemon/libvirtd.conf ++++ libvirt-0.9.9/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -28,11 +28,11 @@ # Override the default mDNS advertizement name. This must be # unique on the immediate broadcast network. -Index: libvirt-0.9.8/daemon/libvirtd.c +Index: libvirt-0.9.9/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.8.orig/daemon/libvirtd.c -+++ libvirt-0.9.8/daemon/libvirtd.c -@@ -850,7 +850,7 @@ daemonConfigNew(bool privileged ATTRIBUT +--- libvirt-0.9.9.orig/daemon/libvirtd.c ++++ libvirt-0.9.9/daemon/libvirtd.c +@@ -871,7 +871,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } @@ -41,7 +41,7 @@ data->listen_tcp = 0; if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT))) -@@ -887,7 +887,7 @@ daemonConfigNew(bool privileged ATTRIBUT +@@ -908,7 +908,7 @@ daemonConfigNew(bool privileged ATTRIBUT #endif data->auth_tls = REMOTE_AUTH_NONE; ++++++ relax-qemu-usergroup-check.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -7,10 +7,10 @@ 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.9.8/src/qemu/qemu_conf.c +Index: libvirt-0.9.9/src/qemu/qemu_conf.c =================================================================== ---- libvirt-0.9.8.orig/src/qemu/qemu_conf.c -+++ libvirt-0.9.8/src/qemu/qemu_conf.c +--- libvirt-0.9.9.orig/src/qemu/qemu_conf.c ++++ libvirt-0.9.9/src/qemu/qemu_conf.c @@ -255,9 +255,7 @@ int qemudLoadDriverConfig(struct qemud_d return -1; } ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/src/qemu/qemu.conf +Index: libvirt-0.9.9/src/qemu/qemu.conf =================================================================== ---- libvirt-0.9.8.orig/src/qemu/qemu.conf -+++ libvirt-0.9.8/src/qemu/qemu.conf +--- libvirt-0.9.9.orig/src/qemu/qemu.conf ++++ libvirt-0.9.9/src/qemu/qemu.conf @@ -136,7 +136,16 @@ # leaving SELinux enabled for the host in general, then set this # to 'none' instead. ++++++ use-init-script-redhat.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/tools/Makefile.am +Index: libvirt-0.9.9/tools/Makefile.am =================================================================== ---- libvirt-0.9.8.orig/tools/Makefile.am -+++ libvirt-0.9.8/tools/Makefile.am +--- libvirt-0.9.9.orig/tools/Makefile.am ++++ libvirt-0.9.9/tools/Makefile.am @@ -153,24 +153,22 @@ install-data-local: install-init install uninstall-local: uninstall-init uninstall-systemd @@ -33,10 +33,10 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT -Index: libvirt-0.9.8/tools/libvirt-guests.sysconf +Index: libvirt-0.9.9/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-0.9.8.orig/tools/libvirt-guests.sysconf -+++ libvirt-0.9.8/tools/libvirt-guests.sysconf +--- libvirt-0.9.9.orig/tools/libvirt-guests.sysconf ++++ libvirt-0.9.9/tools/libvirt-guests.sysconf @@ -1,18 +1,28 @@ +## Path: System/Virtualization/libvirt + @@ -87,10 +87,10 @@ # If non-zero, try to bypass the file system cache when saving and # restoring guests, even though this may give slower operation for # some file systems. -Index: libvirt-0.9.8/tools/libvirt-guests.init.sh +Index: libvirt-0.9.9/tools/libvirt-guests.init.sh =================================================================== ---- libvirt-0.9.8.orig/tools/libvirt-guests.init.sh -+++ libvirt-0.9.8/tools/libvirt-guests.init.sh +--- libvirt-0.9.9.orig/tools/libvirt-guests.init.sh ++++ libvirt-0.9.9/tools/libvirt-guests.init.sh @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO @@ -233,10 +233,10 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-0.9.8/daemon/Makefile.am +Index: libvirt-0.9.9/daemon/Makefile.am =================================================================== ---- libvirt-0.9.8.orig/daemon/Makefile.am -+++ libvirt-0.9.8/daemon/Makefile.am +--- libvirt-0.9.9.orig/daemon/Makefile.am ++++ libvirt-0.9.9/daemon/Makefile.am @@ -249,34 +249,23 @@ uninstall-logrotate: rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : @@ -275,10 +275,10 @@ else install-init-redhat: uninstall-init-redhat: -Index: libvirt-0.9.8/daemon/libvirtd.sysconf +Index: libvirt-0.9.9/daemon/libvirtd.sysconf =================================================================== ---- libvirt-0.9.8.orig/daemon/libvirtd.sysconf -+++ libvirt-0.9.8/daemon/libvirtd.sysconf +--- libvirt-0.9.9.orig/daemon/libvirtd.sysconf ++++ libvirt-0.9.9/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.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.9.8/src/xen/xend_internal.c +Index: libvirt-0.9.9/src/xen/xend_internal.c =================================================================== ---- libvirt-0.9.8.orig/src/xen/xend_internal.c -+++ libvirt-0.9.8/src/xen/xend_internal.c +--- libvirt-0.9.9.orig/src/xen/xend_internal.c ++++ libvirt-0.9.9/src/xen/xend_internal.c @@ -60,6 +60,7 @@ static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -2749,7 +2750,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2752,7 +2753,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); -@@ -2870,7 +2871,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -2873,7 +2874,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -2965,7 +2966,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -2968,7 +2969,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3913,6 +3914,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3916,6 +3917,7 @@ struct xenUnifiedDriver xenDaemonDriver */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3921,8 +3923,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3924,8 +3926,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"); -@@ -3932,19 +3938,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3935,19 +3941,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.mkcqWl/_old 2012-01-19 09:43:26.000000000 +0100 +++ /var/tmp/diff_new_pack.mkcqWl/_new 2012-01-19 09:43:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.8/src/xenxs/xen_sxpr.c +Index: libvirt-0.9.9/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-0.9.8.orig/src/xenxs/xen_sxpr.c -+++ libvirt-0.9.8/src/xenxs/xen_sxpr.c +--- libvirt-0.9.9.orig/src/xenxs/xen_sxpr.c ++++ libvirt-0.9.9/src/xenxs/xen_sxpr.c @@ -329,7 +329,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
