--- libvirt-0.6.4.orig/debian/copyright +++ libvirt-0.6.4/debian/copyright @@ -0,0 +1,44 @@ +libvirt was initially debianized by Andrew Mitchell + +It was downloaded from http://libvirt.org/sources/ + +Upstream Author: + + Daniel Veillard or + +Copyright: + + 2005,2006 Red Hat, Inc + +Licenses: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + src/hash.c: + + Copyright (C) 2000 Bjorn Reese and Daniel Veillard. + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND + CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER. + + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- libvirt-0.6.4.orig/debian/libvirt-doc.links +++ libvirt-0.6.4/debian/libvirt-doc.links @@ -0,0 +1 @@ +usr/share/doc/libvirt-doc/devhelp/ /usr/share/gtk-doc/html/libvirt --- libvirt-0.6.4.orig/debian/libvirt-bin.manpages +++ libvirt-0.6.4/debian/libvirt-bin.manpages @@ -0,0 +1 @@ +virsh.1 --- libvirt-0.6.4.orig/debian/libvirt-bin.init +++ libvirt-0.6.4/debian/libvirt-bin.init @@ -0,0 +1,170 @@ +#! /bin/sh +# +# Init skript for libvirtd +# +# (c) 2007 Guido Guenther +# based on the skeletons that comes with dh_make +# +### BEGIN INIT INFO +# Provides: libvirtd +# Required-Start: $network $local_fs +# Required-Stop: +# Should-Start: hal avahi +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: libvirt management daemon +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/libvirtd +NAME=libvirtd +DESC="libvirt management daemon" + +test -x $DAEMON || exit 0 +. /lib/lsb/init-functions + +PIDFILE=/var/run/$NAME.pid +DODTIME=1 # Time to wait for the server to die, in seconds + +# Include libvirtd defaults if available +if [ -f /etc/default/libvirt-bin ] ; then + . /etc/default/libvirt-bin +fi + +check_start_libvirtd_option() { + if [ ! "$start_libvirtd" = "yes" ]; then + log_warning_msg "Not starting libvirt management daemon libvirtd, disabled via /etc/default/libvirt-bin" + return 1 + else + return 0 + fi +} + +running_pid() +{ + # Check if a given process pid's cmdline matches a given name + pid=$1 + name=$2 + [ -z "$pid" ] && return 1 + [ ! -d /proc/$pid ] && return 1 + cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` + # Is this the expected child? + [ "$cmd" != "$name" ] && return 1 + return 0 +} + +running() +{ +# Check if the process is running looking at /proc +# (works for all users) + # No pidfile, probably no daemon present + [ ! -f "$PIDFILE" ] && return 1 + # Obtain the pid and check it against the binary name + pid=`cat $PIDFILE` + running_pid $pid $DAEMON || return 1 + return 0 +} + +force_stop() { +# Forcefully kill the process + [ ! -f "$PIDFILE" ] && return + if running ; then + kill -15 $pid + # Is it really dead? + [ -n "$DODTIME" ] && sleep "$DODTIME"s + if running ; then + kill -9 $pid + [ -n "$DODTIME" ] && sleep "$DODTIME"s + if running ; then + echo "Cannot kill $LABEL (pid=$pid)!" + exit 1 + fi + fi + fi + rm -f $PIDFILE + return 0 +} + +mkdir -p /var/run/libvirt +case "$1" in + start) + if check_start_libvirtd_option; then + log_daemon_msg "Starting $DESC" "$NAME" + if running ; then + log_progress_msg "already running" + log_end_msg 0 + exit 0 + fi + rm -f /var/run/libvirtd.pid + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $libvirtd_opts + if running; then + log_end_msg 0 + else + log_end_msg 1 + fi + fi + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if ! running ; then + log_progress_msg "not running" + log_end_msg 0 + exit 0 + fi + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --exec $DAEMON + log_end_msg 0 + ;; + force-stop) + log_daemon_msg "Forcefully stopping $DESC" "$NAME" + force_stop + if ! running; then + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + restart) + if check_start_libvirtd_option; then + log_daemon_msg "Restarting $DESC" "$DAEMON" + start-stop-daemon --oknodo --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + [ -n "$DODTIME" ] && sleep $DODTIME + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $libvirtd_opts + if running; then + log_end_msg 0 + else + log_end_msg 1 + fi + fi + ;; + reload|force-reload) + if running; then + log_daemon_msg "Reloading configuration of $DESC" "$NAME" + start-stop-daemon --stop --signal 1 --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + log_end_msg 0 + else + log_warning_msg "libvirtd not running, doing nothing." + fi + ;; + status) + log_daemon_msg "Checking status of $DESC" "$NAME" + if running ; then + log_progress_msg "running" + log_end_msg 0 + else + log_progress_msg "not running" + log_end_msg 1 + fi + ;; + *) + N=/etc/init.d/libvirt-bin + echo "Usage: $N {start|stop|restart|reload|force-reload|status|force-stop}" >&2 + exit 1 + ;; +esac + +exit 0 --- libvirt-0.6.4.orig/debian/libvirt-bin.default +++ libvirt-0.6.4/debian/libvirt-bin.default @@ -0,0 +1,11 @@ +# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin) +# This is a POSIX shell fragment + +# Start libvirtd to handle qemu/kvm: +start_libvirtd="yes" + +# options passed to libvirtd, add "-l" to listen on tcp +libvirtd_opts="-d" + +# pass in location of kerberos keytab +#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab --- libvirt-0.6.4.orig/debian/libvirt0.symbols +++ libvirt-0.6.4/debian/libvirt0.symbols @@ -0,0 +1,24 @@ +libvirt.so.0 libvirt0 #MINVER# + *@LIBVIRT_0.0.3 0.0.3 + *@LIBVIRT_0.0.5 0.0.5 + *@LIBVIRT_0.1.0 0.1.0 + *@LIBVIRT_0.1.1 0.1.1 + *@LIBVIRT_0.1.4 0.1.4 + *@LIBVIRT_0.1.5 0.1.5 + *@LIBVIRT_0.1.9 0.1.9 + *@LIBVIRT_0.2.0 0.2.0 + *@LIBVIRT_0.2.1 0.2.1 + *@LIBVIRT_0.2.3 0.2.3 + *@LIBVIRT_0.3.0 0.3.0 + *@LIBVIRT_0.3.2 0.3.2 + *@LIBVIRT_0.3.3 0.3.3 + *@LIBVIRT_0.4.0 0.4.0 + *@LIBVIRT_0.4.1 0.4.1 + *@LIBVIRT_0.4.2 0.4.2 + *@LIBVIRT_0.4.5 0.4.5 + *@LIBVIRT_0.5.0 0.5.0 + *@LIBVIRT_0.6.0 0.6.0 + *@LIBVIRT_0.6.1 0.6.1 + *@LIBVIRT_0.6.3 0.6.3 + *@LIBVIRT_0.6.4 0.6.4 + *@LIBVIRT_PRIVATE_0.6.4 0.6.4 --- libvirt-0.6.4.orig/debian/libvirt-bin.libvirtd.logrotate +++ libvirt-0.6.4/debian/libvirt-bin.libvirtd.logrotate @@ -0,0 +1,9 @@ +/var/log/libvirt/qemu/*.log { + daily + missingok + rotate 7 + compress + delaycompress + notifempty + copytruncate +} --- libvirt-0.6.4.orig/debian/libvirt-doc.doc-base.libvirt-doc +++ libvirt-0.6.4/debian/libvirt-doc.doc-base.libvirt-doc @@ -0,0 +1,8 @@ +Document: libvirt-doc +Title: Libvirt the virtualization API +Abstract: Local copy of the web site of libvirt +Section: Administration + +Format: HTML +Index: /usr/share/doc/libvirt-doc/intro.html +Files: /usr/share/doc/libvirt-doc/*.html --- libvirt-0.6.4.orig/debian/python-libvirt.install +++ libvirt-0.6.4/debian/python-libvirt.install @@ -0,0 +1,2 @@ +usr/lib/python*/*/*.so +usr/lib/python*/*/*.py --- libvirt-0.6.4.orig/debian/libvirt-bin.postinst +++ libvirt-0.6.4/debian/libvirt-bin.postinst @@ -0,0 +1,66 @@ +#!/bin/sh +# postinst script for libvirt-bin +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + if ! getent group libvirt >/dev/null; then + addgroup --system libvirt + fi + + # libvirt from 0.6.0 on is safe to restart with running vms: + if [ -n "$2" ] && dpkg --compare-versions "$2" ge 0.6.0; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d libvirt-bin stop + else + /etc/init.d/libvirt-bin stop + fi + sleep 1 + fi + + if dpkg --compare-versions "$2" lt "0.6.1-2"; then + if [ -e /etc/rc2.d/S20libvirt-bin ] && \ + [ -e /etc/rc3.d/S20libvirt-bin ] && \ + [ -e /etc/rc4.d/S20libvirt-bin ] && \ + [ -e /etc/rc5.d/S20libvirt-bin ] && \ + [ -e /etc/rc0.d/K20libvirt-bin ] && \ + [ -e /etc/rc1.d/K20libvirt-bin ] && \ + [ -e /etc/rc6.d/K20libvirt-bin ]; then + update-rc.d -f libvirt-bin remove >/dev/null + fi + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- libvirt-0.6.4.orig/debian/libvirt0.install +++ libvirt-0.6.4/debian/libvirt0.install @@ -0,0 +1,2 @@ +usr/lib/libvirt.so.* + --- libvirt-0.6.4.orig/debian/pycompat +++ libvirt-0.6.4/debian/pycompat @@ -0,0 +1 @@ +2 --- libvirt-0.6.4.orig/debian/libvirt-suspendonreboot +++ libvirt-0.6.4/debian/libvirt-suspendonreboot @@ -0,0 +1,48 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: libvirt-suspendonreboot +# Required-Start: libvirtd +# Required-Stop: libvirtd $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: suspend/resmum vms on reboot +### END INIT INFO +# (c) Andi Barth 2008 +# Distributable under the terms of the GNU GPL version 2. +# +# copy to /etc/init.d/libvirt-suspendonreboot and use +# update-rc.d libvirt-suspendonreboot defaults 29 71 +# to enable + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin + +suspenddir=/var/lib/libvirt/autosuspend + +case "$1" in + start) + for domain in ${suspenddir}/*dump; do + if [ -f $domain ]; then + domain=$(basename $domain .dump) + echo "resuming $domain ..." + virsh restore ${suspenddir}/${domain}.dump && rm ${suspenddir}/${domain}.dump + fi + done + ;; + stop) + for domain in /etc/libvirt/qemu/*xml; do + domain=$(basename $domain .xml) + state=$(virsh domstate $domain) + if [ "$state" = "running" ]; then + echo "suspending $domain ..." + virsh save ${domain} ${suspenddir}/${domain}.dump + fi + done + ;; + reload|force-reload|restart) + # No action, nothing to reload + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + exit 1 +esac + --- libvirt-0.6.4.orig/debian/README.Debian +++ libvirt-0.6.4/debian/README.Debian @@ -0,0 +1,59 @@ +Xen +=== +To manage xen domains with libvirt you have to set: + +(xend-unix-server yes) + +in /etc/xen/xend-config.sxp. + +For xend HTTP access (not recommended) you also have to set: + +(xend-http-server yes) +# only allow access from localhost: +(xend-address localhost) + +Note that *every* user on the system has access to xend then. Better use +libvirtd to access xen with unprivileged users and add the users to the +"libvirt" group (see "Access Control" below). + +Debugging +========= +Use LIBVIRT_DEBUG=1 to enable libvirt's debugging output, e.g.: + +LIBVIRT_DEBUG=1 +export LIBVIRT_DEBUG +virt-manager + +The default NAT network +======================= +To ease network configuration libvirt defines a NATed network named "default". +VMs using this network end up in 192.168.122.1/24 and DHCP is provided to them +via dnsmasq. This network is not automatically started. To start it use: + + virsh net-start default + +To make the default network start automatically use: + + virsh net-autostart default + +In order for things to work this way you need to have the recommended packages +dnsmasq-base, bridge-utils and iptables installed. + +You don't need the package dnsmasq. However, if you install it, Debian's +default dnsmasq needs to be adjusted slightly to interoperate with libvirtd: + +cat </etc/dnsmasq.d/00_libvirtd.conf +# only bind to loopback by default +interface=lo +bind-interfaces +EOF + +This makes dnsmasq only bind to the loopback interface by default so libvirtd +can handle the virtual bridges. + +Access Control +============== +Access to the libvirt socket is controlled by membership in the "libvirt" group. +If you want to manage VMs as non root you need to add a user to that group. + + -- Guido Guenther Thu, 15 May 2008 14:13:03 +0100 --- libvirt-0.6.4.orig/debian/libvirt-bin.examples +++ libvirt-0.6.4/debian/libvirt-bin.examples @@ -0,0 +1,5 @@ +qemud/libvirtd.policy +qemud/libvirtd.sasl +qemud/libvirtd.conf +debian/libvirt-suspendonreboot + --- libvirt-0.6.4.orig/debian/libvirt-bin.install +++ libvirt-0.6.4/debian/libvirt-bin.install @@ -0,0 +1,8 @@ +usr/bin/* +usr/sbin/* +etc/libvirt/* +etc/sasl2/* +usr/share/PolicyKit/* +usr/lib/libvirt/* +usr/share/augeas/* +usr/share/libvirt/* --- libvirt-0.6.4.orig/debian/watch +++ libvirt-0.6.4/debian/watch @@ -0,0 +1,3 @@ +# format version number, currently 3; this line is compulsory! +version=3 +http://libvirt.org/sources/libvirt-([\d\.]*)\.tar\.gz --- libvirt-0.6.4.orig/debian/libvirt-dev.install +++ libvirt-0.6.4/debian/libvirt-dev.install @@ -0,0 +1,4 @@ +usr/lib/libvirt.so +usr/lib/libvirt.a +usr/include/* +usr/lib/pkgconfig/* --- libvirt-0.6.4.orig/debian/compat +++ libvirt-0.6.4/debian/compat @@ -0,0 +1 @@ +5 --- libvirt-0.6.4.orig/debian/rules +++ libvirt-0.6.4/debian/rules @@ -0,0 +1,54 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM=pycentral +DEB_DH_INSTALL_SOURCEDIR = debian/tmp + +ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64)) + BUILD_XEN=--with-xen + BUILD_VBOX=--with-vbox +else + BUILD_XEN=--without-xen + BUILD_VBOX=--without-vbox +endif + +ifneq (,$(findstring $(DEB_HOST_ARCH), ia64)) + BUILD_LXC=--without-lxc +else + BUILD_LXC=--with-lxc +endif + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_CONFIGURE_EXTRA_FLAGS := \ + --disable-rpath \ + --with-qemu \ + --with-openvz \ + --with-avahi \ + --with-sasl \ + --with-polkit \ + --with-hal \ + --with-storage-fs \ + --with-storage-lvm \ + --with-storage-iscsi \ + --with-storage-disk \ + --with-init-scripts=none \ + --without-numactl \ + --enable-debug \ + $(BUILD_XEN) \ + $(BUILD_VBOX) \ + $(BUILD_LXC) + +DEB_DBG_PACKAGES = libvirt0-dbg +DEB_DBG_PACKAGE_libvirt0 = libvirt0-dbg +DEB_PYTHON_SETUP_CMD := /dev/null +DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)' +DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade -- defaults 28 72 +DEB_DH_INSTALLLOGROTATE_ARGS := --name=libvirtd + +EXAMPLES=debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/ + +binary-install/libvirt-doc:: + cd $(EXAMPLES) && rm -rf .libs *.o info1 suspend ../html/CVS --- libvirt-0.6.4.orig/debian/libvirt-bin.dirs +++ libvirt-0.6.4/debian/libvirt-bin.dirs @@ -0,0 +1,4 @@ +/var/lib/libvirt/images +/var/lib/libvirt/boot +/var/cache/libvirt +/var/log/libvirt/qemu --- libvirt-0.6.4.orig/debian/libvirt-doc.docs +++ libvirt-0.6.4/debian/libvirt-doc.docs @@ -0,0 +1,8 @@ +docs/*.rng +docs/*.png +docs/*.xml +docs/*.html +docs/*.gif +docs/examples/ +docs/html/ +docs/devhelp/ --- libvirt-0.6.4.orig/debian/README.source +++ libvirt-0.6.4/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- libvirt-0.6.4.orig/debian/libvirt-bin.postrm +++ libvirt-0.6.4/debian/libvirt-bin.postrm @@ -0,0 +1,45 @@ +#!/bin/sh +# postrm script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + if getent group libvirt >/dev/null; then + delgroup libvirt || true + fi + + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- libvirt-0.6.4.orig/debian/control +++ libvirt-0.6.4/debian/control @@ -0,0 +1,94 @@ +Source: libvirt +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +Uploaders: Guido Günther +XSBC-Original-Maintainer: Debian Libvirt Maintainers +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.38), libxml2-dev, libncurses5-dev, libreadline5-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen3-dev [i386 amd64], lvm2, libpolkit-dbus-dev, open-iscsi, libparted1.8-dev, libselinux1-dev, libdevmapper-dev, uuid-dev, libhal-dev, module-init-tools +XS-Python-Version: current +Vcs-Git: git://git.debian.org/git/pkg-libvirt/libvirt.git +Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git +Homepage: http://libvirt.org +Standards-Version: 3.8.1 + +Package: libvirt-bin +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (>= ${binary:Version}), logrotate, bridge-utils, dnsmasq-base, netcat-openbsd, iptables +Enhances: qemu, kvm, xen +Section: admin +Recommends: kvm +Suggests: policykit +Description: the programs for the libvirt library + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the supporting binaries to use with libvirt + +Package: libvirt0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libvirt0-dbg (<< 0.4.2-6ubuntu1) +Replaces: libvirt0-dbg (<< 0.4.2-6ubuntu1) +Recommends: lvm2 +Description: library for interfacing with different virtualization systems + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, and XEN. + +Package: libvirt0-dbg +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libvirt0 (= ${binary:Version}) +Priority: extra +Section: debug +Description: library for interfacing with different virtualization systems + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the debugging symbols. + +Package: libvirt-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: devhelp +Description: documentation for the libvirt library + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the documentation. + +Package: libvirt-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, libvirt0 (= ${binary:Version}), libxen3-dev [i386 amd64] +Recommends: pkg-config +Description: development files for the libvirt library + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains the header files and static libraries which are + needed for developing the applications with libvirt. + +Package: python-libvirt +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvirt0 (>= ${binary:Version}) +Provides: ${python:Provides} +Section: python +XB-Python-Version: ${python:Versions} +Description: libvirt Python bindings + Libvirt is a C toolkit to interact with the virtualization capabilities + of recent versions of Linux (and other OSes). The library aims at providing + a long term stable C API for different virtualization mechanisms. It currently + supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox. + . + This package contains Python bindings for the libvirt library + --- libvirt-0.6.4.orig/debian/changelog +++ libvirt-0.6.4/debian/changelog @@ -0,0 +1,1020 @@ +libvirt (0.6.4-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Don't build-depend on QEmu. + + Add "XS-Debian-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables + to Depends of libvirt-bin. + + s/interract/interact/g + + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, + since we used to ship them as such. + - 9000-delayed_iff_up_bridge.patch: + Don't try to bring up the bridge before at least one interface has been + added to it. + - 9001-dont_clobber_existing_bridges.patch + Assign the name of the virtual bridge dynamically to avoid interfering + with existing bridges. + - 9002-better_default_uri_virsh.patch: + Default to qemu:///system if the user has write access to the libvirt + socket, otherwise qemu:///session. + - 9003-increase-logoutput-timeout.patch: + increase timeout waiting for log output in src/qemu_driver.c, set to 30 + seconds, which 10x longer than before, and matches the disk-wait in + mdadm. (LP #344400) + - 9004-better-default-arch.patch: + If a domain does not specify its architecture, attempt to match the host. + (LP #344913) + - 9005-libvirtd-group-name.patch: + Rename libvirt group to libvirtd. + - We call libxen-dev libxen3-dev, so change all references. + + -- Soren Hansen Mon, 22 Jun 2009 11:14:57 +0200 + +libvirt (0.6.4-1) unstable; urgency=low + + * [dd3adb2] Imported Upstream version 0.6.4 + * [2320162] update symbols file + * [89c9720] remove bashism (Closes: #530122) + * [30d86c1] drop patches fixed upstream: + 0005-don-t-crash-with-def-NULL.patch + 0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch + 0007-Declare-support-for-QEMU-migration-in-capabilities.patch + + -- Guido Günther Thu, 04 Jun 2009 12:50:01 +0200 + +libvirt (0.6.3-4) unstable; urgency=low + + * [3607f2f] Install libvirt_lxc that got list somewhere between our + testbuilds. (Closes: #529578) + * [070ddd5] install augeas lense + * [c9b034d] install schema files + + -- Guido Günther Wed, 20 May 2009 14:33:18 +0200 + +libvirt (0.6.3-3) unstable; urgency=low + + * [4087b7d] disable lxc on ia64 to work around FTBFS until we have + access to a test machine + * [df5f5a0] pull some kvm/qemu related patches from upstream + (Closes: #529324) + + -- Guido Günther Tue, 19 May 2009 19:14:57 +0200 + +libvirt (0.6.3-2) unstable; urgency=low + + * [35898d3] fix crash when libvirt_lxc is called without arguments + * [449ca60] enable lxc support (Closes: #526718) - thanks to Daniel + Pittman for testing this + * [335a4e6] update description with supported virtualization solutions + * [92eba47] delay libvirt-bin start until after avahi + * [8ebd17d] update startup priorities due to changed libvirt-bin + startup priority. Also add an LSB header. (Closes: #526944) + + -- Guido Günther Thu, 07 May 2009 13:28:40 +0200 + +libvirt (0.6.3-1) unstable; urgency=low + + * [0cb2f83] Imported Upstream version 0.6.3 + * virtual box support + * [06fe518] 0001-remove-RHism.diff.patch: use invoke-rc.d + * [ec2fd52] drop patches merged upstream: + * 0003-allow-libvirt-group-to-access-the-socket.patch series + * 0004-fix-Debian-specific-path-to-hvm-loader.patch + * [6977bde] enable vbox support + * [93c4423] add symbols file + + -- Guido Günther Sun, 03 May 2009 23:33:28 +0200 + +libvirt (0.6.2-2) unstable; urgency=low + + * [031b9c1] Don't hardcode buffer size for getgrnam_r. Works around + #520744 and fixes possible problems with implementations having + _SC_GETGR_R_SIZE_MAX != 1024. + * [bbe7743] respect log priority for qemu domain logs (Closes: #524145) + * [a2e4cb0] don't rely on log_end_msg returning 0 this isn't the case + with splashy. (Closes: #523712) + * [ddfafda] move debug package into section debug + + -- Guido Günther Thu, 16 Apr 2009 15:28:31 +0200 + +libvirt (0.6.2-1) unstable; urgency=low + + * [99fd06c] Imported Upstream version 0.6.2 (Closes: #521785) + * [78cd5c8] drop /var/run/libvirt created by init script + * [2a7cb3b] move startup of libvirtd after hal (Closes: #522310) + * [b8707ed] bump standards version 0.8.1 (no changes necessary) + + -- Guido Günther Thu, 09 Apr 2009 22:48:57 +0200 + +libvirt (0.6.1-1) unstable; urgency=low + + * [3be7341] Imported Upstream version 0.6.1 + * [38fde15] rediff Debian specific patches + * [9b59a19] drop patches applied upstream: + * 0004-Don-t-hardcode-ssh-port.patch + * 0005-minimal-workaround-for-qemu-startup-race.patch + * [95d4b7f] drop patches backported from upstream + * 0009-libvirt_proxy-Fix-use-of-uninitalized-memory.patch + * [8171d83] build-dep on module-init-tools so configure can figure out + the path to modprobe + + -- Guido Günther Thu, 05 Mar 2009 13:58:41 +0100 + +libvirt (0.6.1-0ubuntu5) jaunty; urgency=low + + * Fix logic error when applying %d bridge name rewriting. (LP: #350780) + + -- Soren Hansen Thu, 16 Apr 2009 20:48:49 +0200 + +libvirt (0.6.1-0ubuntu4) jaunty; urgency=low + + [ Marc Deslauriers ] + * 0008-increase-logoutput-timeout.patch: increase timeout waiting + for log output in src/qemu_driver.c, set to 30 seconds, which 10x + longer than before, and matches the disk-wait in mdadm, LP: #344400 + + -- Dustin Kirkland Fri, 27 Mar 2009 10:57:53 -0500 + +libvirt (0.6.1-0ubuntu3) jaunty; urgency=low + + * Fix "libvirt's defaults are slightly less than sane" (LP: #344913) + - more-flexible-emulator-on-x86.patch (from upstream) + - default-arch.patch + + -- Soren Hansen Thu, 19 Mar 2009 00:23:14 +0100 + +libvirt (0.6.1-0ubuntu2) jaunty; urgency=low + + * Add fix for event loop hang (LP: #344195) + http://article.gmane.org/gmane.comp.emulators.libvirt/12437 + * Add fix for Xen events handling. + http://git.et.redhat.com/?p=libvirt.git;a=commit;h=124cfcbc2bcd1b71b51e720b9bfc7d8e69e8af89 + + -- Soren Hansen Fri, 13 Mar 2009 16:51:33 +0100 + +libvirt (0.6.1-0ubuntu1) jaunty; urgency=low + + * New upstream release. (FFe: LP: #339868) + * Dropped 0004-Don-t-hardcode-ssh-port.patch: Included upstream. + * Rewrote dynamic_bridge_names.patch to work with refactored upstream + bridging code. + + -- Soren Hansen Mon, 09 Mar 2009 11:18:01 +0100 + +libvirt (0.6.0-1ubuntu3) jaunty; urgency=low + + * No change rebuild for python2.6. + + -- Matthias Klose Wed, 25 Feb 2009 12:17:13 +0000 + +libvirt (0.6.0-1ubuntu2) jaunty; urgency=low + + * Accidentally dropped our changes to + 0003-allow-libvirt-group-to-access-the-socket.patch, causing the + group as which libvirtd expected to run to be wrong. Change it back + to "libvirtd" rather than "libvirt". (LP: #328093) + + -- Soren Hansen Wed, 11 Feb 2009 16:10:28 +0100 + +libvirt (0.6.0-1ubuntu1) jaunty; urgency=low + + * Merge with Debian experimental. Remaining changes: + - debian/control: + + Don't build-depend on QEmu. + + Add "XS-Debian-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables + to Depends of libvirt-bin. + + s/interract/interact/g + + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, + since we used to ship them as such. + - Rename libvirt group to libvirtd. + - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge + before at least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - better_default_uri_virsh.patch: Default to qemu:///system if the + user has write access to the libvirt socket, otherwise + qemu:///session. + - We call libxen-dev libxen3-dev, so change all references. + - Included (but did not enable) opennebula patch (since it's not in + main yet). + + -- Soren Hansen Wed, 11 Feb 2009 01:01:42 +0100 + +libvirt (0.6.0-1) experimental; urgency=low + + * [30be86d] Imported Upstream version 0.6.0 + * [179781c] drop patches + * fixed upstream: + 0006-Fix-missing-read-only-access-checks-CVE-2008-5086.patch + * applied upstream: + 0004-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch + 0005-qemu-fix-parallel-serial-mode-tcp-and-unix.patch + 0007-don-t-fail-on-missing-locales.patch + * [d80a176] adjust remaining patches to new upstream version + * [208c924] add minimal workaround for qemu startup race + * [6e8caa0] restart libvirt daemon on upgrades if possible + (Closes: #492694, #499008) + + -- Guido Günther Thu, 05 Feb 2009 18:40:10 +0100 + +libvirt (0.5.1-7) unstable; urgency=low + + * [1238706] Recommend dnsmasq-base instead of dnsmasq this keeps us + out of all the dnsmasq already running troubles. (Closes: #516443) - + thanks to Bin Zhang for the suggestion and the doc update + * [5c9dfd7] don't rotate empty logfiles (Closes: #517040) + * [1c9a023] libvirt_proxy: Fix use of uninitalized memory We currently + don't build this code (CVE-2009-0036). + * [4ea1ea9] fix path to hvmloader (Closes: #517059) + * [879b632] suggest devhelp + * [f22f1ef] add ${misc:Depends} + * [c6f579e] README.Debian: fix typo + + -- Guido Günther Thu, 26 Feb 2009 14:45:32 +0100 + +libvirt (0.5.1-6) unstable; urgency=low + + * upload to unstable + + -- Guido Günther Mon, 16 Feb 2009 21:27:21 +0100 + +libvirt (0.5.1-5) experimental; urgency=low + + * [d4a69d1] don't fail on missing locales (Closes: #512721) + * [cecac4c] don't hardcode ssh port - based on a patch by Adrian + Bridgett. (Closes: #513605) + * [4565a65] drop superflous headers and footers from remaining patches + + -- Guido Günther Fri, 30 Jan 2009 23:06:29 +0100 + +libvirt (0.5.1-4ubuntu1) jaunty; urgency=low + + * Merge with Debian experimental. + - debian/control: + + Don't build-depend on QEmu. + + Add "XS-Debian-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables + to Depends of libvirt-bin. + + s/interract/interact/g + + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, + since we used to ship them as such. + - Rename libvirt group to libvirtd. + - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge + before at least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - better_default_uri_virsh.patch: Default to qemu:///system if the + user has write access to the libvirt socket, otherwise + qemu:///session. + - We call libxen-dev libxen3-dev, so change all references. + * Included (but did not enable) opennebula patch (since it's not in + the archive yet). + + -- Soren Hansen Thu, 08 Jan 2009 23:01:16 +0100 + +libvirt (0.5.1-4) experimental; urgency=low + + * [2fd5224] apply upstream patch for CVE-2008-5086 (Closes: #509106) + + -- Guido Günther Thu, 18 Dec 2008 16:12:00 +0100 + +libvirt (0.5.1-3) experimental; urgency=low + + * [d30438c] create libvirt log directory (Closes: #508129) + * [417a23c] qemu: fix parallel/serial mode "tcp" and "unix" + (Closes: #507608) + + -- Guido Günther Thu, 11 Dec 2008 12:38:01 +0100 + +libvirt (0.5.1-2) experimental; urgency=low + + * [4cd547b] create /var/run/libvirt (Closes: #507578) + * [fe96870] merge back master + * [d46313f] drop patches for issues fixed upstream + - 0007-also-look-for-usr-bin-kvm.patch + - 0008-Increase-initial-qemu-monitor-read-timeout.patch + - 0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch + - 0010-raise-error-on-invalid-volume-format.patch + + -- Guido Günther Sat, 06 Dec 2008 10:37:12 +0100 + +libvirt (0.5.1-1) experimental; urgency=low + + * [d76b3a1] Imported Upstream version 0.5.1 (Closes: #507677, #507547) + * [2e550ae] enable hal for device enumeration + * [0d9116a] rotate qemu monitor logs (Closes: #507553) - thanks to + Harald Staub + * [5f85e66] depend on logrotate + * [6e955a3] open qemu monitor O_APPEND instead of O_TRUNC for logrotate + * [7dbea84] drop 0004-xen-prefer-xenstoraged-driver-for- + listDomains.patch - applied upstream + + -- Guido Günther Fri, 05 Dec 2008 09:36:54 +0100 + +libvirt (0.5.0-1) experimental; urgency=low + + * [717ef21] Imported Upstream version 0.5.0 + * [b7a1fbd] enable OpenVZ support (Closes: #504597) - thanks to Pierre + Chifflier for the patch + * [ee3590a] drop patches, fixed upstream: + * 0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch + * 0005-fix-define-vs.-defined-typos.patch + * [f4f601f] bump shlibs to 0.5.0 + + -- Guido Günther Fri, 28 Nov 2008 16:40:38 +0100 + +libvirt (0.4.6-10) unstable; urgency=low + + * [5878698] cherry-pick patch for CVE-2008-5086 from experimental + + -- Guido Günther Thu, 18 Dec 2008 16:59:45 +0100 + +libvirt (0.4.6-9) unstable; urgency=low + + * [d30438c] create libvirt log directory (Closes: #508129) + + -- Guido Günther Mon, 08 Dec 2008 10:12:28 +0100 + +libvirt (0.4.6-8) unstable; urgency=low + + * [e771da9] drop superflous 0011-Fix-segfault-on-missing-volume- + format.patch - not needed. + + -- Guido Günther Fri, 05 Dec 2008 10:17:01 +0100 + +libvirt (0.4.6-7) unstable; urgency=low + + * [ea12bd9] create /var/run/libvirt fixes /var/run on tmpfs + (Closes: #507578) + * [97e5706] also look for /usr/bin/kvm (Closes: #507547) + * [311b4c1] increase initial qemu monitor read timeout + (Closes: #499720) + * [fbe4e00] open qemu monitor log O_APPEND instead of O_TRUNC + * [f8ce017] raise error on invalid volume format + * [40edcf8] rotate qemu monitor logs (Closes: #507553) - thanks to + Harald Staub + * [46ea43a] fix segfault on missing volume format (Closes: #507677) - + thanks to Daniel Veillard + * [ee377f3] bump shlibs version to 0.4.6 + * [504d55d] depend on logrotate + + -- Guido Günther Thu, 04 Dec 2008 17:50:45 +0100 + +libvirt (0.4.6-6) unstable; urgency=low + + * [ff8e9ae] README.Debian: clarify xen configuration + * [c07c68f] prefer xenstoraged driver for listDomains - avoids seeing "ghost + domains" due to bugs in several versions of the xen HV + + -- Guido Günther Thu, 27 Nov 2008 18:06:48 +0100 + +libvirt (0.4.6-5ubuntu2) jaunty; urgency=low + + * SECURITY UPDATE: fix privilege escalation due to missing read only + connection checks + - debian/patches/0009-CVE-2008-5086.patch: update functions in + src/libvirt.c to check against VIR_CONNECT_RO and return with operation + denied error + - CVE-2008-5086 + + -- Jamie Strandboge Tue, 16 Dec 2008 10:47:09 -0600 + +libvirt (0.4.6-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + Don't build-depend on QEmu. + + Add "XS-Debian-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables to Depends + of libvirt-bin. + + s/interract/interact/g + + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, since + we used to ship them as such. + - Create /var/run/libvirt in libvirt-bin's init script. + - Rename libvirt group to libvirtd. + - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge before at + least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - better_default_uri_virsh.patch: Default to qemu:///system if the user + has write access to the libvirt socket, otherwise qemu:///session. + - We call libxen-dev libxen3-dev, so change all references. + * Add qemu migration patch (from upstream git (adjusted for 0.4.6)). + * Add dynamic_bridge_names.patch to again support dynamic bridge names. + + -- Soren Hansen Tue, 18 Nov 2008 18:04:40 +0100 + +libvirt (0.4.6-5) unstable; urgency=low + + * [411ada3] add more details about dnsmasq vs. libvirtd (Closes: #504605) + * [2f8f07d] add default image dir virt-manager assumes they exist and + they're used in the SELinux policies too. (Closes: #505577) + * [9eb3a83] fix #define vs. #defined typos - affects non Linux architectures + and fixes the build with gcc 4.4 (Closes: #505607) - thanks to Martin + Michlmayr + * [0e21634] fix uploader + + -- Guido Günther Fri, 14 Nov 2008 14:54:48 +0100 + +libvirt (0.4.6-4) unstable; urgency=low + + * upload to unstable + * [50b27f5] add libvirt-suspendonreboot script (Closes: #501155) - + thanks to Andreas Barth + + -- Guido Günther Sat, 01 Nov 2008 19:33:36 +0100 + +libvirt (0.4.6-3) experimental; urgency=low + + * [8fa5a3c] add a versioned recommends on qemu (Closes: #501692) + * [d1539bc] recommend pkg-config + * [f08bb18] explain libvirt group (Closes: #501824) + + -- Guido Günther Sun, 12 Oct 2008 20:27:25 +0200 + +libvirt (0.4.6-2) experimental; urgency=low + + * [2039095] tighten libvirt dependency + * [06dbe8a] qemu/kvm: fix domain block stats for virtio and scsi devices + + -- Guido Günther Thu, 02 Oct 2008 22:03:05 +0200 + +libvirt (0.4.6-1) experimental; urgency=low + + * [e20d3d4] Imported Upstream version 0.4.6 + * [0c840ab] disable numactl + * [ca2c5cb] cleanup doc installation (Closes: #492075) + * [714ab94] drop 0004-for-kvm-determine-maxVCPUs-at-runtime.patch - applied + upstream + * [e7563a8] drop 0005-fix-crash-when-no-emulator-is-defined-for-kvm- + qemu.patch - fixed upstream + + -- Guido Guenther Thu, 25 Sep 2008 12:31:45 +0200 + +libvirt (0.4.5-2) experimental; urgency=low + + * [17647cd] libvirt-bin.default: add keytab default + * [0ef01e7] fix runtime vcpu detection (0004-for-kvm-determine- + maxVCPUs-at-runtime.patch) (Closes: #495950) + * [b91e1eb] don't crash when no emulator is defined (0005-fix-crash- + when-no-emulator-is-defined-for-kvm-qemu.patch) + + -- Guido Guenther Mon, 22 Sep 2008 20:11:04 +0200 + +libvirt (0.4.5-1) experimental; urgency=low + + * [ab8b4e6] Imported Upstream version 0.4.5 + * [4aaef27] tighten dependency on libvirt + * [fa253be] drop 0002-qemu-path.diff.patch - fixed upstream + * [87fc2db] drop 0005-check-for-the-existence-of-the-migrate- + command.patch applied upstream + * [bc311aa] drop 0006-wrong-open-failure-detection.patch applied + upstream + * [38e615d] rebase the remaining patches + * [9a04bb7] bump shlibs version to 0.4.5 + * [9fadd6f] disable LXC + * [179c869] build-dep on libselinux1-dev for selinux support + + -- Guido Guenther Thu, 18 Sep 2008 19:02:55 +0200 + +libvirt (0.4.4-3ubuntu3) intrepid; urgency=low + + * debian/patches/0008-lp287533.patch: allow 16 VCPUs when using kvm + (LP: #287533) + + -- Jamie Strandboge Wed, 22 Oct 2008 10:13:12 -0500 + +libvirt (0.4.4-3ubuntu2) intrepid; urgency=low + + * Make QEmu a suggested package of libvirt0 rather than a recommended one. + * Make kvm a recommended package of libvirt0. + + -- Soren Hansen Mon, 11 Aug 2008 16:18:03 +0200 + +libvirt (0.4.4-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + DebianMaintainerField + + Don't build-depend on QEmu. + + Add "XS-Original-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables to Depends + of libvirt-bin. + + s/interract/interact/g + + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg, since + we used to ship them as such. + - Create /var/run/libvirt in libvirt-bin's init script. + - Rename libvirt group to libvirtd. + - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge before at + least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - better_default_uri_virsh.patch: Default to qemu:///system if the user + has write access to the libvirt socket, otherwise qemu:///session. + - We call libxen-dev libxen3-dev, so change all references. + + -- Soren Hansen Mon, 11 Aug 2008 15:36:54 +0200 + +libvirt (0.4.4-3) unstable; urgency=low + + * upload to unstable + * [96c6727] add /var/cache/libvirt needed by qemuDriver for temporary + storage + * [794f95c] bump standards version to 3.8.0 + * [05184af] add README.source + + -- Guido Guenther Wed, 23 Jul 2008 11:30:31 -0400 + +libvirt (0.4.4-2) experimental; urgency=low + + * [facb983] README.Debian explain "default" network startup + * [395a510] add /var/lib/libvirt needed for the dnsmasq lease file + * [9c588ac] promote bridge-utils & dnsmasq to Recommends: since + they're needed for the default NAT network + * [9ed2cd4] recommend iptables - needed for the default NAT network + + -- Guido Guenther Wed, 23 Jul 2008 00:23:58 -0400 + +libvirt (0.4.4-1) experimental; urgency=low + + * [0ff1e68] new upstream version + * [2098f96] rebase patches for 0.4.4 + * [abbd15e] enable with-storage-disk now that we have parted1.8 + * [3942b25] start libvirtd by default + + -- Guido Guenther Fri, 27 Jun 2008 10:06:00 +0200 + +libvirt (0.4.4-0ubuntu1) intrepid; urgency=low + + * New upstream release + - Drop nic-model, disk-bus, and ancient_parted.patch. They're all + upstream now (in some form). + - Add new libdevmapper-dev build-dependency. + + -- Soren Hansen Wed, 25 Jun 2008 18:51:21 +0200 + +libvirt (0.4.2-6ubuntu1) UNRELEASED; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + DebianMaintainerField + + Don't build-depend on QEmu. + + Add "XS-Original-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables to Depends + of libvirt-bin. + + s/interract/interact/g + - debian/libvirt-bin.default + + Make libvirtd start by default + - Add /var/lib/libvirt to libvirt-bin package. (dnsmasq needs it to store + its state info. + - Create /var/run/libvirt in libvirt-bin's init script. + - Rename libvirt group to libvirtd. + - Build iscsi and disk storage support. + - delayed_iff_up_bridge.patch: Don't try to bring up the bridge before at + least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - nic-model.patch: Add support for NIC configuration. + - disk-bus.patch: Add support for bus='foo' attributes for disk targets. + - better_default_uri_virsh.patch: Default to qemu:///system if the user + has write access to the libvirt socket, otherwise qemu:///session. + - ancient_parted.patch: Fix builds against libparted1.7 + - We call libxen-dev libxen3-dev, so change all references. + + -- Soren Hansen Wed, 25 Jun 2008 16:40:46 +0200 + +libvirt (0.4.2-6) unstable; urgency=low + + * reenable open-iscsi support - thanks to to the open-iscsi + maintainers for fixing this up + * build a libvirt0-dbg package + * register documentation with doc-base (Closes: #480294) - thanks to + Tzafrir Cohen for the patch + * control: fix typo + * README.Debian: explain debugging + + -- Guido Guenther Thu, 15 May 2008 18:04:20 +0200 + +libvirt (0.4.2-5ubuntu2) intrepid; urgency=low + + * We call libxen-dev libxen3-dev. + * Make libvirt-dev installable alongside libvirt0-dbg. + + -- Soren Hansen Fri, 02 May 2008 10:59:50 +0200 + +libvirt (0.4.2-5ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + DebianMaintainerField + + Don't build-depend on QEmu. + + Add "XS-Original-" prefix to Debian's Vcs headers. + + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables to Depends + of libvirt-bin. + + s/interract/interact/g + - Add libvirt0-dbg package + - debian/libvirt-bin.default + + Make libvirtd start by default + - Add /var/lib/libvirt to libvirt-bin package. (dnsmasq needs it to store + its state info. + - Create /var/run/libvirt in libvirt-bin's init script. + - Install PolicyKit and sasl stuff in libvirt-bin. + - Rename libvirt group to libvirtd. + - Build iscsi and disk storage support. + - delayed_iff_up_bridge.patch: Don't try to bring up the bridge before at + least one interface has been added to it. + - dont_clobber_existing_bridges.patch: Assign the name of the virtual + bridge dynamically to avoid interfering with existing bridges. + - nic-model.patch: Add support for NIC configuration. + - disk-bus.patch: Add support for bus='foo' attributes for disk targets. + - better_default_uri_virsh.patch: Default to qemu:///system if the user + has write access to the libvirt socket, otherwise qemu:///session. + - ancient_parted.patch: Fix builds against libparted1.7 + + -- Soren Hansen Fri, 02 May 2008 01:50:32 +0200 + +libvirt (0.4.2-5) unstable; urgency=low + + * no need to depend on python-all-dev we only build an extension for + the current python version + + -- Guido Guenther Tue, 22 Apr 2008 11:26:13 +0200 + +libvirt (0.4.2-4) unstable; urgency=low + + * only build-dep on qemu on architectures that have it + (Closes: #476290) + * the packages containing the daemon should suggest polkit + + -- Guido Guenther Fri, 18 Apr 2008 10:41:38 +0200 + +libvirt (0.4.2-3) unstable; urgency=low + + * drop the {build-,}dependency on open-iscsi too + * suggest policykit + + -- Guido Guenther Mon, 14 Apr 2008 15:27:20 +0200 + +libvirt (0.4.2-2) unstable; urgency=low + + * disable the iscsi storage backend until #423368 is fixed in unstable + * disable polkit authentication by default so the libvirt stays accessible + for members of the libvirt group + + -- Guido Guenther Mon, 14 Apr 2008 14:20:23 +0200 + +libvirt (0.4.2-1) unstable; urgency=low + + * drop no-mac.diff - applied upstream + * no need to explicitly link against libpthread + * always enable debugging + * add Homepage URL + * add Vcs-{Git,Browser} fields + * symlink devhelp docs + * enable policy kit + + -- Guido Guenther Fri, 11 Apr 2008 17:54:06 +0200 + +libvirt (0.4.1-1) experimental; urgency=low + + * new upstream version + * Xen 3.2 fixes + * storage pool support + * partition based storage pools are disabled, since this needs parted 1.8 + which is only in experimental + * update patches for new upstream release + * boot-dev-error.diff - applied upstream + * qemu-parse-error.diff - applied upstream + * qemu-path.diff - adjust to new hypervisor detection code + * rediff the rest + * new patches: + * no-mac.diff: don't set mac address on tun device since it breaks kvm + * bump shlibs version + + -- Guido Guenther Fri, 07 Mar 2008 10:17:21 +0100 + +libvirt (0.4.0-6) unstable; urgency=low + + * depend on libxen-dev (Closes:#467598) + * allow members of the libvirt group to manage virtual machines + + -- Guido Guenther Sun, 02 Mar 2008 16:11:49 +0100 + +libvirt (0.4.0-5) unstable; urgency=low + + * thanks to the xen maintainers Debian now has a working libxen-dev, so + enable xen support in the default build (Closes: #453826) + * recommend netcat-openbsd for unix domain socket support (Closes: #453627) + * README.Debian: document necessary xend options + * fix spelling of Python + + -- Guido Guenther Wed, 20 Feb 2008 11:14:22 +0100 + +libvirt (0.4.0-4) unstable; urgency=low + + * don't segfault on broken boot device configuration (Closes: #463686) + * don't segfault due to missing errorhandling in the XML parsing code + + -- Guido Guenther Tue, 05 Feb 2008 13:12:54 +0100 + +libvirt (0.4.0-3) unstable; urgency=low + + * add and remove the libvirt group for the socket + * be a bit more verbose on libvirtd reload + * depend on adduser since we add the libvirt user + * don't restart libvirtd on upgrades since it kills running qemus + * enable debugging via DEB_BUILD_OPTS + + -- Guido Guenther Sun, 03 Feb 2008 14:21:46 +0100 + +libvirt (0.4.0-2ubuntu8) hardy; urgency=low + + * disk-bus.patch: + - Add bus attribute to disk/target tags. Allows you to create virtio disks. + (LP: #213991) + * nic-model.patch: + - Add support to network interfaces. (LP: #213991) + * graceful_shutdown.patch: + - Rather than pulling the power from virtual machines, send an ACPI power + button event and let the OS handle it. + * better_default_uri_virsh.patch: + - Updated patch: Output connection URI to stderr instead of stdout to avoid + breaking scripts that use virsh. + + -- Soren Hansen Wed, 16 Apr 2008 10:35:03 +0200 + +libvirt (0.4.0-2ubuntu7) hardy; urgency=low + + * better_default_uri_virsh.patch: + - Make virsh connect to qemu:///system by default if the user has write + access to /var/run/libvirt/libvirt-sock and qemu:///session if not. + + -- Soren Hansen Tue, 01 Apr 2008 10:32:59 +0200 + +libvirt (0.4.0-2ubuntu6) hardy; urgency=low + + * *Actually* apply our patches to the -dbg version. + + -- Soren Hansen Tue, 11 Mar 2008 14:49:03 +0100 + +libvirt (0.4.0-2ubuntu5) hardy; urgency=low + + * Create /var/lib/libvirt in libvirt-bin. (LP: #191636) + + -- Soren Hansen Wed, 13 Feb 2008 22:17:33 +0100 + +libvirt (0.4.0-2ubuntu4) hardy; urgency=low + + * dont_clobber_existing_bridges.patch: + - Change bridge name from virbr0 to virbr%d, to ensure we never clobber + existing bridges. + * Add iptables dependency + + -- Soren Hansen Wed, 13 Feb 2008 00:53:20 +0100 + +libvirt (0.4.0-2ubuntu3) hardy; urgency=low + + * Build against libxen3-dev instead of libxen3.2-dev. + * libvirt-bin: + + Replace "Suggests: dnsmasq" with "Depends: dnsmasq-base". + + Add dependency on netcat-openbsd (to enable qemu+ssh:// style remote + management) + + -- Soren Hansen Fri, 08 Feb 2008 17:24:48 +0100 + +libvirt (0.4.0-2ubuntu2) hardy; urgency=low + + * Build against libxen-3.2 instead of 3.1. + * Bump bridge-utils from Suggests: to Depends:. + + -- Soren Hansen Tue, 05 Feb 2008 10:34:31 +0100 + +libvirt (0.4.0-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - DebianMaintainerField. + - Add libxen3.1-dev to enable Xen management. + - Add libpolkit-dbus-dev to enable polkit integration. + - Build libvirt0-dbg flavour. + - Start libvirtd by default. + - Install polkit policy. + - Install sasl config. + - Install sample qemu and libvirtd config. + - Create libvirtd group in postinst. + - libvirt-remote-ssh.patch: Fix foo+ssh:// urls. + - delayed_iff_up_bridge.patch: Don't try to IFF_UP the bridge interface + until an interface gets added to it. + * Create /var/run if it doesn't exist (LP: #178106). + + -- Soren Hansen Wed, 30 Jan 2008 16:43:11 +0100 + +libvirt (0.4.0-2) unstable; urgency=low + + * libvirt-bin.init: fix the reload target + * add configuration examples + + -- Guido Guenther Sat, 15 Dec 2007 18:59:11 +0100 + +libvirt (0.4.0-1) unstable; urgency=low + + * new upstream version + * enable sasl support + * leave policykit support disabled since it's not in unstable yet + * bump shlibs version + * remove CVS metadata + * rediff patches + * libvirtd-bin.init: libvirtd supports reload + + -- Guido Guenther Fri, 21 Dec 2007 16:49:13 +0100 + +libvirt (0.4.0-0ubuntu3) hardy; urgency=low + + * Clean up debian/rules (should reenable concurrent builds). + * Don't restart libvirt on upgrades (if there's a good reason, we'll + add it to postinst/prerm with checks for specific versions). + + -- Soren Hansen Fri, 18 Jan 2008 19:07:19 +0100 + +libvirt (0.4.0-0ubuntu2) hardy; urgency=low + + * IFF_UP'ing a bridge interface doesn't work until the first interface has + been added to it. + * Fix remote ssh connections. + + -- Soren Hansen Tue, 15 Jan 2008 10:53:25 +0100 + +libvirt (0.4.0-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Don't change the default URI. It appears that too many applications + still depend on this broken behaviour. + * Change maintainer to ubuntu-core-dev. + + -- Soren Hansen Fri, 21 Dec 2007 11:24:02 +0100 + +libvirt (0.3.3-6ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add libvirt0-dbg package. + - Start libvirtd by default. + - Create libvirtd group, and have libvirtd's sockets have group ownership + "libvirtd". + - Add libxen as a build-dependency to enable libvirt's Xen features. + + -- Soren Hansen Thu, 20 Dec 2007 11:28:00 +0100 + +libvirt (0.3.3-6) unstable; urgency=low + + * don't include precompiled examples in the doc package (Closes: #456825) + * remove RHism from manpage (Closes: #455859) + * bump standards version + + -- Guido Guenther Wed, 19 Dec 2007 13:45:58 +0100 + +libvirt (0.3.3-5.xen0) unstable; urgency=low + + * rebuild with xen support + + -- Guido Guenther Tue, 08 Jan 2008 11:00:24 +0100 + +libvirt (0.3.3-5) unstable; urgency=low + + * make libs match overrides + * move to team maintenance + * suggest dnsmasq and bridge-utils for qemu networking + * remove stale PID files + + -- Guido Guenther Thu, 13 Dec 2007 21:34:16 +0100 + +libvirt (0.3.3-4.xen0) unstable; urgency=low + + * UNRELEASED + * build with xen support + * debian/control: we also support xen + + -- Guido Guenther Thu, 06 Dec 2007 15:43:03 +0100 + +libvirt (0.3.3-4ubuntu5) hardy; urgency=low + + * Made default_uri a configurable. + + -- Soren Hansen Wed, 19 Dec 2007 00:56:31 +0100 + +libvirt (0.3.3-4ubuntu4) hardy; urgency=low + + * Add "Provides: libvirt0" to libvirt0-dbg. + * Make virsh understand that the default URI is not xen:///. + + -- Soren Hansen Wed, 19 Dec 2007 00:13:10 +0100 + +libvirt (0.3.3-4ubuntu3) hardy; urgency=low + + * Change default URI to qemu:///session + * Add libvirt0-dbg package, which is just like libvirt0, but built + with --enable-debug=yes. + + -- Soren Hansen Thu, 13 Dec 2007 21:37:39 +0100 + +libvirt (0.3.3-4ubuntu2) hardy; urgency=low + + * Start libvirtd by default. + * Create libvirtd group, and have libvirtd's sockets have group ownership + "libvirtd". + + -- Soren Hansen Thu, 13 Dec 2007 15:08:29 +0100 + +libvirt (0.3.3-4ubuntu1) hardy; urgency=low + + * Fakesync with Debian. + * Reenable Xen. + + -- Soren Hansen Thu, 06 Dec 2007 13:33:13 +0100 + +libvirt (0.3.3-4) unstable; urgency=low + + * put packages into the proper sections + * fix messed up Standards-Version (Closes: #453900) + + -- Guido Guenther Sun, 02 Dec 2007 14:50:11 +0100 + +libvirt (0.3.3-3.xen0) unstable; urgency=low + + * build with xen support - depend on our hacked up xen-utils for that + + -- Guido Guenther Sat, 01 Dec 2007 16:27:32 +0000 + +libvirt (0.3.3-3) unstable; urgency=low + + * add initscript to start libvirtd + + -- Guido Guenther Wed, 28 Nov 2007 10:30:29 +0100 + +libvirt (0.3.3-2) unstable; urgency=low + + * debian/copyright: + * update FSF address + * update upstream author and copyright information + * install the virsh manpage + * use binary:Version instead of Source-Version + + -- Guido Guenther Fri, 23 Nov 2007 22:31:26 +0100 + +libvirt (0.3.3-1) unstable; urgency=low + + * repackage for Debian (Closes: #384300) + * enable avahi + * build with qemu/kvm support + * disable xen support until #402249 is fixed + * disable qemu autonetwork for now, causes libvirtd to seqfault + * fix path to kvm + * switch off DH_VERBOSE + * thanks to the Ubuntu maintainers for their work! + + -- Guido Guenther Fri, 23 Nov 2007 01:58:56 +0100 + +libvirt (0.3.3-0ubuntu1) hardy; urgency=low + + * New upstream release. + * Update maintainer. + + -- Soren Hansen Wed, 14 Nov 2007 23:09:33 +0100 + +libvirt (0.3.0-0ubuntu2) gutsy; urgency=low + + * Add lingnutls-dev Build-Dep. + + -- Fabio M. Di Nitto Mon, 16 Jul 2007 12:10:41 +0200 + +libvirt (0.3.0-0ubuntu1) gutsy; urgency=low + + * Import new upstram release that can actually build on xen-3.1. + + -- Fabio M. Di Nitto Mon, 16 Jul 2007 10:23:04 +0200 + +libvirt (0.2.2-0ubuntu1) gutsy; urgency=low + + * Depends on libxen3.1-dev. + + -- Chuck Short Fri, 13 Jul 2007 11:04:00 -0400 + +libvirt (0.2.2-0ubuntu0) gutsy; urgency=low + + * New upstream version. + * Updated libvirt-bin.install, thanks to Marcelo Boveto Shima. + + -- Chuck Short Sun, 24 Jun 2007 09:54:54 -0400 + +libvirt (0.1.8-0ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:21:55 +0000 + +libvirt (0.1.8-0ubuntu1) feisty; urgency=low + + * Initial release + + -- Andrew Mitchell Mon, 23 Oct 2006 20:00:28 +1300 + --- libvirt-0.6.4.orig/debian/patches/0001-remove-RHism.diff.patch +++ libvirt-0.6.4/debian/patches/0001-remove-RHism.diff.patch @@ -0,0 +1,22 @@ +From: Guido Guenther +Date: Fri, 7 Mar 2008 09:08:25 +0100 +Subject: [PATCH] remove-RHism.diff + +--- + virsh.1 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/virsh.1 b/virsh.1 +index 45ea614..321adeb 100644 +--- a/virsh.1 ++++ b/virsh.1 +@@ -171,7 +171,7 @@ the program. + .IX Header "NOTES" + All \fBvirsh\fR operations rely upon the libvirt library. + For any virsh commands to run xend/qemu, or what ever virtual library that libvirt supports. For this reason you should start xend/qemu as a service when your system first boots using xen/qemu. This can usually be done using the command +-\&\fBservice libvirtd start\fR . ++\&\fBinvoke-rc.d libvirt-bin start\fR . + .PP + Most \fBvirsh\fR commands require root privileges to run due to the + communications channels used to talk to the hypervisor. Running as +-- --- libvirt-0.6.4.orig/debian/patches/0002-qemu-disable-network.diff.patch +++ libvirt-0.6.4/debian/patches/0002-qemu-disable-network.diff.patch @@ -0,0 +1,38 @@ +From: Guido Guenther +Date: Fri, 7 Mar 2008 09:08:26 +0100 +Subject: [PATCH] qemu-disable-network.diff + +--- + qemud/Makefile.am | 3 --- + qemud/Makefile.in | 3 --- + 2 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/qemud/Makefile.am b/qemud/Makefile.am +index 403846a..c3f41d4 100644 +--- a/qemud/Makefile.am ++++ b/qemud/Makefile.am +@@ -161,9 +161,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \ + test -z "$(UUID)" || \ + sed -i -e "s,,\n $(UUID)," \ + $(DESTDIR)$(sysconfdir)/$(default_xml_dest) +- test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ +- ln -s ../default.xml \ +- $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu + mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt + mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt +diff --git a/qemud/Makefile.in b/qemud/Makefile.in +index dbc6bb3..e8dfa5b 100644 +--- a/qemud/Makefile.in ++++ b/qemud/Makefile.in +@@ -1307,9 +1307,6 @@ remote_protocol.c: remote_protocol.h + @WITH_LIBVIRTD_TRUE@ test -z "$(UUID)" || \ + @WITH_LIBVIRTD_TRUE@ sed -i -e "s,,\n $(UUID)," \ + @WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/$(default_xml_dest) +-@WITH_LIBVIRTD_TRUE@ test -e $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml || \ +-@WITH_LIBVIRTD_TRUE@ ln -s ../default.xml \ +-@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml + @WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu + @WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt + @WITH_LIBVIRTD_TRUE@ mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt +-- --- libvirt-0.6.4.orig/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch +++ libvirt-0.6.4/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch @@ -0,0 +1,49 @@ +From: Guido Guenther +Date: Thu, 26 Jun 2008 20:01:38 +0200 +Subject: [PATCH] allow libvirt group to access the socket + +--- + qemud/libvirtd.conf | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf +index 1fd5918..a26c081 100644 +--- a/qemud/libvirtd.conf ++++ b/qemud/libvirtd.conf +@@ -78,7 +78,7 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-#unix_sock_group = "libvirt" ++unix_sock_group = "libvirt" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only +@@ -95,7 +95,7 @@ + # + # If not using PolicyKit and setting group ownership for access + # control then you may want to relax this to: +-#unix_sock_rw_perms = "0770" ++unix_sock_rw_perms = "0770" + + # Set the name of the directory in which sockets will be found/created. + #unix_sock_dir = "/var/run/libvirt" +@@ -126,7 +126,7 @@ + # + # To restrict monitoring of domains you may wish to enable + # an authentication mechanism here +-#auth_unix_ro = "none" ++auth_unix_ro = "none" + + # Set an authentication scheme for UNIX read-write sockets + # By default socket permissions only allow root. If PolicyKit +@@ -135,7 +135,7 @@ + # + # If the unix_sock_rw_perms are changed you may wish to enable + # an authentication mechanism here +-#auth_unix_rw = "none" ++auth_unix_rw = "none" + + # Change the authentication scheme for TCP sockets. + # +-- --- libvirt-0.6.4.orig/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch +++ libvirt-0.6.4/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch @@ -0,0 +1,23 @@ +From: =?utf-8?q?Guido=20G=C3=BCnther?= +Date: Thu, 26 Feb 2009 14:29:58 +0100 +Subject: [PATCH] fix Debian specific path to hvm loader + +Closes: #517059 +--- + src/xen_internal.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/xen_internal.c b/src/xen_internal.c +index 06b0cba..252772d 100644 +--- a/src/xen_internal.c ++++ b/src/xen_internal.c +@@ -2202,7 +2202,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, + "/usr/lib64/xen/bin/qemu-dm" : + "/usr/lib/xen/bin/qemu-dm"), + (guest_archs[i].hvm ? +- "/usr/lib/xen/boot/hvmloader" : ++ "/usr/lib/xen-default/boot/hvmloader" : + NULL), + 1, + machines)) == NULL) +-- --- libvirt-0.6.4.orig/debian/patches/dynamic_bridge_names.patch +++ libvirt-0.6.4/debian/patches/dynamic_bridge_names.patch @@ -0,0 +1,79 @@ +Index: libvirt-0.6.1/src/network_conf.c +=================================================================== +--- libvirt-0.6.1.orig/src/network_conf.c 2009-04-16 20:49:28.851655724 +0200 ++++ libvirt-0.6.1/src/network_conf.c 2009-04-17 13:11:54.494770980 +0200 +@@ -724,6 +724,7 @@ + virNetworkDefPtr def = NULL; + virNetworkObjPtr net; + int autostart; ++ char *tmp; + + if ((configFile = virNetworkConfigFile(conn, configDir, name)) == NULL) + goto error; +@@ -747,7 +748,10 @@ + /* Generate a bridge if none is found, but don't check for collisions + * if a bridge is hardcoded, so the network is at least defined + */ +- if (!def->bridge && !(def->bridge = virNetworkAllocateBridge(conn, nets))) ++ if (tmp = virNetworkAllocateBridge(conn, nets, def->bridge)) { ++ VIR_FREE(def->bridge); ++ def->bridge = tmp; ++ } else + goto error; + + if (!(net = virNetworkAssignDef(conn, nets, def))) +@@ -875,16 +879,20 @@ + } + + char *virNetworkAllocateBridge(virConnectPtr conn, +- const virNetworkObjListPtr nets) ++ const virNetworkObjListPtr nets, ++ const char *template) + { + + int id = 0; + char *newname; + ++ if (!template) ++ template = "virbr%d"; ++ + do { + char try[50]; + +- snprintf(try, sizeof(try), "virbr%d", id); ++ snprintf(try, sizeof(try), template, id); + + if (!virNetworkBridgeInUse(nets, try, NULL)) { + if (!(newname = strdup(try))) { +@@ -909,7 +917,7 @@ + + int ret = -1; + +- if (def->bridge) { ++ if (def->bridge && !strstr(def->bridge, "%d")) { + if (virNetworkBridgeInUse(nets, def->bridge, def->name)) { + networkReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("bridge name '%s' already in use."), +@@ -918,7 +926,7 @@ + } + } else { + /* Allocate a bridge name */ +- if (!(def->bridge = virNetworkAllocateBridge(conn, nets))) ++ if (!(def->bridge = virNetworkAllocateBridge(conn, nets, def->bridge))) + goto error; + } + +Index: libvirt-0.6.1/src/network_conf.h +=================================================================== +--- libvirt-0.6.1.orig/src/network_conf.h 2009-04-16 20:49:28.899655820 +0200 ++++ libvirt-0.6.1/src/network_conf.h 2009-04-17 09:42:33.075084537 +0200 +@@ -174,7 +174,8 @@ + const char *skipname); + + char *virNetworkAllocateBridge(virConnectPtr conn, +- const virNetworkObjListPtr nets); ++ const virNetworkObjListPtr nets, ++ const char *template); + + int virNetworkSetBridgeName(virConnectPtr conn, + const virNetworkObjListPtr nets, --- libvirt-0.6.4.orig/debian/patches/event-loop-hang.diff +++ libvirt-0.6.4/debian/patches/event-loop-hang.diff @@ -0,0 +1,87 @@ +On Thu, Mar 12, 2009 at 10:04:50PM +0000, Nick Moffitt wrote: +> Daniel Veillard: +> > As was reported on IRC and found by Dan Berrange, sometimes Xen event +> > handling could start to go wild and block processing of requests in +> > the daemon. +> > +> > The fault at least on libvirt side is that we didn't filter out non +> > read/write event requests when asking for watches in the xenstore. The +> > provided patch seems to work for the person who reported the original +> > problem, +> +> It seems to work, although it may not have solved my problem: +> +> http://dpaste.com/13740/ +> +> There are five backed-up pause requests on this server, and it seems +> that four of them may be stuck in the xenstore code (apologies for the +> lack of debugging symbols on there. I really ought to get a debug +> package built, or haul over an unstripped version of libxenstore.so 3.2 +> from somewhere). + +Ok, turns out the original patch (though worthwhile) was a red herring. +The core problem was that the event loop was getting confused when we +removed a monitored file handle. It would then start running the wrong +event handler callbacks. So the xenstore watch handler got called even +though no watch was pending :-( This also caused clients to get stuck +because the watch detecting end-of-file on the socket wasn't getting +called. + +The patch fixes the loop which dispatches callbacks, so that it does +not assume the index into 'nfds' matches the index in 'handles'. They +have to be tracked indepedantly, to take account of deleted handles. + +Daniel + +Index: qemud/event.c +=================================================================== +RCS file: /data/cvs/libvirt/qemud/event.c,v +retrieving revision 1.19 +diff -u -p -r1.19 event.c +--- qemud/event.c 17 Feb 2009 09:44:18 -0000 1.19 ++++ qemud/event.c 13 Mar 2009 15:31:33 -0000 +@@ -409,25 +409,26 @@ static int virEventDispatchTimeouts(void + * Returns 0 upon success, -1 if an error occurred + */ + static int virEventDispatchHandles(int nfds, struct pollfd *fds) { +- int i; ++ int i, n; + +- for (i = 0 ; i < nfds ; i++) { ++ for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) { + if (eventLoop.handles[i].deleted) { + EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd); + continue; + } + +- if (fds[i].revents) { ++ if (fds[n].revents) { + virEventHandleCallback cb = eventLoop.handles[i].cb; + void *opaque = eventLoop.handles[i].opaque; +- int hEvents = virPollEventToEventHandleType(fds[i].revents); +- EVENT_DEBUG("Dispatch %d %d %p", fds[i].fd, +- fds[i].revents, eventLoop.handles[i].opaque); ++ int hEvents = virPollEventToEventHandleType(fds[n].revents); ++ EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd, ++ fds[n].revents, eventLoop.handles[i].opaque); + virEventUnlock(); + (cb)(eventLoop.handles[i].watch, +- fds[i].fd, hEvents, opaque); ++ fds[n].fd, hEvents, opaque); + virEventLock(); + } ++ n++; + } + + return 0; + +-- +|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| +|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| +|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| +|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| + +-- +Libvir-list mailing list +Libvir-list@redhat.com +https://www.redhat.com/mailman/listinfo/libvir-list --- libvirt-0.6.4.orig/debian/patches/xen-events-handling-fix.diff +++ libvirt-0.6.4/debian/patches/xen-events-handling-fix.diff @@ -0,0 +1,47 @@ +From: Daniel Veillard +Date: Wed, 11 Mar 2009 13:43:24 +0000 (+0000) +Subject: * src/xs_internal.c: fix xen events handling problem (Dan Berrange) +X-Git-Url: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff_plain;h=124cfcbc2bcd1b71b51e720b9bfc7d8e69e8af89 + +* src/xs_internal.c: fix xen events handling problem (Dan Berrange) +Daniel +--- + +Index: libvirt-0.6.1/ChangeLog +=================================================================== +--- libvirt-0.6.1.orig/ChangeLog 2009-03-04 14:13:15.000000000 +0100 ++++ libvirt-0.6.1/ChangeLog 2009-03-17 23:26:54.216796814 +0100 +@@ -1,3 +1,7 @@ ++Wed Mar 11 14:42:24 CET 2009 Daniel Veillard ++ ++ * src/xs_internal.c: fix xen events handling problem (Dan Berrange) ++ + Wed Mar 4 14:11:15 CET 2009 Daniel Veillard + + * NEWS configure.in libvirt.spec.in doc/* include/libvirt/libvirt.h: +Index: libvirt-0.6.1/src/xs_internal.c +=================================================================== +--- libvirt-0.6.1.orig/src/xs_internal.c 2009-02-16 09:43:41.000000000 +0100 ++++ libvirt-0.6.1/src/xs_internal.c 2009-03-17 23:26:17.249798285 +0100 +@@ -1215,7 +1215,7 @@ + static void + xenStoreWatchEvent(int watch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, +- int events ATTRIBUTE_UNUSED, ++ int events, + void *data) + { + char **event; +@@ -1226,8 +1226,12 @@ + + virConnectPtr conn = data; + xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; ++ + if(!priv) return; + ++ /* only set a watch on read and write events */ ++ if (events & (VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP)) return; ++ + xenUnifiedLock(priv); + + if(!priv->xshandle) --- libvirt-0.6.4.orig/debian/patches/more-flexible-emulator-on-x86.patch +++ libvirt-0.6.4/debian/patches/more-flexible-emulator-on-x86.patch @@ -0,0 +1,406 @@ +Currently we are pretty strict about what emulator binary we allow for +QEMU guests on x86 arches. In particular, for arch+domain type combos: + + - i686+qemu must use 'qemu' binary + - x86_64+qemu must use 'qemu-system-x86_64' binary + - kvm must use 'qemu-kvm' or 'kvm' binaries + - i686+kvm on x86_64 host is not allowed + +These restrictions are overkill because + + - i686+qemu could use 'qemu-system-x86_64' if '-cpu qemu32' is added + - i686+qemu could use 'qemu-kvm' if '-cpu qemu32 -no-kvm' is added + - x86_64+qemu could use 'qemu-kvm' if '-no-kvm' is added + - i686+kvm on x86_64 host can be used if '-cpu qemu32' is added + +This patch makes QEMU driver more flexible in this way when setting up +its capabilities information. It also makes it aware of the -no-kvm +and -cpu flag, using them where required by the os type + arch + emulator +combinations specified in the guest XML. + +This should finally remove the confusion where a user in virt-manager +selectrs 'i686' and then wonders why we've disallowed choice of 'kvm'. +It also fixes 'virsh version' when only qemu-kvm is installed. + +The matrix should now work thus: + +1. qemu, qemu-system-x86_64, qemu-kvm all available + + qemu+i686 => qemu + qemu+x86_64 => qemu-system-x86_64 + kvm+i686 => qemu-kvm -cpu qemu32 + kvm+x86_64 => qemu-kvm + +2. qemu, qemu-kvm available + + qemu+i686 => qemu + qemu+x86_64 => qemu-kvm -no-kvm + kvm+i686 => qemu-kvm -cpu qemu32 + kvm+x86_64 => qemu-kvm + +3. qemu-system-x86_64, qemu-kvm available + + qemu+i686 => qemu-system-x86_64 -cpu qemu32 + qemu+x86_64 => qemu-system-x86_64 + kvm+i686 => qemu-kvm -cpu qemu32 + kvm+x86_64 => qemu-kvm + +4. qemu-kvm available + + qemu+i686 => qemu-kvm -no-kvm -cpu qemu32 + qemu+x86_64 => qemu-kvm -no-kvm + kvm+i686 => qemu-kvm -cpu qemu32 + kvm+x86_64 => qemu-kvm + + +The only real remaining problem is that we don't cope with scenario +where the KVM enabled binary is called 'qemu-system-x64_64' instead +of 'qemu-kvm' or 'kvm'. + +Regards, +Daniel + +Index: src/qemu_conf.c +=================================================================== +RCS file: /data/cvs/libvirt/src/qemu_conf.c,v +retrieving revision 1.138 +diff -u -p -r1.138 qemu_conf.c +--- src/qemu_conf.c 16 Mar 2009 13:54:26 -0000 1.138 ++++ src/qemu_conf.c 16 Mar 2009 17:53:20 -0000 +@@ -211,6 +211,7 @@ struct qemu_arch_info { + const char *const *machines; + int nmachines; + const char *binary; ++ const char *altbinary; + const struct qemu_feature_flags *flags; + int nflags; + }; +@@ -231,24 +232,24 @@ static const struct qemu_feature_flags c + /* The archicture tables for supported QEMU archs */ + static const struct qemu_arch_info const arch_info_hvm[] = { + { "i686", 32, arch_info_hvm_x86_machines, 2, +- "/usr/bin/qemu", arch_info_i686_flags, 4 }, ++ "/usr/bin/qemu", "/usr/bin/qemu-system-x86_64", arch_info_i686_flags, 4 }, + { "x86_64", 64, arch_info_hvm_x86_machines, 2, +- "/usr/bin/qemu-system-x86_64", arch_info_x86_64_flags, 2 }, ++ "/usr/bin/qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 }, + { "mips", 32, arch_info_hvm_mips_machines, 1, +- "/usr/bin/qemu-system-mips", NULL, 0 }, ++ "/usr/bin/qemu-system-mips", NULL, NULL, 0 }, + { "mipsel", 32, arch_info_hvm_mips_machines, 1, +- "/usr/bin/qemu-system-mipsel", NULL, 0 }, ++ "/usr/bin/qemu-system-mipsel", NULL, NULL, 0 }, + { "sparc", 32, arch_info_hvm_sparc_machines, 1, +- "/usr/bin/qemu-system-sparc", NULL, 0 }, ++ "/usr/bin/qemu-system-sparc", NULL, NULL, 0 }, + { "ppc", 32, arch_info_hvm_ppc_machines, 3, +- "/usr/bin/qemu-system-ppc", NULL, 0 }, ++ "/usr/bin/qemu-system-ppc", NULL, NULL, 0 }, + }; + + static const struct qemu_arch_info const arch_info_xen[] = { + { "i686", 32, arch_info_xen_x86_machines, 1, +- "/usr/bin/xenner", arch_info_i686_flags, 4 }, ++ "/usr/bin/xenner", NULL, arch_info_i686_flags, 4 }, + { "x86_64", 64, arch_info_xen_x86_machines, 1, +- "/usr/bin/xenner", arch_info_x86_64_flags, 2 }, ++ "/usr/bin/xenner", NULL, arch_info_x86_64_flags, 2 }, + }; + + static int +@@ -257,43 +258,62 @@ qemudCapsInitGuest(virCapsPtr caps, + const struct qemu_arch_info *info, + int hvm) { + virCapsGuestPtr guest; +- int i, haskvm, hasbase, samearch; ++ int i; ++ int hasbase = 0; ++ int hasaltbase = 0; ++ int haskvm = 0; ++ int haskqemu = 0; + const char *kvmbin = NULL; + +- /* Check for existance of base emulator */ ++ /* Check for existance of base emulator, or alternate base ++ * which can be used with magic cpu choice ++ */ + hasbase = (access(info->binary, X_OK) == 0); ++ hasaltbase = (access(info->altbinary, X_OK) == 0); + +- samearch = STREQ(info->arch, hostmachine); +- if (samearch) { ++ /* Can use acceleration for KVM/KQEMU if ++ * - host & guest arches match ++ * Or ++ * - hostarch is x86_64 and guest arch is i686 ++ * The latter simply needs "-cpu qemu32" ++ */ ++ if (STREQ(info->arch, hostmachine) || ++ (STREQ(hostmachine, "x86_64") && STREQ(info->arch, "i686"))) { + const char *const kvmbins[] = { "/usr/bin/qemu-kvm", /* Fedora */ + "/usr/bin/kvm" }; /* Upstream .spec */ + + for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) { +- if ((haskvm = (access(kvmbins[i], X_OK) == 0))) { ++ if (access(kvmbins[i], X_OK) == 0 && ++ access("/dev/kvm", F_OK) == 0) { ++ haskvm = 1; + kvmbin = kvmbins[i]; + break; + } + } +- } else { +- haskvm = 0; ++ ++ if (access("/dev/kqemu", F_OK) == 0) ++ haskqemu = 1; + } + +- if (!hasbase && !haskvm) ++ ++ if (!hasbase && !hasaltbase && !haskvm) + return 0; + ++ /* We register kvm as the base emulator too, since we can ++ * just give -no-kvm to disable acceleration if required */ + if ((guest = virCapabilitiesAddGuest(caps, + hvm ? "hvm" : "xen", + info->arch, + info->wordsize, +- info->binary, ++ (hasbase ? info->binary : ++ (hasaltbase ? info->altbinary : kvmbin)), + NULL, + info->nmachines, + info->machines)) == NULL) + return -1; + + if (hvm) { +- if (hasbase && +- virCapabilitiesAddGuestDomain(guest, ++ if (virCapabilitiesAddGuestDomain(guest, + "qemu", + NULL, + NULL, +@@ -301,27 +321,23 @@ qemudCapsInitGuest(virCapsPtr caps, + NULL) == NULL) + return -1; + +- /* If guest & host match, then we can accelerate */ +- if (samearch) { +- if (access("/dev/kqemu", F_OK) == 0 && +- virCapabilitiesAddGuestDomain(guest, +- "kqemu", +- NULL, +- NULL, +- 0, +- NULL) == NULL) +- return -1; ++ if (haskqemu && ++ virCapabilitiesAddGuestDomain(guest, ++ "kqemu", ++ NULL, ++ NULL, ++ 0, ++ NULL) == NULL) ++ return -1; + +- if (access("/dev/kvm", F_OK) == 0 && +- haskvm && +- virCapabilitiesAddGuestDomain(guest, +- "kvm", +- kvmbin, +- NULL, +- 0, +- NULL) == NULL) +- return -1; +- } ++ if (haskvm && ++ virCapabilitiesAddGuestDomain(guest, ++ "kvm", ++ kvmbin, ++ NULL, ++ 0, ++ NULL) == NULL) ++ return -1; + } else { + if (virCapabilitiesAddGuestDomain(guest, + "kvm", +@@ -363,12 +379,14 @@ virCapsPtr qemudCapsInit(void) { + if (virCapsInitNUMA(caps) < 0) + goto no_memory; + ++ /* First the pure HVM guests */ + for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++) + if (qemudCapsInitGuest(caps, + utsname.machine, + &arch_info_hvm[i], 1) < 0) + goto no_memory; + ++ /* Then possibly the Xen paravirt guests (ie Xenner */ + if (access("/usr/bin/xenner", X_OK) == 0 && + access("/dev/kvm", F_OK) == 0) { + for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_xen) ; i++) +@@ -430,6 +448,8 @@ int qemudExtractVersionInfo(const char * + + if (strstr(help, "-no-kqemu")) + flags |= QEMUD_CMD_FLAG_KQEMU; ++ if (strstr(help, "-no-kvm")) ++ flags |= QEMUD_CMD_FLAG_KVM; + if (strstr(help, "-no-reboot")) + flags |= QEMUD_CMD_FLAG_NO_REBOOT; + if (strstr(help, "-name")) +@@ -749,6 +769,7 @@ int qemudBuildCommandLine(virConnectPtr + char boot[VIR_DOMAIN_BOOT_LAST]; + struct utsname ut; + int disableKQEMU = 0; ++ int disableKVM = 0; + int qargc = 0, qarga = 0; + const char **qargv = NULL; + int qenvc = 0, qenva = 0; +@@ -757,6 +778,7 @@ int qemudBuildCommandLine(virConnectPtr + char uuid[VIR_UUID_STRING_BUFLEN]; + char domid[50]; + char *pidfile; ++ const char *cpu = NULL; + + uname_normalize(&ut); + +@@ -789,9 +811,16 @@ int qemudBuildCommandLine(virConnectPtr + } + } + ++ emulator = vm->def->emulator; ++ if (!emulator) ++ emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps); ++ if (!emulator) ++ return -1; ++ ++ + /* Need to explicitly disable KQEMU if + * 1. Arch matches host arch +- * 2. Guest is 'qemu' ++ * 2. Guest domain is 'qemu' + * 3. The qemu binary has the -no-kqemu flag + */ + if ((qemuCmdFlags & QEMUD_CMD_FLAG_KQEMU) && +@@ -799,6 +828,34 @@ int qemudBuildCommandLine(virConnectPtr + vm->def->virtType == VIR_DOMAIN_VIRT_QEMU) + disableKQEMU = 1; + ++ /* Need to explicitly disable KVM if ++ * 1. Arch matches host arch ++ * 2. Guest domain is 'qemu' ++ * 3. The qemu binary has the -no-kvm flag ++ */ ++ if ((qemuCmdFlags & QEMUD_CMD_FLAG_KVM) && ++ STREQ(ut.machine, vm->def->os.arch) && ++ vm->def->virtType == VIR_DOMAIN_VIRT_QEMU) ++ disableKVM = 1; ++ ++ /* ++ * Need to force a 32-bit guest CPU type if ++ * ++ * 1. guest OS is i686 ++ * 2. host OS is x86_64 ++ * 3. emulator is qemu-kvm or kvm ++ * ++ * Or ++ * ++ * 1. guest OS is i686 ++ * 2. emulator is qemu-system-x86_64 ++ */ ++ if (STREQ(vm->def->os.arch, "i686") && ++ ((STREQ(ut.machine, "x86_64") && ++ strstr(emulator, "kvm")) || ++ strstr(emulator, "x86_64"))) ++ cpu = "qemu32"; ++ + #define ADD_ARG_SPACE \ + do { \ + if (qargc == qarga) { \ +@@ -887,12 +944,6 @@ int qemudBuildCommandLine(virConnectPtr + ADD_ENV_COPY("LOGNAME"); + ADD_ENV_COPY("TMPDIR"); + +- emulator = vm->def->emulator; +- if (!emulator) +- emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps); +- if (!emulator) +- return -1; +- + ADD_ARG_LIT(emulator); + ADD_ARG_LIT("-S"); + +@@ -904,9 +955,15 @@ int qemudBuildCommandLine(virConnectPtr + ADD_ARG_LIT("-M"); + ADD_ARG_LIT(vm->def->os.machine); + } ++ if (cpu) { ++ ADD_ARG_LIT("-cpu"); ++ ADD_ARG_LIT(cpu); ++ } + + if (disableKQEMU) + ADD_ARG_LIT("-no-kqemu"); ++ if (disableKVM) ++ ADD_ARG_LIT("-no-kvm"); + ADD_ARG_LIT("-m"); + ADD_ARG_LIT(memory); + ADD_ARG_LIT("-smp"); +Index: src/qemu_conf.h +=================================================================== +RCS file: /data/cvs/libvirt/src/qemu_conf.h,v +retrieving revision 1.58 +diff -u -p -r1.58 qemu_conf.h +--- src/qemu_conf.h 16 Mar 2009 13:54:26 -0000 1.58 ++++ src/qemu_conf.h 16 Mar 2009 17:53:20 -0000 +@@ -55,6 +55,7 @@ enum qemud_cmd_flags { + QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP = (1 << 10), /* New migration syntax after merge to QEMU with TCP transport */ + QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC = (1 << 11), /* New migration syntax after merge to QEMU with EXEC transport */ + QEMUD_CMD_FLAG_DRIVE_CACHE_V2 = (1 << 12), /* Is the cache= flag wanting new v2 values */ ++ QEMUD_CMD_FLAG_KVM = (1 << 13), /* Whether KVM is compiled in */ + }; + + /* Main driver state */ +Index: src/qemu_driver.c +=================================================================== +RCS file: /data/cvs/libvirt/src/qemu_driver.c,v +retrieving revision 1.218 +diff -u -p -r1.218 qemu_driver.c +--- src/qemu_driver.c 16 Mar 2009 17:16:04 -0000 1.218 ++++ src/qemu_driver.c 16 Mar 2009 17:53:20 -0000 +@@ -1733,6 +1733,7 @@ qemudMonitorCommand(const virDomainObjPt + static int qemudProbe(void) + { + if ((virFileExists("/usr/bin/qemu")) || ++ (virFileExists("/usr/bin/qemu-system-x86_64")) || + (virFileExists("/usr/bin/qemu-kvm")) || + (virFileExists("/usr/bin/kvm")) || + (virFileExists("/usr/bin/xenner"))) +@@ -1749,10 +1750,10 @@ static virDrvOpenStatus qemudOpen(virCon + if (qemu_driver == NULL) + goto decline; + +- if (!qemudProbe()) +- goto decline; +- + if (conn->uri == NULL) { ++ if (!qemudProbe()) ++ goto decline; ++ + conn->uri = xmlParseURI(uid ? "qemu:///session" : "qemu:///system"); + if (!conn->uri) { + virReportOOMError(conn); + + +-- +|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| +|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| +|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| +|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| + +-- +Libvir-list mailing list +Libvir-list@redhat.com +https://www.redhat.com/mailman/listinfo/libvir-list --- libvirt-0.6.4.orig/debian/patches/9000-delayed_iff_up_bridge.patch +++ libvirt-0.6.4/debian/patches/9000-delayed_iff_up_bridge.patch @@ -0,0 +1,26 @@ +Index: libvirt-0.6.4/src/bridge.c +=================================================================== +--- libvirt-0.6.4.orig/src/bridge.c 2009-04-20 11:06:11.000000000 +0200 ++++ libvirt-0.6.4/src/bridge.c 2009-06-22 11:01:13.589060222 +0200 +@@ -254,7 +254,10 @@ + const char *bridge, + const char *iface) + { +- return brAddDelInterface(ctl, SIOCBRADDIF, bridge, iface); ++ int ret; ++ if (ret = brAddDelInterface(ctl, SIOCBRADDIF, bridge, iface)) ++ return ret; ++ return brSetInterfaceUp(ctl, bridge, 1); + } + #else + int +@@ -575,7 +578,8 @@ + ifr.ifr_flags = flags; + + if (ioctl(ctl->fd, SIOCSIFFLAGS, &ifr) < 0) +- return errno; ++ /* Just smile and wave, boys... */ ++ return 0; + } + + return 0; --- libvirt-0.6.4.orig/debian/patches/9001-dont_clobber_existing_bridges.patch +++ libvirt-0.6.4/debian/patches/9001-dont_clobber_existing_bridges.patch @@ -0,0 +1,12 @@ +Index: ubuntu/qemud/default-network.xml +=================================================================== +--- ubuntu.orig/qemud/default-network.xml 2008-02-12 01:20:09.818288028 +0100 ++++ ubuntu/qemud/default-network.xml 2008-02-12 01:20:17.518258142 +0100 +@@ -1,6 +1,6 @@ + + default +- ++ + + + --- libvirt-0.6.4.orig/debian/patches/9002-better_default_uri_virsh.patch +++ libvirt-0.6.4/debian/patches/9002-better_default_uri_virsh.patch @@ -0,0 +1,34 @@ +Index: libvirt-0.6.4/src/virsh.c +=================================================================== +--- libvirt-0.6.4.orig/src/virsh.c 2009-05-29 16:55:26.000000000 +0200 ++++ libvirt-0.6.4/src/virsh.c 2009-06-22 11:03:18.268035966 +0200 +@@ -57,6 +57,8 @@ + #define VSH_PROMPT_RW "virsh # " + #define VSH_PROMPT_RO "virsh > " + ++#include "remote_internal.h" ++ + #define GETTIMEOFDAY(T) gettimeofday(T, NULL) + #define DIFF_MSEC(T, U) \ + ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \ +@@ -7642,6 +7644,10 @@ + + if ((defaultConn = getenv("VIRSH_DEFAULT_CONNECT_URI"))) { + ctl->name = strdup(defaultConn); ++ } else if (!access(LIBVIRTD_PRIV_UNIX_SOCKET, W_OK)) { ++ ctl->name = strdup("qemu:///system"); ++ } else { ++ ctl->name = strdup("qemu:///session"); + } + + if (!vshParseArgv(ctl, argc, argv)) { +@@ -7649,6 +7655,9 @@ + exit(EXIT_FAILURE); + } + ++ if (!ctl->quiet) ++ fprintf(stderr, _("Connecting to uri: %s\n"), ctl->name); ++ + if (!vshInit(ctl)) { + vshDeinit(ctl); + exit(EXIT_FAILURE); --- libvirt-0.6.4.orig/debian/patches/9003-increase-logoutput-timeout.patch +++ libvirt-0.6.4/debian/patches/9003-increase-logoutput-timeout.patch @@ -0,0 +1,13 @@ +Index: libvirt-0.6.4/src/qemu_driver.c +=================================================================== +--- libvirt-0.6.4.orig/src/qemu_driver.c 2009-06-22 11:05:43.672034668 +0200 ++++ libvirt-0.6.4/src/qemu_driver.c 2009-06-22 11:06:31.800087249 +0200 +@@ -979,7 +979,7 @@ + + ret = qemudReadLogOutput(conn, vm, logfd, buf, sizeof(buf), + qemudFindCharDevicePTYs, +- "console", 3); ++ "console", 30); + if (close(logfd) < 0) { + char ebuf[4096]; + VIR_WARN(_("Unable to close logfile: %s\n"), --- libvirt-0.6.4.orig/debian/patches/9004-better-default-arch.patch +++ libvirt-0.6.4/debian/patches/9004-better-default-arch.patch @@ -0,0 +1,18 @@ +Index: libvirt-0.6.4/src/capabilities.c +=================================================================== +--- libvirt-0.6.4.orig/src/capabilities.c 2009-03-24 13:31:01.000000000 +0100 ++++ libvirt-0.6.4/src/capabilities.c 2009-06-22 11:07:35.598200561 +0200 +@@ -426,6 +426,13 @@ + const char *ostype) + { + int i; ++ /* Let's first see if we can match the host arch */ ++ for (i = 0 ; i < caps->nguests ; i++) { ++ if (STREQ(caps->guests[i]->ostype, ostype) ++ && STREQ(caps->guests[i]->arch.name, caps->host.arch)) ++ return caps->guests[i]->arch.name; ++ } ++ /* If we couldn't we just grab the first match */ + for (i = 0 ; i < caps->nguests ; i++) { + if (STREQ(caps->guests[i]->ostype, ostype)) + return 1; --- libvirt-0.6.4.orig/debian/patches/series +++ libvirt-0.6.4/debian/patches/series @@ -0,0 +1,11 @@ +0001-remove-RHism.diff.patch +#0002-qemu-disable-network.diff.patch +0003-allow-libvirt-group-to-access-the-socket.patch +0004-fix-Debian-specific-path-to-hvm-loader.patch +# Ubuntu specific patches: +9000-delayed_iff_up_bridge.patch +9001-dont_clobber_existing_bridges.patch +9002-better_default_uri_virsh.patch +9003-increase-logoutput-timeout.patch +9004-better-default-arch.patch +9005-libvirtd-group-name.patch --- libvirt-0.6.4.orig/debian/patches/9005-libvirtd-group-name.patch +++ libvirt-0.6.4/debian/patches/9005-libvirtd-group-name.patch @@ -0,0 +1,13 @@ +Index: libvirt-0.6.4/qemud/libvirtd.conf +=================================================================== +--- libvirt-0.6.4.orig/qemud/libvirtd.conf 2009-06-22 11:37:54.420041463 +0200 ++++ libvirt-0.6.4/qemud/libvirtd.conf 2009-06-22 11:38:16.784083328 +0200 +@@ -78,7 +78,7 @@ + # without becoming root. + # + # This is restricted to 'root' by default. +-unix_sock_group = "libvirt" ++unix_sock_group = "libvirtd" + + # Set the UNIX socket permissions for the R/O socket. This is used + # for monitoring VM status only