Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2013-06-11 06:36:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2013-06-05 13:29:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2013-06-11 09:34:06.000000000 +0200 @@ -1,0 +2,50 @@ +Mon Jun 10 09:14:39 MDT 2013 - [email protected] + +- Fix build for SLE11 SP2 + +------------------------------------------------------------------- +Fri Jun 7 15:40:47 MDT 2013 - [email protected] + +- Add a README to the empty packages. Provides some info about + their purpose and satisfies suse-filelist-empty check. + Drop rpmlintrc + +------------------------------------------------------------------- +Fri Jun 7 08:14:38 MDT 2013 - [email protected] + +- Fix typo in spec file: devel package requires doc package, not + docs + +------------------------------------------------------------------- +Thu Jun 6 16:05:39 MDT 2013 - [email protected] + +- Add rpmlintrc to get around suse-filelist-empty error on + older distros. + +------------------------------------------------------------------- +Thu Jun 6 11:59:26 MDT 2013 - [email protected] + +- Refactor libvirt spec file to create subpackages for the various + libvirtd components. This allows installing a libvirtd tailored + for the underlying virtualizer. E.g. on a KVM/QEMU virtualizer + only the libvirt-daemon-qemu package needs installed. + Similarly, only libvirt-daemon-xen on a Xen virtualizer and + libvirt-daemon-lxc on LXC. + +------------------------------------------------------------------- +Tue Jun 4 16:44:30 MDT 2013 - [email protected] + +- Update to libvirt 1.0.6 + - Move VirtualBox driver into libvirtd + - Support for static routes on a virtual bridge + - Various improvement for hostdev SCSI support + - Switch to VIR_STRDUP and VIR_STRNDUP + - Various cleanups and improvement in Xen and LXC drivers + - Many incremental improvements and bug fixes, see + http://libvirt.org/news.html + - Drop upstream patches: f493d83f-cgroup-swap-control.patch, + 486a86eb-cgroups-docs.patch, 0ced83dc-cgroup-escape-dot.patch, + bbe97ae9-no-cgroups.patch, c2cf5f1c-no-cgroups-fix.patch, + 95c6cc34-selinux.patch + +------------------------------------------------------------------- Old: ---- 0ced83dc-cgroup-escape-dot.patch 486a86eb-cgroups-docs.patch 95c6cc34-selinux.patch bbe97ae9-no-cgroups.patch c2cf5f1c-no-cgroups-fix.patch f493d83f-cgroup-swap-control.patch libvirt-1.0.5.1.tar.bz2 New: ---- libvirt-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ ++++ 1405 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libvirt/libvirt.spec ++++ and /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.spec ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -138,6 +138,7 @@ int lxcContainerHasReboot(void) +@@ -142,6 +142,7 @@ int lxcContainerHasReboot(void) int cmd, v; int status; char *tmp; @@ -10,7 +10,7 @@ if (virFileReadAll("/proc/sys/kernel/ctrl-alt-del", 10, &buf) < 0) return -1; -@@ -154,14 +155,21 @@ int lxcContainerHasReboot(void) +@@ -158,14 +159,21 @@ int lxcContainerHasReboot(void) VIR_FREE(buf); cmd = v ? LINUX_REBOOT_CMD_CAD_ON : LINUX_REBOOT_CMD_CAD_OFF; @@ -34,7 +34,7 @@ VIR_FREE(stack); if (cpid < 0) { virReportSystemError(errno, "%s", -@@ -2122,6 +2130,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2108,6 +2116,9 @@ int lxcContainerStart(virDomainDefPtr de ttyPaths, nttyPaths, handshakefd}; /* allocate a stack for the container */ @@ -44,7 +44,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -2140,7 +2151,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -2126,7 +2137,11 @@ int lxcContainerStart(virDomainDefPtr de cflags |= CLONE_NEWNET; } @@ -56,7 +56,7 @@ VIR_FREE(stack); VIR_DEBUG("clone() completed, new container PID is %d", pid); -@@ -2166,6 +2181,7 @@ int lxcContainerAvailable(int features) +@@ -2152,6 +2167,7 @@ int lxcContainerAvailable(int features) int cpid; char *childStack; char *stack; @@ -64,7 +64,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -2173,14 +2189,21 @@ int lxcContainerAvailable(int features) +@@ -2159,14 +2175,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ fix-pci-attach-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -8,11 +8,11 @@ This patch changes the xend driver to always call 'device_configure' for PCI devices to be consistent with the usage in the xen tools. -Index: libvirt-1.0.5.1/src/xen/xend_internal.c +Index: libvirt-1.0.6/src/xen/xend_internal.c =================================================================== ---- libvirt-1.0.5.1.orig/src/xen/xend_internal.c -+++ libvirt-1.0.5.1/src/xen/xend_internal.c -@@ -2473,6 +2473,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +--- libvirt-1.0.6.orig/src/xen/xend_internal.c ++++ libvirt-1.0.6/src/xen/xend_internal.c +@@ -2220,6 +2220,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; char *target = NULL; @@ -20,23 +20,23 @@ virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); -@@ -2585,8 +2586,18 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -2320,8 +2321,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr } sexpr = virBufferContentAndReset(&buf); -+ new_dev = virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref)); ++ new_dev = virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref)); -- if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) { +- if (virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref))) { + /* always call 'device_configure' for pci device */ + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { -+ ret = xend_op(domain->conn, domain->name, "op", "device_configure", ++ ret = xend_op(conn, def->name, "op", "device_configure", + "config", sexpr, "dev", ref, NULL); + goto cleanup; + } + + if (new_dev) { /* device doesn't exist, define it */ - ret = xend_op(domain->conn, domain->name, "op", "device_create", + ret = xend_op(conn, def->name, "op", "device_create", "config", sexpr, NULL); ++++++ install-apparmor-profiles.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,10 +1,10 @@ -Index: libvirt-1.0.5.1/examples/apparmor/Makefile.am +Index: libvirt-1.0.6/examples/apparmor/Makefile.am =================================================================== ---- libvirt-1.0.5.1.orig/examples/apparmor/Makefile.am -+++ libvirt-1.0.5.1/examples/apparmor/Makefile.am -@@ -1,8 +1,45 @@ - ## Copyright (C) 2005-2011 Red Hat, Inc. - ## See COPYING.LIB for the License of this software +--- libvirt-1.0.6.orig/examples/apparmor/Makefile.am ++++ libvirt-1.0.6/examples/apparmor/Makefile.am +@@ -14,8 +14,45 @@ + ## License along with this library. If not, see + ## <http://www.gnu.org/licenses/>. -EXTRA_DIST= \ - TEMPLATE \ @@ -53,10 +53,10 @@ + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + +endif -Index: libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +Index: libvirt-1.0.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in =================================================================== --- /dev/null -+++ libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in ++++ libvirt-1.0.6/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> @@ -98,9 +98,9 @@ + /var/lib/kvm/images/ r, + /var/lib/kvm/images/** r, +} -Index: libvirt-1.0.5.1/examples/apparmor/usr.lib.libvirt.virt-aa-helper +Index: libvirt-1.0.6/examples/apparmor/usr.lib.libvirt.virt-aa-helper =================================================================== ---- libvirt-1.0.5.1.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +--- libvirt-1.0.6.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ /dev/null @@ -1,38 +0,0 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 @@ -141,9 +141,9 @@ - /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/** r, -} -Index: libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd +Index: libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd =================================================================== ---- libvirt-1.0.5.1.orig/examples/apparmor/usr.sbin.libvirtd +--- libvirt-1.0.6.orig/examples/apparmor/usr.sbin.libvirtd +++ /dev/null @@ -1,52 +0,0 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 @@ -198,10 +198,10 @@ - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - -} -Index: libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd.in +Index: libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd.in =================================================================== --- /dev/null -+++ libvirt-1.0.5.1/examples/apparmor/usr.sbin.libvirtd.in ++++ libvirt-1.0.6/examples/apparmor/usr.sbin.libvirtd.in @@ -0,0 +1,58 @@ +# Last Modified: Fri Aug 19 11:20:36 2011 +#include <tunables/global> @@ -261,9 +261,9 @@ + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + +} -Index: libvirt-1.0.5.1/examples/apparmor/libvirt-qemu +Index: libvirt-1.0.6/examples/apparmor/libvirt-qemu =================================================================== ---- libvirt-1.0.5.1.orig/examples/apparmor/libvirt-qemu +--- libvirt-1.0.6.orig/examples/apparmor/libvirt-qemu +++ /dev/null @@ -1,129 +0,0 @@ -# Last Modified: Fri Mar 9 14:43:22 2012 @@ -395,10 +395,10 @@ - - /usr/libexec/qemu-bridge-helper rmix, - } -Index: libvirt-1.0.5.1/examples/apparmor/libvirt-qemu.in +Index: libvirt-1.0.6/examples/apparmor/libvirt-qemu.in =================================================================== --- /dev/null -+++ libvirt-1.0.5.1/examples/apparmor/libvirt-qemu.in ++++ libvirt-1.0.6/examples/apparmor/libvirt-qemu.in @@ -0,0 +1,132 @@ +# Last Modified: Fri Mar 9 14:43:22 2012 + ++++++ libvirt-1.0.5.1.tar.bz2 -> libvirt-1.0.6.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libvirt/libvirt-1.0.5.1.tar.bz2 /work/SRC/openSUSE:Factory/.libvirt.new/libvirt-1.0.6.tar.bz2 differ: char 11, line 1 ++++++ libvirt-guests-init-script.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirt-guests init files to conform to SUSE standards -Index: libvirt-1.0.5.1/tools/libvirt-guests.init.in +Index: libvirt-1.0.6/tools/libvirt-guests.init.in =================================================================== ---- libvirt-1.0.5.1.orig/tools/libvirt-guests.init.in -+++ libvirt-1.0.5.1/tools/libvirt-guests.init.in +--- libvirt-1.0.6.orig/tools/libvirt-guests.init.in ++++ libvirt-1.0.6/tools/libvirt-guests.init.in @@ -3,15 +3,15 @@ # the following is the LSB init header # @@ -28,12 +28,13 @@ ### END INIT INFO # the following is chkconfig init header -Index: libvirt-1.0.5.1/tools/libvirt-guests.sh.in +Index: libvirt-1.0.6/tools/libvirt-guests.sh.in =================================================================== ---- libvirt-1.0.5.1.orig/tools/libvirt-guests.sh.in -+++ libvirt-1.0.5.1/tools/libvirt-guests.sh.in -@@ -1,13 +1,12 @@ - #!/bin/sh +--- libvirt-1.0.6.orig/tools/libvirt-guests.sh.in ++++ libvirt-1.0.6/tools/libvirt-guests.sh.in +@@ -16,14 +16,13 @@ + # License along with this library. If not, see + # <http://www.gnu.org/licenses/>. +. /etc/rc.status +rc_reset @@ -49,7 +50,7 @@ # Source gettext library. # Make sure this file is recognized as having translations: _("dummy") . "@bindir@"/gettext.sh -@@ -26,9 +25,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- +@@ -42,9 +41,11 @@ test -f "$sysconfdir"/sysconfig/libvirt- . "$sysconfdir"/sysconfig/libvirt-guests LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests @@ -64,7 +65,7 @@ # retval COMMAND ARGUMENTS... # run command with arguments and convert non-zero return value to 1 and set -@@ -36,7 +37,7 @@ RETVAL=0 +@@ -52,7 +53,7 @@ RETVAL=0 retval() { "$@" if [ $? -ne 0 ]; then @@ -73,7 +74,7 @@ return 1 else return 0 -@@ -65,6 +66,25 @@ run_virsh_c() { +@@ -81,6 +82,25 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } @@ -99,7 +100,7 @@ # test_connect URI # check if URI is reachable test_connect() -@@ -91,7 +111,7 @@ list_guests() { +@@ -107,7 +127,7 @@ list_guests() { list=$(run_virsh_c "$uri" list --uuid $persistent) if [ $? -ne 0 ]; then @@ -108,7 +109,7 @@ return 1 fi -@@ -117,7 +137,7 @@ guest_is_on() { +@@ -133,7 +153,7 @@ guest_is_on() { guest_running=false id=$(run_virsh "$uri" domid "$uuid") if [ $? -ne 0 ]; then @@ -117,7 +118,7 @@ return 1 fi -@@ -165,6 +185,12 @@ start() { +@@ -181,6 +201,12 @@ start() { test_connect "$uri" || continue @@ -130,7 +131,7 @@ eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") -@@ -378,7 +404,7 @@ shutdown_guests_parallel() +@@ -394,7 +420,7 @@ shutdown_guests_parallel() timeout=$(($timeout - 1)) if [ $timeout -le 0 ]; then eval_gettext "Timeout expired while shutting down domains"; echo @@ -139,7 +140,7 @@ return fi else -@@ -406,7 +432,7 @@ stop() { +@@ -422,7 +448,7 @@ stop() { if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" echo @@ -148,7 +149,7 @@ return fi fi -@@ -454,14 +480,14 @@ stop() { +@@ -470,14 +496,14 @@ stop() { if [ $? -ne 0 ]; then eval_gettext "Failed to list persistent guests on \$uri" echo @@ -165,7 +166,7 @@ set +f return fi -@@ -520,14 +546,13 @@ gueststatus() { +@@ -536,14 +562,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo @@ -182,16 +183,16 @@ fi fi } -@@ -572,4 +597,4 @@ case "$1" in +@@ -588,4 +613,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit -Index: libvirt-1.0.5.1/tools/libvirt-guests.sysconf +Index: libvirt-1.0.6/tools/libvirt-guests.sysconf =================================================================== ---- libvirt-1.0.5.1.orig/tools/libvirt-guests.sysconf -+++ libvirt-1.0.5.1/tools/libvirt-guests.sysconf +--- libvirt-1.0.6.orig/tools/libvirt-guests.sysconf ++++ libvirt-1.0.6/tools/libvirt-guests.sysconf @@ -1,19 +1,29 @@ +## Path: System/Virtualization/libvirt-guests + ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.0.5.1/configure.ac +Index: libvirt-1.0.6/configure.ac =================================================================== ---- libvirt-1.0.5.1.orig/configure.ac -+++ libvirt-1.0.5.1/configure.ac -@@ -159,6 +159,7 @@ LIBVIRT_CHECK_DBUS +--- libvirt-1.0.6.orig/configure.ac ++++ libvirt-1.0.6/configure.ac +@@ -172,6 +172,7 @@ LIBVIRT_CHECK_DBUS LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_HAL LIBVIRT_CHECK_NETCF @@ -10,7 +10,7 @@ LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS -@@ -2205,11 +2206,12 @@ if test "$with_libvirtd" = "no" ; then +@@ -2227,11 +2228,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi @@ -26,7 +26,7 @@ esac if test "$with_interface" = "yes" ; then -@@ -2488,6 +2490,7 @@ LIBVIRT_RESULT_DBUS +@@ -2510,6 +2512,7 @@ LIBVIRT_RESULT_DBUS LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_HAL LIBVIRT_RESULT_NETCF @@ -34,11 +34,11 @@ LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS -Index: libvirt-1.0.5.1/src/Makefile.am +Index: libvirt-1.0.6/src/Makefile.am =================================================================== ---- libvirt-1.0.5.1.orig/src/Makefile.am -+++ libvirt-1.0.5.1/src/Makefile.am -@@ -715,6 +715,10 @@ if WITH_NETCF +--- libvirt-1.0.6.orig/src/Makefile.am ++++ libvirt-1.0.6/src/Makefile.am +@@ -716,6 +716,10 @@ if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c endif @@ -49,7 +49,7 @@ if WITH_UDEV INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_udev.c -@@ -1200,11 +1204,16 @@ if WITH_NETCF +@@ -1215,11 +1219,16 @@ if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) else @@ -66,11 +66,11 @@ if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version -Index: libvirt-1.0.5.1/tools/virsh.c +Index: libvirt-1.0.6/tools/virsh.c =================================================================== ---- libvirt-1.0.5.1.orig/tools/virsh.c -+++ libvirt-1.0.5.1/tools/virsh.c -@@ -2888,6 +2888,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE +--- libvirt-1.0.6.orig/tools/virsh.c ++++ libvirt-1.0.6/tools/virsh.c +@@ -2886,6 +2886,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); @@ -79,10 +79,10 @@ # elif defined(WITH_UDEV) vshPrint(ctl, " udev"); # endif -Index: libvirt-1.0.5.1/src/interface/interface_backend_netcf.c +Index: libvirt-1.0.6/src/interface/interface_backend_netcf.c =================================================================== ---- libvirt-1.0.5.1.orig/src/interface/interface_backend_netcf.c -+++ libvirt-1.0.5.1/src/interface/interface_backend_netcf.c +--- libvirt-1.0.6.orig/src/interface/interface_backend_netcf.c ++++ libvirt-1.0.6/src/interface/interface_backend_netcf.c @@ -23,7 +23,12 @@ #include <config.h> @@ -146,10 +146,10 @@ /* open netcf */ if (ncf_init(&driverState->netcf, NULL) != 0) { -Index: libvirt-1.0.5.1/src/interface/interface_driver.c +Index: libvirt-1.0.6/src/interface/interface_driver.c =================================================================== ---- libvirt-1.0.5.1.orig/src/interface/interface_driver.c -+++ libvirt-1.0.5.1/src/interface/interface_driver.c +--- libvirt-1.0.6.orig/src/interface/interface_driver.c ++++ libvirt-1.0.6/src/interface/interface_driver.c @@ -28,8 +28,15 @@ interfaceRegister(void) { if (netcfIfaceRegister() == 0) return 0; @@ -167,10 +167,10 @@ if (udevIfaceRegister() == 0) return 0; #endif /* WITH_UDEV */ -Index: libvirt-1.0.5.1/m4/virt-netcontrol.m4 +Index: libvirt-1.0.6/m4/virt-netcontrol.m4 =================================================================== --- /dev/null -+++ libvirt-1.0.5.1/m4/virt-netcontrol.m4 ++++ libvirt-1.0.6/m4/virt-netcontrol.m4 @@ -0,0 +1,35 @@ +dnl The libnetcontrol library +dnl ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-1.0.5.1/daemon/libvirtd.conf +Index: libvirt-1.0.6/daemon/libvirtd.conf =================================================================== ---- libvirt-1.0.5.1.orig/daemon/libvirtd.conf -+++ libvirt-1.0.5.1/daemon/libvirtd.conf +--- libvirt-1.0.6.orig/daemon/libvirtd.conf ++++ libvirt-1.0.6/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -13,11 +13,11 @@ # 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-1.0.5.1/daemon/libvirtd-config.c +Index: libvirt-1.0.6/daemon/libvirtd-config.c =================================================================== ---- libvirt-1.0.5.1.orig/daemon/libvirtd-config.c -+++ libvirt-1.0.5.1/daemon/libvirtd-config.c -@@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT +--- libvirt-1.0.6.orig/daemon/libvirtd-config.c ++++ libvirt-1.0.6/daemon/libvirtd-config.c +@@ -225,7 +225,7 @@ daemonConfigNew(bool privileged ATTRIBUT return NULL; } @@ -25,4 +25,4 @@ + data->listen_tls = 0; data->listen_tcp = 0; - if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT))) + if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || ++++++ libvirtd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,9 +1,9 @@ Adjust libvirtd sysconfig file to conform to SUSE standards -Index: libvirt-1.0.5.1/daemon/libvirtd.sysconf +Index: libvirt-1.0.6/daemon/libvirtd.sysconf =================================================================== ---- libvirt-1.0.5.1.orig/daemon/libvirtd.sysconf -+++ libvirt-1.0.5.1/daemon/libvirtd.sysconf +--- libvirt-1.0.6.orig/daemon/libvirtd.sysconf ++++ libvirt-1.0.6/daemon/libvirtd.sysconf @@ -1,16 +1,25 @@ +## Path: System/Virtualization/libvirt + ++++++ libvirtd.init ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -61,7 +61,6 @@ ;; stop) echo -n "Shutting down libvirtd " - rm -f /var/lock/subsys/libvirtd rm -rf /var/cache/libvirt/* killproc -TERM $LIBVIRTD_BIN > /dev/null 2>&1 rm -f $LIBVIRTD_PIDFILE ++++++ relax-qemu-usergroup-check.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -7,11 +7,11 @@ daemon. Then the qemu driver would only be loaded when needed, which would never be the case on a xen-only configuration. -Index: libvirt-1.0.5.1/src/qemu/qemu_conf.c +Index: libvirt-1.0.6/src/qemu/qemu_conf.c =================================================================== ---- libvirt-1.0.5.1.orig/src/qemu/qemu_conf.c -+++ libvirt-1.0.5.1/src/qemu/qemu_conf.c -@@ -435,15 +435,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD +--- libvirt-1.0.6.orig/src/qemu/qemu_conf.c ++++ libvirt-1.0.6/src/qemu/qemu_conf.c +@@ -465,15 +465,15 @@ int virQEMUDriverConfigLoadFile(virQEMUD p = virConfGetValue(conf, "user"); CHECK_TYPE("user", VIR_CONF_STRING); ++++++ support-managed-pci-xen-driver.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -8,11 +8,11 @@ src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 15 deletions(-) -Index: libvirt-1.0.5.1/src/xenxs/xen_sxpr.c +Index: libvirt-1.0.6/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.0.5.1.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.0.5.1/src/xenxs/xen_sxpr.c -@@ -1035,6 +1035,7 @@ xenParseSxprPCI(virDomainDefPtr def, +--- libvirt-1.0.6.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.0.6/src/xenxs/xen_sxpr.c +@@ -1006,6 +1006,7 @@ xenParseSxprPCI(virDomainDefPtr def, int busID; int slotID; int funcID; @@ -20,7 +20,7 @@ node = cur->u.s.car; if (!sexpr_lookup(node, "dev")) -@@ -1082,11 +1083,13 @@ xenParseSxprPCI(virDomainDefPtr def, +@@ -1053,11 +1054,13 @@ xenParseSxprPCI(virDomainDefPtr def, goto error; } @@ -35,7 +35,7 @@ dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; dev->source.subsys.u.pci.addr.domain = domainID; dev->source.subsys.u.pci.addr.bus = busID; -@@ -2042,11 +2045,15 @@ static void +@@ -2013,11 +2016,15 @@ static void xenFormatSxprPCI(virDomainHostdevDefPtr def, virBufferPtr buf) { @@ -52,7 +52,7 @@ } -@@ -2065,12 +2072,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP +@@ -2036,12 +2043,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP virBufferPtr buf, int detach) { @@ -65,8 +65,8 @@ virBufferAddLit(buf, "(pci "); xenFormatSxprPCI(def, buf); if (detach) -@@ -2125,12 +2126,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, - for (i = 0 ; i < def->nhostdevs ; i++) { +@@ -2096,12 +2097,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def, + for (i = 0; i < def->nhostdevs; i++) { if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { - if (def->hostdevs[i]->managed) { @@ -78,11 +78,11 @@ xenFormatSxprPCI(def->hostdevs[i], buf); } } -Index: libvirt-1.0.5.1/src/xenxs/xen_xm.c +Index: libvirt-1.0.6/src/xenxs/xen_xm.c =================================================================== ---- libvirt-1.0.5.1.orig/src/xenxs/xen_xm.c -+++ libvirt-1.0.5.1/src/xenxs/xen_xm.c -@@ -815,6 +815,8 @@ xenParseXM(virConfPtr conf, int xendConf +--- libvirt-1.0.6.orig/src/xenxs/xen_xm.c ++++ libvirt-1.0.6/src/xenxs/xen_xm.c +@@ -806,6 +806,8 @@ xenParseXM(virConfPtr conf, int xendConf int busID; int slotID; int funcID; @@ -91,7 +91,7 @@ domain[0] = bus[0] = slot[0] = func[0] = '\0'; -@@ -824,6 +826,11 @@ xenParseXM(virConfPtr conf, int xendConf +@@ -815,6 +817,11 @@ xenParseXM(virConfPtr conf, int xendConf /* pci=['0000:00:1b.0','0000:00:13.0'] */ if (!(key = list->str)) goto skippci; @@ -103,7 +103,7 @@ if (!(nextkey = strchr(key, ':'))) goto skippci; -@@ -872,10 +879,30 @@ xenParseXM(virConfPtr conf, int xendConf +@@ -863,10 +870,30 @@ xenParseXM(virConfPtr conf, int xendConf if (virStrToLong_i(func, NULL, 16, &funcID) < 0) goto skippci; ++++++ suse-qemu-conf.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.0.5.1/src/qemu/qemu.conf +Index: libvirt-1.0.6/src/qemu/qemu.conf =================================================================== ---- libvirt-1.0.5.1.orig/src/qemu/qemu.conf -+++ libvirt-1.0.5.1/src/qemu/qemu.conf -@@ -169,7 +169,16 @@ +--- libvirt-1.0.6.orig/src/qemu/qemu.conf ++++ libvirt-1.0.6/src/qemu/qemu.conf +@@ -175,7 +175,16 @@ # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. # @@ -19,7 +19,7 @@ # If set to non-zero, then the default security labeling # will make guests confined. If set to zero, then guests -@@ -365,6 +374,15 @@ +@@ -371,6 +380,15 @@ #allow_disk_format_probing = 1 ++++++ virtlockd-init-script.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,9 +1,9 @@ Adjust virtlockd init files to conform to SUSE standards -Index: libvirt-1.0.5.1/src/locking/virtlockd.sysconf +Index: libvirt-1.0.6/src/locking/virtlockd.sysconf =================================================================== ---- libvirt-1.0.5.1.orig/src/locking/virtlockd.sysconf -+++ libvirt-1.0.5.1/src/locking/virtlockd.sysconf +--- libvirt-1.0.6.orig/src/locking/virtlockd.sysconf ++++ libvirt-1.0.6/src/locking/virtlockd.sysconf @@ -1,3 +1,7 @@ +## Path: System/Virtualization/virtlockd + @@ -12,10 +12,10 @@ # # Pass extra arguments to virtlockd #VIRTLOCKD_ARGS= -Index: libvirt-1.0.5.1/src/locking/virtlockd.init.in +Index: libvirt-1.0.6/src/locking/virtlockd.init.in =================================================================== ---- libvirt-1.0.5.1.orig/src/locking/virtlockd.init.in -+++ libvirt-1.0.5.1/src/locking/virtlockd.init.in +--- libvirt-1.0.6.orig/src/locking/virtlockd.init.in ++++ libvirt-1.0.6/src/locking/virtlockd.init.in @@ -4,11 +4,13 @@ # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -14,78 +14,32 @@ is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-1.0.5.1/src/xen/xend_internal.c +Index: libvirt-1.0.6/src/xen/xend_internal.c =================================================================== ---- libvirt-1.0.5.1.orig/src/xen/xend_internal.c -+++ libvirt-1.0.5.1/src/xen/xend_internal.c -@@ -60,8 +60,8 @@ +--- libvirt-1.0.6.orig/src/xen/xend_internal.c ++++ libvirt-1.0.6/src/xen/xend_internal.c +@@ -70,7 +70,7 @@ #define XEND_RCV_BUF_MAX_LEN (256 * 1024) static int --virDomainXMLDevID(virDomainPtr domain, virDomainDeviceDefPtr dev, char *class, -- char *ref, int ref_len); -+virDomainXMLDevID(virDomainPtr domain, virDomainDefPtr domDef, -+ virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len); - - /** - * do_connect: -@@ -2586,7 +2586,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr - - sexpr = virBufferContentAndReset(&buf); - -- if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) { -+ if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) { - /* device doesn't exist, define it */ - ret = xend_op(domain->conn, domain->name, "op", "device_create", - "config", sexpr, NULL); -@@ -2701,7 +2701,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr - - sexpr = virBufferContentAndReset(&buf); - -- if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) { -+ if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("requested device does not exist")); - goto cleanup; -@@ -2790,7 +2790,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr - VIR_DOMAIN_XML_INACTIVE))) - goto cleanup; - -- if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) -+ if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) - goto cleanup; - - if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -3682,31 +3682,32 @@ struct xenUnifiedDriver xenDaemonDriver - /** - * virDomainXMLDevID: - * @domain: pointer to domain object -+ * @domDef: pointer to domain definition object - * @dev: pointer to device config object - * @class: Xen device class "vbd" or "vif" (OUT) - * @ref: Xen device reference (OUT) -+ * @ref_len: Length of character buffer proviced by the ref parameter - * - * Set class according to XML root, and: - * - if disk, copy in ref the target name from description -- * - if network, get MAC address from description, scan XenStore and -- * copy in ref the corresponding vif number. -- * - if pci, get BDF from description, scan XenStore and -- * copy in ref the corresponding dev number. -+ * - if network, copy in ref the target MAC address from description -+ * - if pci, copy in ref the target BDF from description - * +-virDomainXMLDevID(virConnectPtr conn, virDomainDefPtr domain, ++virDomainXMLDevID(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainDefPtr domain, + virDomainDeviceDefPtr dev, char *class, + char *ref, int ref_len); + +@@ -3332,18 +3332,18 @@ xenDaemonDomainBlockPeek(virConnectPtr c * Returns 0 in case of success, -1 in case of failure. */ static int - virDomainXMLDevID(virDomainPtr domain, -+ virDomainDefPtr domDef, +-virDomainXMLDevID(virConnectPtr conn, ++virDomainXMLDevID(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainDefPtr def, virDomainDeviceDefPtr dev, char *class, char *ref, int ref_len) { -- xenUnifiedPrivatePtr priv = domain->conn->privateData; +- xenUnifiedPrivatePtr priv = conn->privateData; - char *xref; - char *tmp; + unsigned int i; @@ -96,14 +50,14 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); -@@ -3716,19 +3717,17 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3353,19 +3353,17 @@ virDomainXMLDevID(virConnectPtr conn, else strcpy(class, "vbd"); - if (dev->data.disk->dst == NULL) - return -1; - xenUnifiedLock(priv); -- xref = xenStoreDomainGetDiskID(domain->conn, domain->id, +- xref = xenStoreDomainGetDiskID(conn, def->id, - dev->data.disk->dst); - xenUnifiedUnlock(priv); - if (xref == NULL) @@ -114,8 +68,8 @@ - if (tmp == NULL) - return -1; + /* For disks, the device name can be used directly. */ -+ for (i = 0; i < domDef->ndisks; i++) { -+ virDomainDiskDefPtr disk = domDef->disks[i]; ++ for (i = 0; i < def->ndisks; i++) { ++ virDomainDiskDefPtr disk = def->disks[i]; + if (STREQ(dev->data.disk->dst, disk->dst)) { + if (virStrcpy(ref, disk->dst, ref_len) == NULL) + return -1; @@ -126,13 +80,13 @@ + return -1; } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[VIR_MAC_STRING_BUFLEN]; - virDomainNetDefPtr def = dev->data.net; -@@ -3736,16 +3735,22 @@ virDomainXMLDevID(virDomainPtr domain, + virDomainNetDefPtr netdef = dev->data.net; +@@ -3373,16 +3371,22 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "vif"); - xenUnifiedLock(priv); -- xref = xenStoreDomainGetNetworkID(domain->conn, domain->id, mac); +- xref = xenStoreDomainGetNetworkID(conn, def->id, mac); - xenUnifiedUnlock(priv); - if (xref == NULL) - return -1; @@ -142,9 +96,9 @@ - if (tmp == NULL) - return -1; + /* For nics, the mac address can be used directly. */ -+ for (i = 0; i < domDef->nnets; i++) { ++ for (i = 0; i < def->nnets; i++) { + char dst_mac[30]; -+ virDomainNetDefPtr dst_net = domDef->nets[i]; ++ virDomainNetDefPtr dst_net = def->nets[i]; + snprintf(dst_mac, sizeof(dst_mac), "%02x:%02x:%02x:%02x:%02x:%02x", + dst_net->mac.addr[0], dst_net->mac.addr[1], + dst_net->mac.addr[2], dst_net->mac.addr[3], @@ -160,20 +114,20 @@ } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { -@@ -3763,17 +3768,44 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -3400,17 +3404,44 @@ virDomainXMLDevID(virConnectPtr conn, strcpy(class, "pci"); - xenUnifiedLock(priv); -- xref = xenStoreDomainGetPCIID(domain->conn, domain->id, bdf); +- xref = xenStoreDomainGetPCIID(conn, def->id, bdf); - xenUnifiedUnlock(priv); - VIR_FREE(bdf); - if (xref == NULL) - return -1; + /* For PCI devices, the device BFD can be used directly. */ -+ for (i = 0 ; i < domDef->nhostdevs ; i++) { ++ for (i = 0 ; i < def->nhostdevs ; i++) { + char *dst_bdf; -+ virDomainHostdevDefPtr hostdev = domDef->hostdevs[i]; ++ virDomainHostdevDefPtr hostdev = def->hostdevs[i]; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.jlT57D/_old 2013-06-11 09:34:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jlT57D/_new 2013-06-11 09:34:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-1.0.5.1/src/xenxs/xen_sxpr.c +Index: libvirt-1.0.6/src/xenxs/xen_sxpr.c =================================================================== ---- libvirt-1.0.5.1.orig/src/xenxs/xen_sxpr.c -+++ libvirt-1.0.5.1/src/xenxs/xen_sxpr.c -@@ -341,7 +341,7 @@ error: +--- libvirt-1.0.6.orig/src/xenxs/xen_sxpr.c ++++ libvirt-1.0.6/src/xenxs/xen_sxpr.c +@@ -328,7 +328,7 @@ error: static int xenParseSxprDisks(virDomainDefPtr def, const struct sexpr *root, @@ -11,7 +11,7 @@ int xendConfigVersion) { const struct sexpr *cur, *node; -@@ -392,7 +392,6 @@ xenParseSxprDisks(virDomainDefPtr def, +@@ -379,7 +379,6 @@ xenParseSxprDisks(virDomainDefPtr def, /* There is a case without the uname to the CD-ROM device */ offset = strchr(dst, ':'); if (!offset || -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
