Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2012-06-01 07:20:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-08 11:15:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-06-01 07:21:03.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 30 16:00:38 MDT 2012 - [email protected] + +- Add capability 'audit_write' to libvirtd apparmor profile + update install-apparmor-profiles.patch + bnc#764388 +- Update to libvirt 0.9.11.3 stable release + +------------------------------------------------------------------- Old: ---- 4eb1c256-viruri-user.patch libvirt-0.9.11.tar.bz2 New: ---- libvirt-0.9.11.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -327,7 +327,7 @@ Name: libvirt Url: http://libvirt.org/ -Version: 0.9.11 +Version: 0.9.11.3 Release: 0 Summary: A C toolkit to interact with the virtualization capabilities of Linux License: LGPL-2.1+ @@ -410,7 +410,6 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches -Patch0: 4eb1c256-viruri-user.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -546,7 +545,6 @@ %prep %setup -q -%patch0 -p1 %patch100 -p1 %patch101 %patch102 -p1 ++++++ AF_PACKET.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/util/virnetdev.c +Index: libvirt-0.9.11.3/src/util/virnetdev.c =================================================================== ---- libvirt-0.9.11.orig/src/util/virnetdev.c -+++ libvirt-0.9.11/src/util/virnetdev.c +--- libvirt-0.9.11.3.orig/src/util/virnetdev.c ++++ libvirt-0.9.11.3/src/util/virnetdev.c @@ -85,7 +85,7 @@ static int virNetDevSetupControlFull(con static int virNetDevSetupControl(const char *ifname, struct ifreq *ifr) @@ -11,10 +11,10 @@ } #endif -Index: libvirt-0.9.11/src/util/virnetdevbridge.c +Index: libvirt-0.9.11.3/src/util/virnetdevbridge.c =================================================================== ---- libvirt-0.9.11.orig/src/util/virnetdevbridge.c -+++ libvirt-0.9.11/src/util/virnetdevbridge.c +--- libvirt-0.9.11.3.orig/src/util/virnetdevbridge.c ++++ libvirt-0.9.11.3/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.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/examples/apparmor/Makefile.am +Index: libvirt-0.9.11.3/examples/apparmor/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/Makefile.am -+++ libvirt-0.9.11/examples/apparmor/Makefile.am +--- libvirt-0.9.11.3.orig/examples/apparmor/Makefile.am ++++ libvirt-0.9.11.3/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.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-0.9.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-0.9.11.3/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.11/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-0.9.11.3/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-0.9.11.3.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.11/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-0.9.11.3.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,52 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 @@ -192,11 +192,11 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-0.9.11/examples/apparmor/usr.sbin.libvirtd.in -@@ -0,0 +1,57 @@ ++++ libvirt-0.9.11.3/examples/apparmor/usr.sbin.libvirtd.in +@@ -0,0 +1,58 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> +@{LIBVIRT}="libvirt" @@ -222,6 +222,7 @@ + capability mknod, + capability fsetid, + capability ipc_lock, ++ capability audit_write, + + network inet stream, + network inet dgram, @@ -254,10 +255,10 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-0.9.11/examples/apparmor/libvirt-qemu +Index: libvirt-0.9.11.3/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-0.9.11.orig/examples/apparmor/libvirt-qemu -+++ libvirt-0.9.11/examples/apparmor/libvirt-qemu +--- libvirt-0.9.11.3.orig/examples/apparmor/libvirt-qemu ++++ libvirt-0.9.11.3/examples/apparmor/libvirt-qemu @@ -52,6 +52,7 @@ # access to firmware's etc /usr/share/kvm/** r, ++++++ libvirt-0.9.11.tar.bz2 -> libvirt-0.9.11.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-0.9.11.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-0.9.11.3.tar.bz2 differ: char 11, line 1 ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/configure.ac +Index: libvirt-0.9.11.3/configure.ac =================================================================== ---- libvirt-0.9.11.orig/configure.ac -+++ libvirt-0.9.11/configure.ac +--- libvirt-0.9.11.3.orig/configure.ac ++++ libvirt-0.9.11.3/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 -@@ -1716,6 +1717,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit +@@ -1741,6 +1742,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]) -@@ -2660,6 +2693,7 @@ AC_MSG_NOTICE([ Remote: $with_remote]) +@@ -2686,6 +2719,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([]) -@@ -2791,6 +2825,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ +@@ -2817,6 +2851,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.11/daemon/Makefile.am +Index: libvirt-0.9.11.3/daemon/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/daemon/Makefile.am -+++ libvirt-0.9.11/daemon/Makefile.am +--- libvirt-0.9.11.3.orig/daemon/Makefile.am ++++ libvirt-0.9.11.3/daemon/Makefile.am @@ -143,6 +143,10 @@ endif if WITH_NETCF @@ -84,10 +84,10 @@ endif if WITH_NODE_DEVICES -Index: libvirt-0.9.11/daemon/libvirtd.c +Index: libvirt-0.9.11.3/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.c -+++ libvirt-0.9.11/daemon/libvirtd.c +--- libvirt-0.9.11.3.orig/daemon/libvirtd.c ++++ libvirt-0.9.11.3/daemon/libvirtd.c @@ -76,6 +76,10 @@ # endif # ifdef WITH_NETCF @@ -110,10 +110,10 @@ # endif # ifdef WITH_STORAGE_DIR storageRegister(); -Index: libvirt-0.9.11/src/Makefile.am +Index: libvirt-0.9.11.3/src/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/src/Makefile.am -+++ libvirt-0.9.11/src/Makefile.am +--- libvirt-0.9.11.3.orig/src/Makefile.am ++++ libvirt-0.9.11.3/src/Makefile.am @@ -967,6 +967,24 @@ libvirt_driver_interface_la_LIBADD += .. libvirt_driver_interface_la_LDFLAGS += -module -avoid-version endif @@ -139,10 +139,10 @@ endif if WITH_SECRETS -Index: libvirt-0.9.11/src/interface/netcf_driver.c +Index: libvirt-0.9.11.3/src/interface/netcf_driver.c =================================================================== ---- libvirt-0.9.11.orig/src/interface/netcf_driver.c -+++ libvirt-0.9.11/src/interface/netcf_driver.c +--- libvirt-0.9.11.3.orig/src/interface/netcf_driver.c ++++ libvirt-0.9.11.3/src/interface/netcf_driver.c @@ -23,7 +23,13 @@ #include <config.h> @@ -208,10 +208,10 @@ /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-0.9.11/tools/virsh.c +Index: libvirt-0.9.11.3/tools/virsh.c =================================================================== ---- libvirt-0.9.11.orig/tools/virsh.c -+++ libvirt-0.9.11/tools/virsh.c +--- libvirt-0.9.11.3.orig/tools/virsh.c ++++ libvirt-0.9.11.3/tools/virsh.c @@ -19821,6 +19821,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE #endif #ifdef WITH_NETCF ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/daemon/libvirtd.conf +Index: libvirt-0.9.11.3/daemon/libvirtd.conf =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.conf -+++ libvirt-0.9.11/daemon/libvirtd.conf +--- libvirt-0.9.11.3.orig/daemon/libvirtd.conf ++++ libvirt-0.9.11.3/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 @@ # 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.9.11/daemon/libvirtd.c +Index: libvirt-0.9.11.3/daemon/libvirtd.c =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.c -+++ libvirt-0.9.11/daemon/libvirtd.c +--- libvirt-0.9.11.3.orig/daemon/libvirtd.c ++++ libvirt-0.9.11.3/daemon/libvirtd.c @@ -872,7 +872,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } ++++++ relax-qemu-usergroup-check.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -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.11/src/qemu/qemu_conf.c +Index: libvirt-0.9.11.3/src/qemu/qemu_conf.c =================================================================== ---- libvirt-0.9.11.orig/src/qemu/qemu_conf.c -+++ libvirt-0.9.11/src/qemu/qemu_conf.c +--- libvirt-0.9.11.3.orig/src/qemu/qemu_conf.c ++++ libvirt-0.9.11.3/src/qemu/qemu_conf.c @@ -271,9 +271,7 @@ int qemudLoadDriverConfig(struct qemud_d return -1; } ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/qemu/qemu.conf +Index: libvirt-0.9.11.3/src/qemu/qemu.conf =================================================================== ---- libvirt-0.9.11.orig/src/qemu/qemu.conf -+++ libvirt-0.9.11/src/qemu/qemu.conf +--- libvirt-0.9.11.3.orig/src/qemu/qemu.conf ++++ libvirt-0.9.11.3/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.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/tools/Makefile.am +Index: libvirt-0.9.11.3/tools/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/tools/Makefile.am -+++ libvirt-0.9.11/tools/Makefile.am +--- libvirt-0.9.11.3.orig/tools/Makefile.am ++++ libvirt-0.9.11.3/tools/Makefile.am @@ -182,24 +182,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.11/tools/libvirt-guests.sysconf +Index: libvirt-0.9.11.3/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-0.9.11.orig/tools/libvirt-guests.sysconf -+++ libvirt-0.9.11/tools/libvirt-guests.sysconf +--- libvirt-0.9.11.3.orig/tools/libvirt-guests.sysconf ++++ libvirt-0.9.11.3/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt + @@ -101,10 +101,10 @@ # some file systems. -#BYPASS_CACHE=0 +BYPASS_CACHE=0 -Index: libvirt-0.9.11/tools/libvirt-guests.init.sh +Index: libvirt-0.9.11.3/tools/libvirt-guests.init.sh =================================================================== ---- libvirt-0.9.11.orig/tools/libvirt-guests.init.sh -+++ libvirt-0.9.11/tools/libvirt-guests.init.sh +--- libvirt-0.9.11.3.orig/tools/libvirt-guests.init.sh ++++ libvirt-0.9.11.3/tools/libvirt-guests.init.sh @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO @@ -252,11 +252,11 @@ esac -exit $RETVAL +rc_exit -Index: libvirt-0.9.11/daemon/Makefile.am +Index: libvirt-0.9.11.3/daemon/Makefile.am =================================================================== ---- libvirt-0.9.11.orig/daemon/Makefile.am -+++ libvirt-0.9.11/daemon/Makefile.am -@@ -249,34 +249,23 @@ uninstall-logrotate: +--- libvirt-0.9.11.3.orig/daemon/Makefile.am ++++ libvirt-0.9.11.3/daemon/Makefile.am +@@ -249,22 +249,16 @@ uninstall-logrotate: rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : install-sysconfig: @@ -265,39 +265,42 @@ $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd ++ uninstall-sysconfig: - rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/sysconfig || : + rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd + if WITH_SYSCTL install-sysctl: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysctl.d - $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \ - $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd - +- uninstall-sysctl: - rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/sysctl.d || : - - if LIBVIRT_INIT_SCRIPT_RED_HAT - + else + install-sysctl: + uninstall-sysctl: +@@ -275,13 +269,7 @@ if LIBVIRT_INIT_SCRIPT_RED_HAT BUILT_SOURCES += libvirtd.init install-init-redhat: install-sysconfig libvirtd.init - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d - $(INSTALL_SCRIPT) libvirtd.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - +- uninstall-init-redhat: uninstall-sysconfig - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || : else install-init-redhat: uninstall-init-redhat: -Index: libvirt-0.9.11/daemon/libvirtd.sysconf +Index: libvirt-0.9.11.3/daemon/libvirtd.sysconf =================================================================== ---- libvirt-0.9.11.orig/daemon/libvirtd.sysconf -+++ libvirt-0.9.11/daemon/libvirtd.sysconf +--- libvirt-0.9.11.3.orig/daemon/libvirtd.sysconf ++++ libvirt-0.9.11.3/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -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.11/src/xen/xend_internal.c +Index: libvirt-0.9.11.3/src/xen/xend_internal.c =================================================================== ---- libvirt-0.9.11.orig/src/xen/xend_internal.c -+++ libvirt-0.9.11/src/xen/xend_internal.c +--- libvirt-0.9.11.3.orig/src/xen/xend_internal.c ++++ libvirt-0.9.11.3/src/xen/xend_internal.c @@ -60,6 +60,7 @@ static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -2752,7 +2753,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2757,7 +2758,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); -@@ -2873,7 +2874,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -2878,7 +2879,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -2968,7 +2969,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -2973,7 +2974,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3914,6 +3915,7 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -3919,6 +3920,7 @@ struct xenUnifiedDriver xenDaemonDriver */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -3922,8 +3924,12 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3927,8 +3929,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"); -@@ -3933,19 +3939,21 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3938,19 +3944,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.9tY971/_old 2012-06-01 07:21:07.000000000 +0200 +++ /var/tmp/diff_new_pack.9tY971/_new 2012-06-01 07:21:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.9.11/src/xenxs/xen_sxpr.c +Index: libvirt-0.9.11.3/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-0.9.11.orig/src/xenxs/xen_sxpr.c -+++ libvirt-0.9.11/src/xenxs/xen_sxpr.c +--- libvirt-0.9.11.3.orig/src/xenxs/xen_sxpr.c ++++ libvirt-0.9.11.3/src/xenxs/xen_sxpr.c @@ -340,7 +340,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
