Release of libvirt-0.7.7

* configure.ac libvirt.spec.in: update with new version
* docs/news.html.in: add list of changes in 0.7.7
* po/*po*: updated spanish and russian localisations, rebuilt

.gitignore

@@ -1,13 +1,21 @@
+*#*#
+*.#*#
 *.a
 *.o
+*.orig
+*.rej
 *~
 .git
 .git-module-status
+/GNUmakefile
+/maint.mk
 ABOUT-NLS
 COPYING
+ChangeLog
 INSTALL
 Makefile
 Makefile.in
+NEWS
 aclocal.m4
 autom4te.cache
 config.cache
@@ -22,6 +30,7 @@ configure
 coverage
 cscope.files
 cscope.out
+gnulib/
 libtool
 libvirt-*.tar.gz
 libvirt.pc
@@ -34,13 +43,5 @@ results.log
 stamp-h
 stamp-h.in
 stamp-h1
-update.log
 tests/*.log
-/GNUmakefile
-/maint.mk
-gnulib/
-*.orig
-*.rej
-*#*#
-*.#*#
-ChangeLog
+update.log

.x-sc_avoid_write

@@ -1,5 +1,7 @@
-^src/util\.c$
-^src/xend_internal\.c$
-^src/util-lib\.c$
-^qemud/qemud.c$
+^src/libvirt\.c$
+^src/qemu/qemu_driver\.c$
+^src/qemu/qemu_monitor\.c$
+^src/util/util\.c$
+^src/xen/xend_internal\.c$
+^daemon/libvirtd.c$
 ^gnulib/

.x-sc_prohibit_VIR_ERR_NO_MEMORY

@@ -1,8 +1,5 @@
-ChangeLog
-docs/devhelp/libvirt-virterror.html
-docs/html/libvirt-virterror.html
-docs/libvirt-api.xml
-docs/libvirt-refs.xml
-include/libvirt/virterror.h
-qemud/dispatch.c
-src/virterror.c
+^ChangeLog$
+^ChangeLog-old$
+^include/libvirt/virterror\.h$
+^daemon/dispatch\.c$
+^src/util/virterror\.c$

.x-sc_prohibit_gethostby

@@ -1,3 +1,2 @@
-gnulib/lib/getaddrinfo.c
-gnulib/m4/
-src/xend_internal.c
+^gnulib/lib/getaddrinfo\.c$
+^gnulib/m4/

.x-sc_prohibit_gethostname

@@ -0,0 +1,2 @@
+^src/util/util\.c$
+^ChangeLog-old$

.x-sc_prohibit_nonreentrant

@@ -1,10 +1,10 @@
 ^gnulib/
 ^po/
-ChangeLog
+^ChangeLog$
+^ChangeLog-old$
 ^Makefile*
 ^docs/
 ^tests/
-^src/virsh\.c
-^src/console\.c
-^src/virterror\.c
+^tools/virsh\.c$
+^tools/console\.c$
 ^build-aux/

.x-sc_prohibit_readlink

@@ -0,0 +1,2 @@
+^src/util/util\.c$
+^ChangeLog-old$

.x-sc_prohibit_strcmp_and_strncmp

@@ -1 +1,9 @@
 ^gnulib/
+^ChangeLog-old$
+^docs/
+^examples/domain-events/events-c/event-test\.c$
+^src/internal\.h$
+^src/lxc/lxc_container\.c$
+^src/node_device/node_device_devkit\.c$
+^src/node_device/node_device_hal\.c$
+^src/storage/parthelper\.c$

.x-sc_prohibit_strncpy

@@ -0,0 +1 @@
+^src/util/util\.c$

.x-sc_require_config_h

@@ -1,6 +1,4 @@
-^docs/examples/info1\.c$
-^docs/examples/suspend\.c$
+^examples/
 ^gnulib/lib/dummy\.c$
 ^gnulib/tests/dummy\.c$
-^qemud/remote_protocol\.c$
 ^ChangeLog$

.x-sc_require_config_h_first

@@ -1,2 +1 @@
-^docs/examples/info1\.c$
-^docs/examples/suspend\.c$
+^examples/

AUTHORS

@@ -22,6 +22,8 @@ The primary maintainers and people with commit access rights:
   Dan Smith            <danms@us.ibm.com>
   Guido Günther        <agx@sigxcpu.org>
   John Levon           <john.levon@sun.com>
+  Matthias Bolte       <matthias.bolte@googlemail.com>
+  Jiri Denemark        <jdenemar@redhat.com>
 
 Patches have also been contributed by:
 
@@ -52,7 +54,7 @@ Patches have also been contributed by:
   Charles Duffy        <Charles_Duffy@messageone.com>
   Nguyen Anh Quynh     <aquynh@gmail.com>
   James Morris         <jmorris@namei.org>
-  Chris Wrigh          <chrisw@redhat.com>
+  Chris Wright         <chrisw@redhat.com>
   Ben Guthro           <ben.guthro@gmail.com>
   Shigeki Sakamoto     <fj0588di@aa.jp.fujitsu.com>
   Gerd von Egidy       <lists@egidy.de>
@@ -78,8 +80,15 @@ Patches have also been contributed by:
   Henrik Persson E     <henrik.e.persson@ericsson.com>
   Satoru SATOH         <satoru.satoh@gmail.com>
   Paolo Bonzini        <pbonzini@redhat.com>
-  Matthias Bolte       <matthias.bolte@googlemail.com>
   Miloslav Trmač       <mitr@redhat.com>
+  Jamie Strandboge     <jamie@canonical.com>
+  Gerhard Stenzel      <gerhard.stenzel@de.ibm.com>
+  Matthew Booth        <mbooth@redhat.com>
+  Diego Elio Pettenò   <flameeyes@gmail.com>
+  Adam Litke           <agl@us.ibm.com>
+  Steve Yarmie         <steve.yarmie@gmail.com>
+  Dan Kenigsberg       <danken@redhat.com>
+  Yuji NISHIDA         <nishidy@nict.go.jp>
 
   [....send patches to get your name here....]
 

HACKING

@@ -15,14 +15,14 @@ should work:
 
 or:
 
-  cvs diff -up > libvirt-myfeature.patch
+  git diff > libvirt-myfeature.patch
 
 (3) Split large changes into a series of smaller patches, self-contained
 if possible, with an explanation of each patch and an explanation of how
 the sequence of patches fits together.
 
-(4) Make sure your patches apply against libvirt CVS.  Developers
-only follow CVS and don't care much about released versions.
+(4) Make sure your patches apply against libvirt GIT.  Developers
+only follow GIT and don't care much about released versions.
 
 (5) Run the automated tests on your code before submitting any changes.
 In particular, configure with compile warnings set to -Werror:
@@ -37,6 +37,17 @@ and run the tests:
 
 The latter test checks for memory leaks.
 
+If you encounter any failing tests, the VIR_TEST_DEBUG environment variable
+may provide extra information to debug the failures. Larger values of
+VIR_TEST_DEBUG may provide larger amounts of information:
+
+  VIR_TEST_DEBUG=1 make check    (or)
+  VIR_TEST_DEBUG=2 make check
+
+Also, individual tests can be run from inside the 'tests/' directory, like:
+
+  ./qemuxml2xmltest
+
 (6) Update tests and/or documentation, particularly if you are adding
 a new feature or changing the output of a program.
 
@@ -155,13 +166,13 @@ codebase, because they encourage a number of serious coding bugs and do
 not enable compile time verification of checks for NULL. Instead of these
 routines, use the macros from memory.h
 
-  - eg to allocate  a single object:
+  - eg to allocate a single object:
 
       virDomainPtr domain;
 
       if (VIR_ALLOC(domain) < 0) {
-         __virRaiseError(VIR_ERROR_NO_MEMORY)
-         return NULL;
+          virReportOOMError();
+          return NULL;
       }
 
 
@@ -171,8 +182,8 @@ routines, use the macros from memory.h
        int ndomains = 10;
 
        if (VIR_ALLOC_N(domains, ndomains) < 0) {
-         __virRaiseError(VIR_ERROR_NO_MEMORY)
-         return NULL;
+           virReportOOMError();
+           return NULL;
        }
 
   - eg to allocate an array of object pointers
@@ -181,8 +192,8 @@ routines, use the macros from memory.h
        int ndomains = 10;
 
        if (VIR_ALLOC_N(domains, ndomains) < 0) {
-         __virRaiseError(VIR_ERROR_NO_MEMORY)
-         return NULL;
+           virReportOOMError();
+           return NULL;
        }
 
    - eg to re-allocate the array of domains to be longer
@@ -190,8 +201,8 @@ routines, use the macros from memory.h
        ndomains = 20
 
        if (VIR_REALLOC_N(domains, ndomains) < 0) {
-         __virRaiseError(VIR_ERROR_NO_MEMORY)
-         return NULL;
+           virReportOOMError();
+           return NULL;
        }
 
    - eg to free the domain
@@ -211,7 +222,7 @@ one of the following semantically named macros
      STREQ(a,b)
      STRNEQ(a,b)
 
-  - For case sensitive equality:
+  - For case insensitive equality:
      STRCASEEQ(a,b)
      STRCASENEQ(a,b)
 
@@ -220,7 +231,7 @@ one of the following semantically named macros
      STREQLEN(a,b,n)
      STRNEQLEN(a,b,n)
 
-  - For case sensitive equality of a substring:
+  - For case insensitive equality of a substring:
 
      STRCASEEQLEN(a,b,n)
      STRCASENEQLEN(a,b,n)
@@ -231,6 +242,37 @@ one of the following semantically named macros
 
 
 
+String copying
+==============
+
+Do not use the strncpy function.  According to the man page, it does
+*not* guarantee a NULL-terminated buffer, which makes it extremely dangerous
+to use.  Instead, use one of the functionally equivalent functions:
+
+  - virStrncpy(char *dest, const char *src, size_t n, size_t destbytes)
+      The first three arguments have the same meaning as for strncpy; namely the
+      destination, source, and number of bytes to copy, respectively.  The last
+      argument is the number of bytes available in the destination string; if a
+      copy of the source string (including a \0) will not fit into the
+      destination, no bytes are copied and the routine returns NULL.
+      Otherwise, n bytes from the source are copied into the destination and a
+      trailing \0 is appended.
+
+  - virStrcpy(char *dest, const char *src, size_t destbytes)
+      Use this variant if you know you want to copy the entire src string
+      into dest.  Note that this is a macro, so arguments could be
+      evaluated more than once.  This is equivalent to
+      virStrncpy(dest, src, strlen(src), destbytes)
+
+  - virStrcpyStatic(char *dest, const char *src)
+      Use this variant if you know you want to copy the entire src string
+      into dest *and* you know that your destination string is a static string
+      (i.e. that sizeof(dest) returns something meaningful).  Note that
+      this is a macro, so arguments could be evaluated more than once.  This is
+      equivalent to virStrncpy(dest, src, strlen(src), sizeof(dest)).
+
+
+
 Variable length string buffer
 =============================
 
@@ -251,10 +293,11 @@ eg typical usage is as follows:
      ...
      virBufferAddLit(&buf, "</domain>\n");
 
-     ....
+     ...
 
      if (virBufferError(&buf)) {
-         __virRaiseError(...);
+         virBufferFreeAndReset(&buf);
+         virReportOOMError();
          return NULL;
      }
 
@@ -342,7 +385,7 @@ to build:
   - if a recently commited patch breaks compilation on a platform
     or for a given driver then it's fine to commit a minimal fix
     directly without getting the review feedback first
-  - similary if make check or make syntax-chek breaks, if there is
+  - similary if make check or make syntax-check breaks, if there is
     an obvious fix, it's fine to commit immediately
 The patch should still be sent to the list (or tell what the fix was if
 trivial) and 'make check syntax-check' should pass too before commiting

Makefile.am

@@ -3,31 +3,56 @@
 LCOV = lcov
 GENHTML = genhtml
 
-SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
-  python tests po examples/domain-events/events-c examples/hellolibvirt
+SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
+  python tests po examples/domain-events/events-c examples/hellolibvirt \
+  examples/dominfo examples/domsuspend examples/python examples/apparmor
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
+XML_EXAMPLES = \
+  $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \
+					test/*.xml storage/*.xml)))
+
 EXTRA_DIST = \
   ChangeLog-old \
   libvirt.spec libvirt.spec.in \
   mingw32-libvirt.spec.in \
   libvirt.pc libvirt.pc.in \
-  $(man_MANS) autobuild.sh \
+  autobuild.sh \
+  .x-sc_avoid_ctype_macros \
   .x-sc_avoid_if_before_free \
-  .x-sc_require_config_h_first \
+  .x-sc_avoid_write \
+  .x-sc_m4_quote_check \
+  .x-sc_prohibit_asprintf \
+  .x-sc_prohibit_gethostby \
+  .x-sc_prohibit_gethostname \
+  .x-sc_prohibit_have_config_h \
+  .x-sc_prohibit_HAVE_MBRTOWC \
+  .x-sc_prohibit_nonreentrant \
   .x-sc_prohibit_strcmp \
   .x-sc_prohibit_strcmp_and_strncmp \
+  .x-sc_prohibit_strncpy \
+  .x-sc_prohibit_VIR_ERR_NO_MEMORY \
   .x-sc_require_config_h \
-  .x-sc_prohibit_nonreentrant \
+  .x-sc_require_config_h_first \
+  .x-sc_trailing_blank \
   Makefile.nonreentrant \
-  autogen.sh
-
-man_MANS = virsh.1
+  autogen.sh \
+  examples/domain-events/events-python \
+  $(XML_EXAMPLES)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvirt.pc
 
+NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
+	-@(if [ -x $(XSLTPROC) ] ; then				\
+	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl	\
+	     $(top_srcdir)/docs/news.html.in			\
+	   | perl -0777 -pe 's/\n\n+$$/\n/'			\
+	   | perl -pe 's/[ \t]+$$//'				\
+	   > $@-t && mv $@-t $@ ; fi );
+
+
 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
 
@@ -40,7 +65,7 @@ tests:
 
 cov: clean-cov
 	mkdir $(top_builddir)/coverage
-	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src  -d $(top_srcdir)/qemud -d $(top_srcdir)/tests
+	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp -d $(top_srcdir)/src  -d $(top_srcdir)/daemon -d $(top_srcdir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp -o $(top_builddir)/coverage/libvirt.info *usr*
 	rm $(top_builddir)/coverage/libvirt.info.tmp
 	$(GENHTML) -s -t "libvirt" -o $(top_builddir)/coverage --legend $(top_builddir)/coverage/libvirt.info

README-hacking

@@ -12,8 +12,7 @@ requirements on anyone wishing to build from the just-checked-out sources.
 Note the requirements to build the released archive are much less and
 are just the requirements of the standard ./configure && make procedure.
 Specific development tools and versions will be checked for and listed by
-the bootstrap script.  See README-prereq for specific notes on obtaining
-these prerequisite tools.
+the bootstrap script.
 
 Valgrind <http://valgrind.org/> is also highly recommended, if
 Valgrind supports your architecture. See also README-valgrind.
@@ -28,6 +27,12 @@ You can get a copy of the source repository like this:
         $ git clone git://libvirt.org/libvirt
         $ cd libvirt
 
+As an optional step, if you already have a copy of the gnulib git
+repository on your hard drive, then you can use it as a reference to
+reduce download time and disk space requirements:
+
+        $ export GNULIB_SRCDIR=/path/to/gnulib
+
 The next step is to get all required pieces from gnulib,
 to run autoreconf, and to invoke ./configure:
 

RENAMES

@@ -1,30 +0,0 @@
-# Suggested list of file renames.
-#
-# File renames don't normally go into patches because they make
-# the patches much harder to read, so list them here instead.
-
-# Clearer naming scheme after Xen-unified patch went in.
-src/xen_internal.c	src/xen_internal_hv.c
-src/xen_internal.h	src/xen_internal_hv.h
-src/proxy_internal.c	src/xen_internal_proxy.c
-src/proxy_internal.h	src/xen_internal_proxy.h
-src/xend_internal.c	src/xen_internal_xend.c
-src/xend_internal.h	src/xen_internal_xend.h
-src/xm_internal.c	src/xen_internal_inactive.c
-src/xm_internal.h	src/xen_internal_inactive.h
-src/xs_internal.c	src/xen_internal_xenstore.c
-src/xs_internal.h	src/xen_internal_xenstore.h
-src/xen_unified.c	src/xen_internal.c
-src/xen_unified.h	src/xen_internal.h
-
-# Test driver should really be called test_internal.
-src/test.c		src/test_internal.c
-src/test.h		src/test_internal.h
-
-# This would be better:
-src/*_internal*.c	src/*_driver*.c
-src/*_internal*.h	src/*_driver*.h
-
-# Qemud is now the qemud + remote driver.
-qemud/protocol.x	qemud/qemud_protocol.x
-qemud/*			remote/*

autogen.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 
 THEDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
 DIE=0
 
 (autopoint --version) < /dev/null > /dev/null 2>&1 || {
@@ -49,35 +49,42 @@ test -f src/libvirt.c || {
 	exit 1
 }
 
-if test -z "$*"; then
+
+EXTRA_ARGS=
+if test "x$1" = "x--system"; then
+    shift
+    EXTRA_ARGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var"
+    echo "Running ./configure with $EXTRA_ARGS $@"
+else
+    if test -z "$*"; then
 	echo "I am going to run ./configure with no arguments - if you wish "
         echo "to pass any to it, please specify them on the $0 command line."
+    fi
 fi
 
 # Ensure that whenever we pull in a gnulib update or otherwise change to a
 # different version (i.e., when switching branches), we also rerun ./bootstrap.
 curr_status=.git-module-status
-t=$(git submodule status)
+t=$(git submodule status|sed 's/^[ +-]//;s/ .*//')
 if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
-    : # good, it's up to date
+    : # good, it's up to date, all we need is autoreconf
+    autoreconf -if
 else
   echo running bootstrap...
-  ./bootstrap && echo "$t" > $curr_status
+  ./bootstrap && echo "$t" > $curr_status || {
+    echo "Failed to bootstrap gnulib, please investigate."
+    exit 1;
+  }
 fi
 
-# Automake requires that ChangeLog exist.
-touch ChangeLog
+cd "$THEDIR"
 
-autoreconf -if
-
-cd $THEDIR
-
-if test x$OBJ_DIR != x; then
+if test "x$OBJ_DIR" != x; then
     mkdir -p "$OBJ_DIR"
     cd "$OBJ_DIR"
 fi
 
-$srcdir/configure "$@" && {
+$srcdir/configure $EXTRA_ARGS "$@" && {
     echo
     echo "Now type 'make' to compile libvirt."
 }

bootstrap

@@ -1,8 +1,50 @@
-#!/bin/sh
-# Run this before autogen.sh, to pull in all of the gnulib-related bits.
+#! /bin/sh
+# Print a version string.
+scriptversion=2010-02-24.17; # UTC
+
+# Bootstrap this package from checked-out sources.
+
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project.  The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib@gnu.org.
+
+nl='
+'
+
+# Ensure file names are sorted consistently across platforms.
+LC_ALL=C
+export LC_ALL
+
+local_gl_dir=gl
+
+# Temporary directory names.
+bt='._bootmp'
+bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+bt2=${bt}2
 
 usage() {
-  echo >&2 "\
+  cat <<EOF
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
@@ -11,15 +53,173 @@ Options:
                           sources reside.  Use this if you already
                           have gnulib sources on your machine, and
                           do not want to waste your bandwidth downloading
-                          them again.
+                          them again.  Defaults to \$GNULIB_SRCDIR.
+ --copy                   Copy files instead of creating symbolic links.
+ --force                  Attempt to bootstrap even if the sources seem
+                          not to have been checked out.
+ --skip-po                Do not download po files.
 
-If the file bootstrap.conf exists in the current working directory, its
+If the file $0.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
 Running without arguments will suffice in most cases.
-"
+EOF
 }
 
+# Configuration.
+
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
+# List of gnulib modules needed.
+gnulib_modules=
+
+# Any gnulib files needed that are not in modules.
+gnulib_files=
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within are
+# all symlinks.
+po_download_command_format=\
+"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+
+extract_package_name='
+  /^AC_INIT(/{
+     /.*,.*,.*, */{
+       s///
+       s/[][]//g
+       s/)$//
+       p
+       q
+     }
+     s/AC_INIT(\[*//
+     s/]*,.*//
+     s/^GNU //
+     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+     s/[^A-Za-z0-9_]/-/g
+     p
+  }
+'
+package=`sed -n "$extract_package_name" configure.ac` || exit
+gnulib_name=lib$package
+
+build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+
+# Extra files from gnulib, which override files from other sources.
+gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
+"
+
+# Additional gnulib-tool options to use.  Use "\newline" to break lines.
+gnulib_tool_option_extras=
+
+# Other locale categories that need message catalogs.
+EXTRA_LOCALE_CATEGORIES=
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS='\\\
+ --flag=_:1:pass-c-format\\\
+ --flag=N_:1:pass-c-format\\\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
+'
+
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
+MSGID_BUGS_ADDRESS=bug-$package@gnu.org
+
+# Files we don't want to import.
+excluded_files=
+
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=README-hacking
+
+# Whether to use copies instead of symlinks.
+copy=false
+
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program.  Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run (i.e.,
+# supports --version).  If found, set ENVVAR to the program name,
+# die otherwise.
+find_tool ()
+{
+  find_tool_envvar=$1
+  shift
+  find_tool_names=$@
+  eval "find_tool_res=\$$find_tool_envvar"
+  if test x"$find_tool_res" = x; then
+    for i
+    do
+      if ($i --version </dev/null) >/dev/null 2>&1; then
+       find_tool_res=$i
+       break
+      fi
+    done
+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "
+  fi
+  if test x"$find_tool_res" = x; then
+    echo >&2 "$0: one of these is required: $find_tool_names"
+    exit 1
+  fi
+  ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
+    echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    exit 1
+  }
+  eval "$find_tool_envvar=\$find_tool_res"
+  eval "export $find_tool_envvar"
+}
+
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+find_tool SHA1SUM sha1sum gsha1sum shasum
+
+# Override the default configuration, if necessary.
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+  */*) test -r "$0.conf" && . "$0.conf" ;;
+  *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitignore
+  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
+# Translate configuration into internal form.
+
+# Parse options.
+
 for option
 do
   case $option in
@@ -27,36 +227,235 @@ do
     usage
     exit;;
   --gnulib-srcdir=*)
-    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+    GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
+  --skip-po)
+    SKIP_PO=t;;
+  --force)
+    checkout_only_file=;;
+  --copy)
+    copy=true;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+  exit 1
+fi
+
+# If $STR is not already on a line by itself in $FILE, insert it,
+# sorting the new contents of the file and replacing $FILE with the result.
+insert_sorted_if_absent() {
+  file=$1
+  str=$2
+  test -f $file || touch $file
+  echo "$str" | sort -u - $file | cmp - $file > /dev/null \
+    || echo "$str" | sort -u - $file -o $file \
+    || exit 1
+}
+
+# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+found_aux_dir=no
+grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+    >/dev/null && found_aux_dir=yes
+grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+    >/dev/null && found_aux_dir=yes
+if test $found_aux_dir = no; then
+  echo "$0: expected line not found in configure.ac. Add the following:" >&2
+  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2
+  exit 1
+fi
+
+# If $build_aux doesn't exist, create it now, otherwise some bits
+# below will malfunction.  If creating it, also mark it as ignored.
+if test ! -d $build_aux; then
+  mkdir $build_aux
+  for dot_ig in x $vc_ignore; do
+    test $dot_ig = x && continue
+    insert_sorted_if_absent $dot_ig $build_aux
+  done
+fi
+
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+  ver1="$1"
+  ver2="$2"
+
+  # split on '.' and compare each component
+  i=1
+  while : ; do
+    p1=$(echo "$ver1" | cut -d. -f$i)
+    p2=$(echo "$ver2" | cut -d. -f$i)
+    if [ ! "$p1" ]; then
+      echo "$1 $2"
+      break
+    elif [ ! "$p2" ]; then
+      echo "$2 $1"
+      break
+    elif [ ! "$p1" = "$p2" ]; then
+      if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+        echo "$2 $1"
+      elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+        echo "$1 $2"
+      else # numeric, then lexicographic comparison
+        lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+        if [ "$lp" = "$p2" ]; then
+          echo "$1 $2"
+        else
+          echo "$2 $1"
+        fi
+      fi
+      break
+    fi
+    i=$(($i+1))
+  done
+}
+
+get_version() {
+  app=$1
+
+  $app --version >/dev/null 2>&1 || return 1
+
+  $app --version 2>&1 |
+  sed -n '# extract version within line
+          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
+          # extract version at start of line
+          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
+          t done
+
+          d
+
+          :done
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
+          q'
+}
+
+check_versions() {
+  ret=0
+
+  while read app req_ver; do
+    # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+    appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+    test "$appvar" = TAR && appvar=AMTAR
+    eval "app=\${$appvar-$app}"
+    inst_ver=$(get_version $app)
+    if [ ! "$inst_ver" ]; then
+      echo "Error: '$app' not found" >&2
+      ret=1
+    elif [ ! "$req_ver" = "-" ]; then
+      latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+      if [ ! "$latest_ver" = "$inst_ver" ]; then
+        echo "Error: '$app' version == $inst_ver is too old" >&2
+        echo "       '$app' version >= $req_ver is required" >&2
+        ret=1
+      fi
+    fi
+  done
+
+  return $ret
+}
+
+print_versions() {
+  echo "Program    Min_version"
+  echo "----------------------"
+  printf "$buildreq"
+  echo "----------------------"
+  # can't depend on column -t
+}
+
+if ! printf "$buildreq" | check_versions; then
+  test -f README-prereq &&
+  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
+  echo
+  print_versions
+  exit 1
+fi
+
+echo "$0: Bootstrapping from checked-out $package sources..."
+
+# See if we can use gnulib's git-merge-changelog merge driver.
+if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+  if git config merge.merge-changelog.driver >/dev/null ; then
+    :
+  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+    echo "initializing git-merge-changelog driver"
+    git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+    git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+  else
+    echo "consider installing git-merge-changelog from gnulib"
+  fi
+fi
+
+
+cleanup_gnulib() {
+  status=$?
+  rm -fr "$gnulib_path"
+  exit $status
+}
+
+git_modules_config () {
+  test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+gnulib_path=`git_modules_config submodule.gnulib.path`
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
 -)
-  echo "$0: getting gnulib files..."
-  git submodule init || exit $?
-  git submodule update || exit $?
-  GNULIB_SRCDIR=.gnulib
+  if git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    git submodule init || exit $?
+    git submodule update || exit $?
+
+  elif [ ! -d "$gnulib_path" ]; then
+    echo "$0: getting gnulib files..."
+
+    trap cleanup_gnulib 1 2 13 15
+
+    git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
+      cleanup_gnulib
+
+    trap - 1 2 13 15
+  fi
+  GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
-  # Redirect the gnulib submodule to the directory on the command line
-  # if possible.
+  # Use GNULIB_SRCDIR as a reference.
   if test -d "$GNULIB_SRCDIR"/.git && \
-	git config --file .gitmodules submodule.gnulib.url >/dev/null; then
-    git submodule init
-    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
-    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+        git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    git submodule update || exit $?
-    GNULIB_SRCDIR=.gnulib
-  else
-    echo >&2 "$0: invalid gnulib srcdir: $GNULIB_SRCDIR"
-    exit 1
+    if git submodule --help|grep reference > /dev/null; then
+      # Prefer the one-liner available in git 1.6.4 or newer.
+      git submodule update --init --reference "$GNULIB_SRCDIR" \
+        "$gnulib_path" || exit $?
+    else
+      # This fallback allows at least git 1.5.5.
+      if test -f "$gnulib_path"/gnulib-tool; then
+        # Since file already exists, assume submodule init already complete.
+        git submodule update || exit $?
+      else
+        # Older git can't clone into an empty directory.
+        rmdir "$gnulib_path" 2>/dev/null
+        git clone --reference "$GNULIB_SRCDIR" \
+          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+          && git submodule init && git submodule update \
+          || exit $?
+      fi
+    fi
+    GNULIB_SRCDIR=$gnulib_path
   fi
   ;;
 esac
@@ -64,53 +463,391 @@ esac
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
-modules='
-base64
-c-ctype
-close
-connect
-getaddrinfo
-gethostname
-getpass
-gettext
-gitlog-to-changelog
-gnumakefile
-inet_pton
-ioctl
-maintainer-makefile
-mkstemp
-mktempd
-perror
-physmem
-poll
-posix-shell
-recv
-random_r
-send
-setsockopt
-socket
-stpcpy
-strchrnul
-strndup
-strerror
-strsep
-sys_stat
-time_r
-useless-if-before-free
-vasprintf
-verify
-vc-list-files
-'
+# Get translations.
 
-# Tell gnulib to:
-#   require LGPLv2+
-#   put *.m4 files in new gnulib/m4/ dir
-#   put *.[ch] files in new gnulib/lib/ dir.
+download_po_files() {
+  subdir=$1
+  domain=$2
+  echo "$0: getting translations into $subdir for $domain..."
+  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd"
+}
 
-$gnulib_tool			\
-  --lgpl=2			\
-  --with-tests			\
-  --m4-base=gnulib/m4		\
-  --source-base=gnulib/lib	\
-  --tests-base=gnulib/tests	\
-  --import $modules
+# Download .po files to $po_dir/.reference and copy only the new
+# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+update_po_files() {
+  # Directory containing primary .po files.
+  # Overwrite them only when we're sure a .po file is new.
+  po_dir=$1
+  domain=$2
+
+  # Download *.po files into this dir.
+  # Usually contains *.s1 checksum files.
+  ref_po_dir="$po_dir/.reference"
+
+  test -d $ref_po_dir || mkdir $ref_po_dir || return
+  download_po_files $ref_po_dir $domain \
+    && ls "$ref_po_dir"/*.po 2>/dev/null |
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+
+  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+  test "$langs" = '*' && langs=x
+  for po in $langs; do
+    case $po in x) continue;; esac
+    new_po="$ref_po_dir/$po.po"
+    cksum_file="$ref_po_dir/$po.s1"
+    if ! test -f "$cksum_file" ||
+        ! test -f "$po_dir/$po.po" ||
+        ! $SHA1SUM -c --status "$cksum_file" \
+            < "$new_po" > /dev/null; then
+      echo "updated $po_dir/$po.po..."
+      cp "$new_po" "$po_dir/$po.po" \
+          && $SHA1SUM < "$new_po" > "$cksum_file"
+    fi
+  done
+}
+
+case $SKIP_PO in
+'')
+  if test -d po; then
+    update_po_files po $package || exit
+  fi
+
+  if test -d runtime-po; then
+    update_po_files runtime-po $package-runtime || exit
+  fi;;
+esac
+
+symlink_to_dir()
+{
+  src=$1/$2
+  dst=${3-$2}
+
+  test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$dst"`
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+
+      # If we've just created a directory like lib/uniwidth,
+      # tell version control system(s) it's ignorable.
+      # FIXME: for now, this does only one level
+      parent=`dirname "$dst_dir"`
+      for dot_ig in x $vc_ignore; do
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+      done
+    fi
+
+    if $copy; then
+      {
+        test ! -h "$dst" || {
+          echo "$0: rm -f $dst" &&
+          rm -f "$dst"
+        }
+      } &&
+      test -f "$dst" &&
+      cmp -s "$src" "$dst" || {
+        echo "$0: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
+      }
+    else
+      test -h "$dst" &&
+      src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
+      dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
+      test "$src_i" = "$dst_i" || {
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+             exit 1;;
+          /*/*/*/*/)	dot_dots=../../../;;
+          /*/*/*/)	dot_dots=../../;;
+          /*/*/)	dot_dots=../;;
+          esac;;
+        esac
+
+        echo "$0: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
+      }
+    fi
+  }
+}
+
+cp_mark_as_generated()
+{
+  cp_src=$1
+  cp_dst=$2
+
+  if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
+    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
+  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
+    symlink_to_dir $local_gl_dir "$cp_dst"
+  else
+    case $cp_dst in
+      *.[ch])             c1='/* '; c2=' */';;
+      *.texi)             c1='@c '; c2=     ;;
+      *.m4|*/Make*|Make*) c1='# ' ; c2=     ;;
+      *)                  c1=     ; c2=     ;;
+    esac
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$cp_dst"`
+    test -d "$dst_dir" || mkdir -p "$dst_dir"
+
+    if test -z "$c1"; then
+      cmp -s "$cp_src" "$cp_dst" || {
+        # Copy the file first to get proper permissions if it
+        # doesn't already exist.  Then overwrite the copy.
+        echo "$0: cp -f $cp_src $cp_dst" &&
+        rm -f "$cp_dst" &&
+        cp "$cp_src" "$cp_dst-t" &&
+        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+        mv -f "$cp_dst-t" "$cp_dst"
+      }
+    else
+      # Copy the file first to get proper permissions if it
+      # doesn't already exist.  Then overwrite the copy.
+      cp "$cp_src" "$cp_dst-t" &&
+      (
+        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+        sed "s!$bt_regex/!!g" "$cp_src"
+      ) > $cp_dst-t &&
+      if cmp -s "$cp_dst-t" "$cp_dst"; then
+        rm -f "$cp_dst-t"
+      else
+        echo "$0: cp $cp_src $cp_dst # with edits" &&
+        mv -f "$cp_dst-t" "$cp_dst"
+      fi
+    fi
+  fi
+}
+
+version_controlled_file() {
+  dir=$1
+  file=$2
+  found=no
+  if test -d CVS; then
+    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
+             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+  elif test -d .git; then
+    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+  elif test -d .svn; then
+    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
+  else
+    echo "$0: no version control for $dir/$file?" >&2
+  fi
+  test $found = yes
+}
+
+slurp() {
+  for dir in . `(cd $1 && find * -type d -print)`; do
+    copied=
+    sep=
+    for file in `ls -a $1/$dir`; do
+      case $file in
+      .|..) continue;;
+      .*) continue;; # FIXME: should all file names starting with "." be ignored?
+      esac
+      test -d $1/$dir/$file && continue
+      for excluded_file in $excluded_files; do
+        test "$dir/$file" = "$excluded_file" && continue 2
+      done
+      if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
+        copied=$copied${sep}$gnulib_mk; sep=$nl
+        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || {
+          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+          rm -f $dir/$gnulib_mk &&
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+        }
+      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
+           version_controlled_file $dir $file; then
+        echo "$0: $dir/$file overrides $1/$dir/$file"
+      else
+        copied=$copied$sep$file; sep=$nl
+        if test $file = gettext.m4; then
+          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+          rm -f $dir/$file
+          sed '
+            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+              AC_DEFUN([AM_INTL_SUBDIR], [])
+            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
+            $a\
+              AC_DEFUN([gl_LOCK_EARLY], [])
+          ' $1/$dir/$file >$dir/$file
+        else
+          cp_mark_as_generated $1/$dir/$file $dir/$file
+        fi
+      fi || exit
+    done
+
+    for dot_ig in x $vc_ignore; do
+      test $dot_ig = x && continue
+      ig=$dir/$dot_ig
+      if test -n "$copied"; then
+        insert_sorted_if_absent $ig "$copied"
+        # If an ignored file name ends with .in.h, then also add
+        # the name with just ".h".  Many gnulib headers are generated,
+        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+        insert_sorted_if_absent $ig "$f"
+
+        # For files like sys_stat.in.h and sys_time.in.h, record as
+        # ignorable the directory we might eventually create: sys/.
+        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+        insert_sorted_if_absent $ig "$f"
+      fi
+    done
+  done
+}
+
+
+# Create boot temporary directories to import from gnulib and gettext.
+rm -fr $bt $bt2 &&
+mkdir $bt $bt2 || exit
+
+# Import from gnulib.
+
+gnulib_tool_options="\
+ --import\
+ --no-changelog\
+ --aux-dir $bt/$build_aux\
+ --doc-base $bt/$doc_base\
+ --lib $gnulib_name\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\
+ --local-dir $local_gl_dir\
+ $gnulib_tool_option_extras\
+"
+echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+slurp $bt || exit
+
+for file in $gnulib_files; do
+  symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+done
+
+
+# Import from gettext.
+with_gettext=yes
+grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+    with_gettext=no
+
+if test $with_gettext = yes; then
+  echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
+  cp configure.ac $bt2 &&
+  (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
+  slurp $bt2 $bt || exit
+fi
+rm -fr $bt $bt2 || exit
+
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
+# The following requires GNU find 4.2.3 or newer.  Considering the usual
+# portability constraints of this script, that may seem a very demanding
+# requirement, but it should be ok.  Ignore any failure, which is fine,
+# since this is only a convenience to help developers avoid the relatively
+# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+# between successive runs of this script.
+find "$m4_base" "$source_base" \
+  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+  -type l -xtype l -delete > /dev/null 2>&1
+
+# Reconfigure, getting other files.
+
+# Skip autoheader if it's not needed.
+grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
+for command in \
+  libtool \
+  "${ACLOCAL-aclocal} --force -I m4" \
+  "${AUTOCONF-autoconf} --force" \
+  "${AUTOHEADER-autoheader} --force" \
+  "${AUTOMAKE-automake} --add-missing --copy --force-missing"
+do
+  if test "$command" = libtool; then
+    use_libtool=0
+    # We'd like to use grep -E, to see if any of LT_INIT,
+    # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+    # but that's not portable enough (e.g., for Solaris).
+    grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+      && use_libtool=1
+    grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
+      && use_libtool=1
+    test $use_libtool = 0 \
+      && continue
+    command="${LIBTOOLIZE-libtoolize} -c -f"
+  fi
+  echo "$0: $command ..."
+  $command || exit
+done
+
+
+# Get some extra files from gnulib, overriding existing files.
+for file in $gnulib_extra_files; do
+  case $file in
+  */INSTALL) dst=INSTALL;;
+  build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
+  *) dst=$file;;
+  esac
+  symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+done
+
+if test $with_gettext = yes; then
+  # Create gettext configuration.
+  echo "$0: Creating po/Makevars from po/Makevars.template ..."
+  rm -f po/Makevars
+  sed '
+    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
+    /^XGETTEXT_OPTIONS *=/{
+      s/$/ \\/
+      a\
+          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+    }
+  ' po/Makevars.template >po/Makevars
+
+  if test -d runtime-po; then
+    # Similarly for runtime-po/Makevars, but not quite the same.
+    rm -f runtime-po/Makevars
+    sed '
+      /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+      /^subdir *=.*/s/=.*/= runtime-po/
+      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+      /^XGETTEXT_OPTIONS *=/{
+        s/$/ \\/
+        a\
+            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+      }
+    ' <po/Makevars.template >runtime-po/Makevars
+
+    # Copy identical files from po to runtime-po.
+    (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+  fi
+fi
+
+bootstrap_epilogue
+
+echo "$0: done.  Now you can run './configure'."
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:

bootstrap.conf

@@ -0,0 +1,145 @@
+# Bootstrap configuration.
+
+# Copyright (C) 2010 Red Hat, Inc.
+
+# 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 program 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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+
+# gnulib modules used by this package.
+gnulib_modules='
+areadlink
+base64
+c-ctype
+canonicalize-lgpl
+close
+connect
+dirname-lgpl
+getaddrinfo
+gethostname
+getpass
+gettext
+gitlog-to-changelog
+gnumakefile
+ignore-value
+inet_pton
+ioctl
+maintainer-makefile
+mkstemp
+mktempd
+perror
+physmem
+poll
+posix-shell
+recv
+random_r
+send
+setsockopt
+socket
+stpcpy
+strchrnul
+strndup
+strerror
+strsep
+sys_stat
+time_r
+useless-if-before-free
+vasprintf
+verify
+vc-list-files
+'
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --flag=virAsprintf:2:c-format\\\
+ --from-code=UTF-8\\\
+'
+
+# This is not a GNU package, so the default bug address is invalid,
+# and the translation project is not in use.
+MSGID_BUGS_ADDRESS=libvir-list@redhat.com
+COPYRIGHT_HOLDER='Red Hat, Inc.'
+SKIP_PO=true
+
+# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+# appears in configure.ac, exclude some unnecessary files.
+# Without grep's -E option (not portable enough, pre-configure),
+# the following test is ugly.  Also, this depends on the existence
+# of configure.ac, not the obsolescent-named configure.in.  But if
+# you're using this infrastructure, you should care about such things.
+
+gettext_external=0
+grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+  gettext_external=1
+grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+  gettext_external=1
+
+if test $gettext_external = 1; then
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  excluded_files='
+      m4/glibc2.m4
+      m4/intdiv0.m4
+      m4/lcmessage.m4
+      m4/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+  '
+fi
+
+# Tell gnulib to:
+#   require LGPLv2+
+#   put *.m4 files in new gnulib/m4/ dir
+#   put *.[ch] files in new gnulib/lib/ dir.
+#   import gnulib tests in new gnulib/tests/ dir.
+gnulib_name=libgnu
+m4_base=gnulib/m4
+source_base=gnulib/lib
+tests_base=gnulib/tests
+gnulib_mk=Makefile.am
+gnulib_tool_option_extras="\
+ --lgpl=2\
+ --with-tests\
+"
+
+# Convince bootstrap to use multiple m4 directories.
+: ${ACLOCAL=aclocal}
+ACLOCAL="$ACLOCAL -I gnulib/m4"
+export ACLOCAL
+
+# Build prerequisites
+buildreq="\
+autoconf   2.59
+automake   1.9.6
+autopoint  -
+gettext    -
+git        1.5.5
+gzip       -
+libtool    -
+perl       5.5
+rsync      -
+tar        -
+"
+
+# Automake requires that ChangeLog exist.
+touch ChangeLog || exit 1
+
+
+bootstrap_epilogue()
+{
+  # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..".
+  m=gnulib/tests/Makefile.am
+  sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t
+  mv -f $m-t $m
+}

build-aux/.gitignore

@@ -1,13 +1,15 @@
-compile
-config.guess
-config.rpath
-config.sub
-depcomp
-install-sh
-ltmain.sh
-missing
-mkinstalldirs
-mktempd
+*
+/arg-nonnull.h
+/gitlog-to-changelog
+/link-warning.h
+/mktempd
 /useless-if-before-free
 /vc-list-files
-/gitlog-to-changelog
+arg-nonnull.h
+config.rpath
+gitlog-to-changelog
+mkinstalldirs
+mktempd
+useless-if-before-free
+vc-list-files
+warn-on-use.h

build-aux/link-warning.h

@@ -1,28 +0,0 @@
-/* GL_LINK_WARNING("literal string") arranges to emit the literal string as
-   a linker warning on most glibc systems.
-   We use a linker warning rather than a preprocessor warning, because
-   #warning cannot be used inside macros.  */
-#ifndef GL_LINK_WARNING
-  /* This works on platforms with GNU ld and ELF object format.
-     Testing __GLIBC__ is sufficient for asserting that GNU ld is in use.
-     Testing __ELF__ guarantees the ELF object format.
-     Testing __GNUC__ is necessary for the compound expression syntax.  */
-# if defined __GLIBC__ && defined __ELF__ && defined __GNUC__
-#  define GL_LINK_WARNING(message) \
-     GL_LINK_WARNING1 (__FILE__, __LINE__, message)
-#  define GL_LINK_WARNING1(file, line, message) \
-     GL_LINK_WARNING2 (file, line, message)  /* macroexpand file and line */
-#  define GL_LINK_WARNING2(file, line, message) \
-     GL_LINK_WARNING3 (file ":" #line ": warning: " message)
-#  define GL_LINK_WARNING3(message) \
-     ({ static const char warning[sizeof (message)]		\
-          __attribute__ ((__unused__,				\
-                          __section__ (".gnu.warning"),		\
-                          __aligned__ (1)))			\
-          = message "\n";					\
-        (void)0;						\
-     })
-# else
-#  define GL_LINK_WARNING(message) ((void) 0)
-# endif
-#endif

build-aux/mktempd

@@ -1,134 +0,0 @@
-#!/bin/sh
-# Create a temporary directory, much like mktemp -d does.
-
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program 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 General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Jim Meyering.
-
-# Usage: mktempd /tmp phoey.XXXXXXXXXX
-
-# First, try to use the mktemp program.
-# Failing that, we'll roll our own mktemp-like function:
-#  - try to get random bytes from /dev/urandom
-#  - failing that, generate output from a combination of quickly-varying
-#      sources and gzip.  Ignore non-varying gzip header, and extract
-#      "random" bits from there.
-#  - given those bits, map to file-name bytes using tr, and try to create
-#      the desired directory.
-#  - make only $MAX_TRIES attempts
-
-ME=`basename "$0"`
-die() { echo >&2 "$ME: $@"; exit 1; }
-
-MAX_TRIES=4
-
-rand_bytes()
-{
-  n=$1
-
-  chars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
-
-  dev_rand=/dev/urandom
-  if test -r "$dev_rand"; then
-    # Note: 256-length($chars) == 194; 3 copies of $chars is 186 + 8 = 194.
-    dd ibs=$n count=1 if="$dev_rand" | tr -c $chars 01234567$chars$chars$chars
-    return
-  fi
-
-  cmds='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n'
-  data=` (eval "$cmds") 2>&1 | gzip `
-
-  n_plus_50=`expr $n + 50`
-
-  # Ensure that $data has length at least 50+$n
-  while :; do
-    len=`echo "$data"|wc -c`
-    test $n_plus_50 -le $len && break;
-    data=` (echo "$data"; eval "$cmds") 2>&1 | gzip `
-  done
-
-  echo "$data" \
-    | dd bs=1 skip=50 count=$n 2>/dev/null \
-    | tr -c $chars 01234567$chars$chars$chars
-}
-
-mktempd()
-{
-  case $# in
-  2);;
-  *) die "Usage: $ME DIR TEMPLATE";;
-  esac
-
-  destdir=$1
-  template=$2
-
-  # Disallow any trailing slash on specified destdir:
-  # it would subvert the post-mktemp "case"-based destdir test.
-  case $destdir in
-  /) ;;
-  */) die "invalid destination dir: remove trailing slash(es)";;
-  esac
-
-  case $template in
-  *XXXX) ;;
-  *) die "invalid template: $template (must have a suffix of at least 4 X's)";;
-  esac
-
-  fail=0
-
-  # First, try to use mktemp.
-  d=`env -u TMPDIR mktemp -d -t -p "$destdir" "$template" 2>/dev/null` \
-    || fail=1
-
-  # The resulting name must be in the specified directory.
-  case $d in "$destdir"*);; *) fail=1;; esac
-
-  # It must have created the directory.
-  test -d "$d" || fail=1
-
-  # It must have 0700 permissions.  Handle sticky "S" bits.
-  perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1
-  case $perms in drwx------*) ;; *) fail=1;; esac
-
-  test $fail = 0 && {
-    echo "$d"
-    return
-  }
-
-  # If we reach this point, we'll have to create a directory manually.
-
-  # Get a copy of the template without its suffix of X's.
-  base_template=`echo "$template"|sed 's/XX*$//'`
-
-  # Calculate how many X's we've just removed.
-  template_length=`echo "$template" | wc -c`
-  nx=`echo "$base_template" | wc -c`
-  nx=`expr $template_length - $nx`
-
-  err=
-  i=1
-  while :; do
-    X=`rand_bytes $nx`
-    candidate_dir="$destdir/$base_template$X"
-    err=`mkdir -m 0700 "$candidate_dir" 2>&1` \
-      && { echo "$candidate_dir"; return; }
-    test $MAX_TRIES -le $i && break;
-    i=`expr $i + 1`
-  done
-  die "$err"
-}
-
-mktempd "$@"

cfg.mk

@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2010 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@ local-checks-to-skip =			\
   sc_obsolete_symbols			\
   sc_prohibit_S_IS_definition		\
   sc_prohibit_atoi_atof			\
+  sc_prohibit_hash_without_use		\
   sc_prohibit_jm_in_m4			\
   sc_prohibit_quote_without_use		\
   sc_prohibit_quotearg_without_use	\
@@ -79,11 +80,9 @@ sc_avoid_write:
 # Use STREQ rather than comparing strcmp == 0, or != 0.
 # Similarly, use STREQLEN or STRPREFIX rather than strncmp.
 sc_prohibit_strcmp_and_strncmp:
-	@grep -nE '! *strn?cmp *\(|\<strn?cmp *\([^)]+\) *=='		\
-	    $$($(VC_LIST_EXCEPT))					\
-	  | grep -vE ':# *define STREQ(LEN)?\(' &&			\
-	  { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \
-		1>&2; exit 1; } || :
+	@re='strn?cmp *\('						\
+	msg='use STREQ() in place of the above uses of str[n]cmp'	\
+	  $(_prohibit_regexp)
 
 # Use virAsprintf rather than a'sprintf since *strp is undefined on error.
 sc_prohibit_asprintf:
@@ -91,12 +90,27 @@ sc_prohibit_asprintf:
 	msg='use virAsprintf, not a'sprintf				\
 	  $(_prohibit_regexp)
 
+sc_prohibit_strncpy:
+	@re='strncpy *\('						\
+	msg='use virStrncpy, not strncpy'				\
+	  $(_prohibit_regexp)
+
+sc_prohibit_readlink:
+	@re='readlink *\('						\
+	msg='use virFileResolveLink, not readlink'			\
+	  $(_prohibit_regexp)
+
+sc_prohibit_gethostname:
+	@re='gethostname *\('						\
+	msg='use virGetHostname, not gethostname'			\
+	  $(_prohibit_regexp)
+
 sc_prohibit_VIR_ERR_NO_MEMORY:
 	@re='\<V''IR_ERR_NO_MEMORY\>'					\
 	msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY		\
 	  $(_prohibit_regexp)
 
-include Makefile.nonreentrant
+include $(srcdir)/Makefile.nonreentrant
 sc_prohibit_nonreentrant:
 	@fail=0 ; \
 	for i in $(NON_REENTRANT) ; \
@@ -118,7 +132,7 @@ sc_prohibit_ctype_h:
 sc_TAB_in_indentation:
 	@grep -lE '^ *	' /dev/null					\
 	     $$($(VC_LIST_EXCEPT)					\
-		| grep -E '\.[ch](\.in)?$$'				\
+		| grep -E '\.(rng|[ch](\.in)?)$$'			\
 		| grep -v '^gnulib/') &&				\
 	  { echo '$(ME): found TAB(s) used for indentation in C sources;'\
 	      'use spaces' 1>&2; exit 1; } || :
@@ -248,7 +262,9 @@ ifeq (0,$(MAKELEVEL))
   # submodule name.  Contrast these:
   # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
-  _submodule_hash = sed 's/.//;s/ .*//'
+  # $ cat .git-module-status
+  # b653eda3ac4864de205419d9f41eec267cb89eeb
+  _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell						\
       actual=$$(git submodule status | $(_submodule_hash));		\
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";	\
@@ -257,3 +273,6 @@ ifeq (0,$(MAKELEVEL))
     $(error gnulib update required; run ./autogen.sh first)
   endif
 endif
+
+# Exempt @...@ uses of these symbols.
+_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/'

daemon/Makefile.am

@@ -2,23 +2,22 @@
 
 DAEMON_SOURCES =					\
 		event.c event.h				\
-		qemud.c qemud.h				\
+		libvirtd.c libvirtd.h			\
 		remote.c remote.h			\
 		dispatch.c dispatch.h			\
+		stream.c stream.h			\
 		remote_dispatch_prototypes.h		\
 		remote_dispatch_table.h			\
 		remote_dispatch_args.h			\
 		remote_dispatch_ret.h			\
-		remote_protocol.h remote_protocol.c
+		../src/remote/remote_protocol.c
 
 AVAHI_SOURCES =						\
 		mdns.c mdns.h
 
 DISTCLEANFILES =
 EXTRA_DIST =						\
-	default-network.xml				\
-	remote_generate_stubs.pl rpcgen_fix.pl		\
-	remote_protocol.x				\
+	remote_generate_stubs.pl			\
 	libvirtd.conf					\
 	libvirtd.init.in				\
 	libvirtd.policy-0				\
@@ -26,61 +25,25 @@ EXTRA_DIST =						\
 	libvirtd.sasl					\
 	libvirtd.sysconf				\
 	libvirtd.aug                                    \
-	libvirtd_qemu.aug                               \
 	libvirtd.logrotate.in                           \
 	test_libvirtd.aug                               \
-	test_libvirtd_qemu.aug                          \
 	$(AVAHI_SOURCES)				\
 	$(DAEMON_SOURCES)
 
 BUILT_SOURCES =
 
-if HAVE_RPCGEN
-#
-# Maintainer-only target for re-generating the derived .c/.h source
-# files, which are actually derived from the .x file.
-#
-# For committing protocol changes to CVS, the GLIBC rpcgen *must*
-# be used.
-#
-# Support for non-GLIB rpcgen is here as a convenience for
-# non-Linux people needing to test changes during dev.
-#
-rpcgen:
-	rm -f rp.c-t rp.h-t rp.c-t1 rp.c-t2 rp.h-t1
-	$(RPCGEN) -h -o rp.h-t $(srcdir)/remote_protocol.x
-	$(RPCGEN) -c -o rp.c-t $(srcdir)/remote_protocol.x
-if HAVE_GLIBC_RPCGEN
-	perl -w $(srcdir)/rpcgen_fix.pl rp.h-t > rp.h-t1
-	perl -w $(srcdir)/rpcgen_fix.pl rp.c-t > rp.c-t1
-	(echo '#include <config.h>'; cat rp.c-t1) > rp.c-t2
-	chmod 0444 rp.c-t2 rp.h-t1
-	mv -f rp.h-t1 $(srcdir)/remote_protocol.h
-	mv -f rp.c-t2 $(srcdir)/remote_protocol.c
-	rm -f rp.c-t rp.h-t rp.c-t1
-else
-	chmod 0444 rp.c-t rp.h-t
-	mv -f rp.h-t $(srcdir)/remote_protocol.h
-	mv -f rp.c-t $(srcdir)/remote_protocol.c
-endif
-endif
-
-remote_protocol.c: remote_protocol.h
-
 if WITH_LIBVIRTD
 
-UUID=$(shell uuidgen 2>/dev/null)
-
 sbin_PROGRAMS = libvirtd
 
 confdir = $(sysconfdir)/libvirt/
 conf_DATA = libvirtd.conf
 
 augeasdir = $(datadir)/augeas/lenses
-augeas_DATA = libvirtd.aug libvirtd_qemu.aug
+augeas_DATA = libvirtd.aug
 
 augeastestsdir = $(datadir)/augeas/lenses/tests
-augeastests_DATA = test_libvirtd.aug test_libvirtd_qemu.aug
+augeastests_DATA = test_libvirtd.aug
 
 libvirtd_SOURCES = $(DAEMON_SOURCES)
 
@@ -89,6 +52,9 @@ libvirtd_CFLAGS = \
 	-I$(top_srcdir)/gnulib/lib -I../gnulib/lib \
 	-I$(top_srcdir)/include -I$(top_builddir)/include \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/util \
+	-I$(top_srcdir)/src/conf \
+	-I$(top_srcdir)/src/remote \
 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
 	$(POLKIT_CFLAGS) \
 	$(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \
@@ -108,9 +74,10 @@ libvirtd_LDADD =					\
 	$(SASL_LIBS)					\
 	$(POLKIT_LIBS)
 
+libvirtd_LDADD += ../src/libvirt_util.la
+
 if WITH_DRIVER_MODULES
   libvirtd_LDADD += ../src/libvirt_driver.la
-  libvirtd_LDADD += ../src/libvirt_util.la
 else
 if WITH_QEMU
     libvirtd_LDADD += ../src/libvirt_driver_qemu.la
@@ -143,6 +110,10 @@ endif
 if WITH_NODE_DEVICES
     libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
 endif
+
+if WITH_SECRETS
+    libvirtd_LDADD += ../src/libvirt_driver_secret.la
+endif
 endif
 
 libvirtd_LDADD += ../src/libvirt.la
@@ -164,43 +135,17 @@ libvirtd_LDADD += $(AVAHI_LIBS)
 endif
 
 
-default_xml_dest = libvirt/qemu/networks/default.xml
 install-data-local: install-init install-data-sasl install-data-polkit \
                     install-logrotate
-	mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart
-	$(INSTALL_DATA) $(srcdir)/default-network.xml \
-	  $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
-	test -z "$(UUID)" || \
-	  sed -i -e "s,</name>,</name>\n  <uuid>$(UUID)</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)/log/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
 	mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
 
-uninstall-local:: uninstall-init uninstall-data-sasl install-data-polkit
-	rm -f $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart/default.xml
-	rm -f $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
-	rmdir $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart || :
-	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
+uninstall-local:: uninstall-init uninstall-data-sasl uninstall-data-polkit
+	rmdir $(DESTDIR)$(localstatedir)/log/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/run/libvirt || :
 	rmdir $(DESTDIR)$(localstatedir)/lib/libvirt || :
 
-if HAVE_SASL
-install-data-sasl:: install-init
-	mkdir -p $(DESTDIR)$(sysconfdir)/sasl2/
-	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-
-uninstall-data-sasl:: install-init
-	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-	rmdir $(DESTDIR)$(sysconfdir)/sasl2/
-else
-install-data-sasl:
-uninstall-data-sasl:
-endif
-
 if HAVE_POLKIT
 install-data-polkit:: install-init
 	mkdir -p $(DESTDIR)$(policydir)
@@ -218,17 +163,19 @@ remote.c: remote_dispatch_prototypes.h \
 	  remote_dispatch_args.h \
 	  remote_dispatch_ret.h
 
-remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
-	perl -w $(srcdir)/remote_generate_stubs.pl -p $(srcdir)/remote_protocol.x > $@
+REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
 
-remote_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
-	perl -w $(srcdir)/remote_generate_stubs.pl -t $(srcdir)/remote_protocol.x > $@
+remote_dispatch_prototypes.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
+	perl -w $(srcdir)/remote_generate_stubs.pl -p $(REMOTE_PROTOCOL) > $@
 
-remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
-	perl -w $(srcdir)/remote_generate_stubs.pl -a $(srcdir)/remote_protocol.x > $@
+remote_dispatch_table.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
+	perl -w $(srcdir)/remote_generate_stubs.pl -t $(REMOTE_PROTOCOL) > $@
 
-remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
-	perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@
+remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
+	perl -w $(srcdir)/remote_generate_stubs.pl -a $(REMOTE_PROTOCOL) > $@
+
+remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl $(REMOTE_PROTOCOL)
+	perl -w $(srcdir)/remote_generate_stubs.pl -r $(REMOTE_PROTOCOL) > $@
 
 BUILT_SOURCES += libvirtd.logrotate
 
@@ -240,10 +187,12 @@ libvirtd.logrotate: libvirtd.logrotate.in
 
 install-logrotate: libvirtd.logrotate
 	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/qemu/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/lxc/
+	mkdir -p $(DESTDIR)$(localstatedir)/log/libvirt/uml/
 	mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/
 	$(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd
 
-if LIBVIRT_INIT_SCRIPTS_RED_HAT
+if LIBVIRT_INIT_SCRIPT_RED_HAT
 install-init: libvirtd.init
 	mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d
 	$(INSTALL_SCRIPT) libvirtd.init \
@@ -270,8 +219,6 @@ libvirtd.init: libvirtd.init.in
 check-local:
 	test -x '$(AUGPARSE)' \
 	  && '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug || :
-	test -x '$(AUGPARSE)' \
-	  && '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd_qemu.aug || :
 
 else
 
@@ -279,13 +226,32 @@ install-init:
 uninstall-init:
 libvirtd.init:
 
-endif # DBUS_INIT_SCRIPTS_RED_HAT
+endif # LIBVIRT_INIT_SCRIPT_RED_HAT
 
 # This must be added last, since functions it provides/replaces
 # are used by nearly every other library.
 libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
 
+else # WITH_LIBVIRTD
+install-data-local: install-data-sasl
+uninstall-local:: uninstall-data-sasl
 endif # WITH_LIBVIRTD
 
+# This is needed for clients too, so can't wrap in
+# the WITH_LIBVIRTD conditional
+if HAVE_SASL
+install-data-sasl:
+	mkdir -p $(DESTDIR)$(sysconfdir)/sasl2/
+	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+
+uninstall-data-sasl:
+	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+	rmdir $(DESTDIR)$(sysconfdir)/sasl2/
+else
+install-data-sasl:
+uninstall-data-sasl:
+endif
+
+
 CLEANFILES = $(BUILT_SOURCES)
 CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda

daemon/THREADING.txt

@@ -0,0 +1,52 @@
+
+     Threading in the libvirtd daemon
+     ================================
+
+To allow efficient processing of RPC requests, the libvirtd daemon
+makes use of threads.
+
+ - The process leader. This is the initial thread of control
+   when the daemon starts running. It is responsible for
+   initializing all the state, and starting the event loop.
+   Once that's all done, this thread does nothing except
+   wait for the event loop to quit, thus indicating an orderly
+   shutdown is required.
+
+ - The event loop. This thread runs the event loop, sitting
+   in poll() on all monitored file handles, and calculating
+   and dispatching any timers that may be registered. When
+   this thread quits, the entire daemon will shutdown.
+
+ - The workers. These 'n' threads all sit around waiting to
+   process incoming RPC requests. Since RPC requests may take
+   a long time to complete, with long idle periods, there will
+   be quite a few workers running.
+
+The use of threads obviously requires locking to ensure safety when
+accessing/changing data structures.
+
+ - the top level lock is on 'struct qemud_server'. This must be
+   held before acquiring any other lock
+
+ - Each 'struct qemud_client' object has a lock. The server lock
+   must be held before acquiring it. Once the client lock is acquired
+   the server lock can (optionally) be dropped.
+
+ - The event loop has its own self-contained lock. You can ignore
+   this as a caller of virEvent APIs.
+
+
+The server lock is used in conjunction with a condition variable
+to pass jobs from the event loop thread to the workers. The main
+event loop thread handles I/O from the client socket, and once a
+complete RPC message has been read off the wire (and optionally
+decrypted), it will be placed onto the 'dx' job queue for the
+associated client object. The job condition will be signalled and
+a worker will wakup and process it.
+
+The worker thread must quickly drop its locks on the server and
+client to allow the main event loop thread to continue running
+with its other work. Critically important, is that now libvirt
+API call will ever be made with the server or client locks held.
+
+-- End

daemon/dispatch.c

@@ -104,7 +104,7 @@ void remoteDispatchOOMError (remote_error *rerr)
 {
     remoteDispatchStringError(rerr,
                               VIR_ERR_NO_MEMORY,
-                              NULL);
+                              "out of memory");
 }
 
 
@@ -136,6 +136,10 @@ remoteSerializeError(struct qemud_client *client,
     unsigned int len;
     struct qemud_client_message *msg = NULL;
 
+    DEBUG("prog=%d ver=%d proc=%d type=%d serial=%d, msg=%s",
+          program, version, procedure, type, serial,
+          rerr->message ? *rerr->message : "(none)");
+
     if (VIR_ALLOC(msg) < 0)
         goto fatal_error;
 
@@ -191,6 +195,7 @@ remoteSerializeError(struct qemud_client *client,
 
 xdr_error:
     xdr_destroy(&xdr);
+    VIR_FREE(msg);
 fatal_error:
     xdr_free((xdrproc_t)xdr_remote_error,  (char *)rerr);
     return -1;
@@ -206,19 +211,38 @@ fatal_error:
  *
  * Returns 0 if the error was sent, -1 upon fatal error
  */
-static int
+int
 remoteSerializeReplyError(struct qemud_client *client,
                           remote_error *rerr,
                           remote_message_header *req) {
+    /*
+     * For data streams, errors are sent back as data streams
+     * For method calls, errors are sent back as method replies
+     */
     return remoteSerializeError(client,
                                 rerr,
                                 req->prog,
                                 req->vers,
                                 req->proc,
-                                REMOTE_REPLY,
+                                req->type == REMOTE_STREAM ? REMOTE_STREAM : REMOTE_REPLY,
                                 req->serial);
 }
 
+int
+remoteSerializeStreamError(struct qemud_client *client,
+                           remote_error *rerr,
+                           int proc,
+                           int serial)
+{
+    return remoteSerializeError(client,
+                                rerr,
+                                REMOTE_PROGRAM,
+                                REMOTE_PROTOCOL_VERSION,
+                                proc,
+                                REMOTE_STREAM,
+                                serial);
+}
+
 /*
  * @msg: the complete incoming message, whose header to decode
  *
@@ -336,8 +360,13 @@ remoteDispatchClientRequest (struct qemud_server *server,
                              struct qemud_client *client,
                              struct qemud_client_message *msg)
 {
+    int ret;
     remote_error rerr;
 
+    DEBUG("prog=%d ver=%d type=%d satus=%d serial=%d proc=%d",
+          msg->hdr.prog, msg->hdr.vers, msg->hdr.type,
+          msg->hdr.status, msg->hdr.serial, msg->hdr.proc);
+
     memset(&rerr, 0, sizeof rerr);
 
     /* Check version, etc. */
@@ -358,13 +387,31 @@ remoteDispatchClientRequest (struct qemud_server *server,
     case REMOTE_CALL:
         return remoteDispatchClientCall(server, client, msg);
 
+    case REMOTE_STREAM:
+        /* Since stream data is non-acked, async, we may continue to received
+         * stream packets after we closed down a stream. Just drop & ignore
+         * these.
+         */
+        VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d",
+                 msg->hdr.serial, msg->hdr.proc, msg->hdr.status);
+        qemudClientMessageRelease(client, msg);
+        break;
+
     default:
         remoteDispatchFormatError (&rerr, _("type (%d) != REMOTE_CALL"),
                                    (int) msg->hdr.type);
+        goto error;
     }
 
+    return 0;
+
 error:
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    ret = remoteSerializeReplyError(client, &rerr, &msg->hdr);
+
+    if (ret >= 0)
+        VIR_FREE(msg);
+
+    return ret;
 }
 
 
@@ -456,7 +503,7 @@ remoteDispatchClientCall (struct qemud_server *server,
      *
      *   'conn', 'rerr', 'args and 'ret'
      */
-    rv = (data->fn)(server, client, conn, &rerr, &args, &ret);
+    rv = (data->fn)(server, client, conn, &msg->hdr, &rerr, &args, &ret);
 
     virMutexLock(&server->lock);
     virMutexLock(&client->lock);
@@ -521,8 +568,12 @@ remoteDispatchClientCall (struct qemud_server *server,
 rpc_error:
     /* Semi-bad stuff happened, we can still try to send back
      * an RPC error message to client */
-    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    rv = remoteSerializeReplyError(client, &rerr, &msg->hdr);
 
+    if (rv >= 0)
+        VIR_FREE(msg);
+
+    return rv;
 
 xdr_error:
     /* Seriously bad stuff happened, so we'll kill off this client
@@ -532,3 +583,86 @@ xdr_error:
 fatal_error:
     return -1;
 }
+
+
+int
+remoteSendStreamData(struct qemud_client *client,
+                     struct qemud_client_stream *stream,
+                     const char *data,
+                     unsigned int len)
+{
+    struct qemud_client_message *msg;
+    XDR xdr;
+
+    DEBUG("client=%p stream=%p data=%p len=%d", client, stream, data, len);
+
+    if (VIR_ALLOC(msg) < 0) {
+        return -1;
+    }
+
+    /* Return header. We're re-using same message object, so
+     * only need to tweak type/status fields */
+    msg->hdr.prog = REMOTE_PROGRAM;
+    msg->hdr.vers = REMOTE_PROTOCOL_VERSION;
+    msg->hdr.proc = stream->procedure;
+    msg->hdr.type = REMOTE_STREAM;
+    msg->hdr.serial = stream->serial;
+    /*
+     * NB
+     *   data != NULL + len > 0    => REMOTE_CONTINUE   (Sending back data)
+     *   data != NULL + len == 0   => REMOTE_CONTINUE   (Sending read EOF)
+     *   data == NULL              => REMOTE_OK         (Sending finish handshake confirmation)
+     */
+    msg->hdr.status = data ? REMOTE_CONTINUE : REMOTE_OK;
+
+    if (remoteEncodeClientMessageHeader(msg) < 0)
+        goto fatal_error;
+
+    if (data && len) {
+        if ((msg->bufferLength - msg->bufferOffset) < len)
+            goto fatal_error;
+
+        /* Now for the payload */
+        xdrmem_create (&xdr,
+                       msg->buffer,
+                       msg->bufferLength,
+                       XDR_ENCODE);
+
+        /* Skip over existing header already written */
+        if (xdr_setpos(&xdr, msg->bufferOffset) == 0)
+            goto xdr_error;
+
+        memcpy(msg->buffer + msg->bufferOffset, data, len);
+        msg->bufferOffset += len;
+
+        /* Update the length word. */
+        len = msg->bufferOffset;
+        if (xdr_setpos (&xdr, 0) == 0)
+            goto xdr_error;
+
+        if (!xdr_u_int (&xdr, &len))
+            goto xdr_error;
+
+        xdr_destroy (&xdr);
+
+        DEBUG("Total %d", msg->bufferOffset);
+    }
+    if (data)
+        msg->streamTX = 1;
+
+    /* Reset ready for I/O */
+    msg->bufferLength = msg->bufferOffset;
+    msg->bufferOffset = 0;
+
+    /* Put reply on end of tx queue to send out  */
+    qemudClientMessageQueuePush(&client->tx, msg);
+    qemudUpdateClientEvent(client);
+
+    return 0;
+
+xdr_error:
+    xdr_destroy (&xdr);
+fatal_error:
+    VIR_FREE(msg);
+    return -1;
+}

daemon/dispatch.h

@@ -25,7 +25,7 @@
 #define __LIBVIRTD_DISPATCH_H__
 
 
-#include "qemud.h"
+#include "libvirtd.h"
 
 
 int
@@ -49,6 +49,17 @@ void remoteDispatchOOMError (remote_error *rerr);
 void remoteDispatchConnError (remote_error *rerr,
                               virConnectPtr conn);
 
+
+int
+remoteSerializeReplyError(struct qemud_client *client,
+                          remote_error *rerr,
+                          remote_message_header *req);
+int
+remoteSerializeStreamError(struct qemud_client *client,
+                           remote_error *rerr,
+                           int proc,
+                           int serial);
+
 /* Having this here is dubious. It should be in remote.h
  * but qemud.c shouldn't depend on that header directly.
  * Refactor this later to deal with this properly.
@@ -60,4 +71,10 @@ int remoteRelayDomainEvent (virConnectPtr conn ATTRIBUTE_UNUSED,
                             void *opaque);
 
 
+int
+remoteSendStreamData(struct qemud_client *client,
+                     struct qemud_client_stream *stream,
+                     const char *data,
+                     unsigned int len);
+
 #endif /* __LIBVIRTD_DISPATCH_H__ */

daemon/event.c

@@ -413,7 +413,12 @@ static int virEventDispatchTimeouts(void) {
         if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
             continue;
 
-        if (eventLoop.timeouts[i].expiresAt <= now) {
+        /* Add 20ms fuzz so we don't pointlessly spin doing
+         * <10ms sleeps, particularly on kernels with low HZ
+         * it is fine that a timer expires 20ms earlier than
+         * requested
+         */
+        if (eventLoop.timeouts[i].expiresAt <= (now+20)) {
             virEventTimeoutCallback cb = eventLoop.timeouts[i].cb;
             int timer = eventLoop.timeouts[i].timer;
             void *opaque = eventLoop.timeouts[i].opaque;

daemon/libvirtd.h

@@ -1,5 +1,5 @@
 /*
- * qemud.h: daemon data structure definitions
+ * libvirtd.h: daemon data structure definitions
  *
  * Copyright (C) 2006-2009 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
@@ -129,26 +129,44 @@ struct qemud_client_message {
     unsigned int bufferLength;
     unsigned int bufferOffset;
 
-    int async : 1;
+    unsigned int async : 1;
+    unsigned int streamTX : 1;
 
     remote_message_header hdr;
 
     struct qemud_client_message *next;
 };
 
+struct qemud_client;
+
 /* Allow for filtering of incoming messages to a custom
  * dispatch processing queue, instead of client->dx.
  */
-typedef int (*qemud_client_filter_func)(struct qemud_client_message *msg, void *opaque);
+typedef int (*qemud_client_filter_func)(struct qemud_client *client,
+                                        struct qemud_client_message *msg, void *opaque);
 struct qemud_client_filter {
     qemud_client_filter_func query;
     void *opaque;
 
-    struct qemud_client_message *dx;
-
     struct qemud_client_filter *next;
 };
 
+struct qemud_client_stream {
+    virStreamPtr st;
+    int procedure;
+    int serial;
+
+    unsigned int recvEOF : 1;
+    unsigned int closed : 1;
+
+    struct qemud_client_filter filter;
+
+    struct qemud_client_message *rx;
+    int tx;
+
+    struct qemud_client_stream *next;
+};
+
 /* Stores the per-client connection state */
 struct qemud_client {
     virMutex lock;
@@ -157,8 +175,9 @@ struct qemud_client {
 
     int fd;
     int watch;
-    int readonly:1;
-    int closing:1;
+    unsigned int readonly :1;
+    unsigned int closing :1;
+    unsigned int domain_events_registered :1;
 
     struct sockaddr_storage addr;
     socklen_t addrlen;
@@ -166,7 +185,7 @@ struct qemud_client {
     int type; /* qemud_sock_type */
     gnutls_session_t tlssession;
     int auth;
-    int handshake : 1; /* If we're in progress for TLS handshake */
+    unsigned int handshake :1; /* If we're in progress for TLS handshake */
 #if HAVE_SASL
     sasl_conn_t *saslconn;
     int saslSSF;
@@ -197,6 +216,10 @@ struct qemud_client {
      * end up on the 'dx' queue */
     struct qemud_client_filter *filters;
 
+    /* Data streams */
+    struct qemud_client_stream *streams;
+
+
     /* This is only valid if a remote open call has been made on this
      * connection, otherwise it will be NULL.  Also if remote close is
      * called, it will be set back to NULL if that succeeds.
@@ -221,9 +244,9 @@ struct qemud_socket {
 
 struct qemud_worker {
     pthread_t thread;
-    int hasThread :1;
-    int processingCall :1;
-    int quitRequest : 1;
+    unsigned int hasThread :1;
+    unsigned int processingCall :1;
+    unsigned int quitRequest :1;
 
     /* back-pointer to our server */
     struct qemud_server *server;
@@ -245,8 +268,11 @@ struct qemud_server {
     struct qemud_client **clients;
 
     int sigread;
+    int sigwrite;
     char *logDir;
-    unsigned int shutdown : 1;
+    pthread_t eventThread;
+    unsigned int hasEventThread :1;
+    unsigned int quitEventThread :1;
 #ifdef HAVE_AVAHI
     struct libvirtd_mdns *mdns;
 #endif
@@ -275,6 +301,9 @@ qemudClientMessageQueuePush(struct qemud_client_message **queue,
 struct qemud_client_message *
 qemudClientMessageQueueServe(struct qemud_client_message **queue);
 
+void
+qemudClientMessageRelease(struct qemud_client *client,
+                          struct qemud_client_message *msg);
 
 
 #if HAVE_POLKIT

daemon/libvirtd.init.in

@@ -32,14 +32,12 @@
 # pidfile: @localstatedir@/run/libvirtd.pid
 #
 
-# Sanity checks.
-[ -x @sbindir@/libvirtd ] || exit 0
-
 # Source function library.
 . @sysconfdir@/rc.d/init.d/functions
 
 SERVICE=libvirtd
 PROCESS=libvirtd
+PIDFILE=@localstatedir@/run/$SERVICE.pid
 
 LIBVIRTD_CONFIG=
 LIBVIRTD_ARGS=
@@ -59,7 +57,7 @@ start() {
     echo -n $"Starting $SERVICE daemon: "
     mkdir -p @localstatedir@/cache/libvirt
     rm -rf @localstatedir@/cache/libvirt/*
-    KRB5_KTNAME=$KRB5_KTNAME daemon --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
+    KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
@@ -68,12 +66,12 @@ start() {
 stop() {
     echo -n $"Stopping $SERVICE daemon: "
 
-    killproc $PROCESS
+    killproc -p $PIDFILE $PROCESS
     RETVAL=$?
     echo
     if [ $RETVAL -eq 0 ]; then
         rm -f @localstatedir@/lock/subsys/$SERVICE
-        rm -f @localstatedir@/run/$SERVICE.pid
+        rm -f $PIDFILE
 	rm -rf @localstatedir@/cache/libvirt/*
     fi
 }
@@ -86,7 +84,7 @@ restart() {
 reload() {
     echo -n $"Reloading $SERVICE configuration: "
 
-    killproc $PROCESS -HUP
+    killproc -p $PIDFILE $PROCESS -HUP
     RETVAL=$?
     echo
     return $RETVAL
@@ -98,7 +96,7 @@ case "$1" in
         $1
         ;;
     status)
-        status $PROCESS
+        status -p $PIDFILE $PROCESS
         RETVAL=$?
         ;;
     force-reload)

daemon/libvirtd.logrotate.in

@@ -0,0 +1,9 @@
+@localstatedir@/log/libvirt/qemu/*.log @localstatedir@/log/libvirt/uml/*.log @localstatedir@/log/libvirt/lxc/*.log {
+        weekly
+        missingok
+        rotate 4
+        compress
+        delaycompress
+        copytruncate
+        minsize 100k
+}

daemon/libvirtd.sysconf

@@ -7,3 +7,11 @@
 
 # Override Kerberos service keytab for SASL/GSSAPI
 #KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse

daemon/mdns.c

@@ -37,11 +37,9 @@
 #include <avahi-common/error.h>
 #include <avahi-common/timeval.h>
 
-#include "internal.h"
-#include "qemud.h"
+#include "libvirtd.h"
 #include "mdns.h"
 #include "event.h"
-#include "remote_internal.h"
 #include "memory.h"
 
 #define AVAHI_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__)

daemon/remote.h

@@ -25,7 +25,7 @@
 #define __LIBVIRTD_REMOTE_H__
 
 
-#include "qemud.h"
+#include "libvirtd.h"
 
 typedef union {
 #include "remote_dispatch_args.h"
@@ -54,6 +54,7 @@ typedef union {
 typedef int (*dispatch_fn) (struct qemud_server *server,
                             struct qemud_client *client,
                             virConnectPtr conn,
+                            remote_message_header *hdr,
                             remote_error *err,
                             dispatch_args *args,
                             dispatch_ret *ret);

daemon/remote_dispatch_args.h

@@ -125,3 +125,18 @@
     remote_secret_get_value_args val_remote_secret_get_value_args;
     remote_secret_undefine_args val_remote_secret_undefine_args;
     remote_secret_lookup_by_usage_args val_remote_secret_lookup_by_usage_args;
+    remote_domain_migrate_prepare_tunnel_args val_remote_domain_migrate_prepare_tunnel_args;
+    remote_domain_is_active_args val_remote_domain_is_active_args;
+    remote_domain_is_persistent_args val_remote_domain_is_persistent_args;
+    remote_network_is_active_args val_remote_network_is_active_args;
+    remote_network_is_persistent_args val_remote_network_is_persistent_args;
+    remote_storage_pool_is_active_args val_remote_storage_pool_is_active_args;
+    remote_storage_pool_is_persistent_args val_remote_storage_pool_is_persistent_args;
+    remote_interface_is_active_args val_remote_interface_is_active_args;
+    remote_cpu_compare_args val_remote_cpu_compare_args;
+    remote_domain_memory_stats_args val_remote_domain_memory_stats_args;
+    remote_domain_attach_device_flags_args val_remote_domain_attach_device_flags_args;
+    remote_domain_detach_device_flags_args val_remote_domain_detach_device_flags_args;
+    remote_cpu_baseline_args val_remote_cpu_baseline_args;
+    remote_domain_get_job_info_args val_remote_domain_get_job_info_args;
+    remote_domain_abort_job_args val_remote_domain_abort_job_args;

daemon/remote_dispatch_ret.h

@@ -106,3 +106,16 @@
     remote_secret_get_xml_desc_ret val_remote_secret_get_xml_desc_ret;
     remote_secret_get_value_ret val_remote_secret_get_value_ret;
     remote_secret_lookup_by_usage_ret val_remote_secret_lookup_by_usage_ret;
+    remote_is_secure_ret val_remote_is_secure_ret;
+    remote_domain_is_active_ret val_remote_domain_is_active_ret;
+    remote_domain_is_persistent_ret val_remote_domain_is_persistent_ret;
+    remote_network_is_active_ret val_remote_network_is_active_ret;
+    remote_network_is_persistent_ret val_remote_network_is_persistent_ret;
+    remote_storage_pool_is_active_ret val_remote_storage_pool_is_active_ret;
+    remote_storage_pool_is_persistent_ret val_remote_storage_pool_is_persistent_ret;
+    remote_interface_is_active_ret val_remote_interface_is_active_ret;
+    remote_get_lib_version_ret val_remote_get_lib_version_ret;
+    remote_cpu_compare_ret val_remote_cpu_compare_ret;
+    remote_domain_memory_stats_ret val_remote_domain_memory_stats_ret;
+    remote_cpu_baseline_ret val_remote_cpu_baseline_ret;
+    remote_domain_get_job_info_ret val_remote_domain_get_job_info_ret;

daemon/remote_dispatch_table.h

@@ -742,3 +742,88 @@
     .args_filter = (xdrproc_t) xdr_remote_secret_lookup_by_usage_args,
     .ret_filter = (xdrproc_t) xdr_remote_secret_lookup_by_usage_ret,
 },
+{   /* DomainMigratePrepareTunnel => 148 */
+    .fn = (dispatch_fn) remoteDispatchDomainMigratePrepareTunnel,
+    .args_filter = (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},
+{   /* IsSecure => 149 */
+    .fn = (dispatch_fn) remoteDispatchIsSecure,
+    .args_filter = (xdrproc_t) xdr_void,
+    .ret_filter = (xdrproc_t) xdr_remote_is_secure_ret,
+},
+{   /* DomainIsActive => 150 */
+    .fn = (dispatch_fn) remoteDispatchDomainIsActive,
+    .args_filter = (xdrproc_t) xdr_remote_domain_is_active_args,
+    .ret_filter = (xdrproc_t) xdr_remote_domain_is_active_ret,
+},
+{   /* DomainIsPersistent => 151 */
+    .fn = (dispatch_fn) remoteDispatchDomainIsPersistent,
+    .args_filter = (xdrproc_t) xdr_remote_domain_is_persistent_args,
+    .ret_filter = (xdrproc_t) xdr_remote_domain_is_persistent_ret,
+},
+{   /* NetworkIsActive => 152 */
+    .fn = (dispatch_fn) remoteDispatchNetworkIsActive,
+    .args_filter = (xdrproc_t) xdr_remote_network_is_active_args,
+    .ret_filter = (xdrproc_t) xdr_remote_network_is_active_ret,
+},
+{   /* NetworkIsPersistent => 153 */
+    .fn = (dispatch_fn) remoteDispatchNetworkIsPersistent,
+    .args_filter = (xdrproc_t) xdr_remote_network_is_persistent_args,
+    .ret_filter = (xdrproc_t) xdr_remote_network_is_persistent_ret,
+},
+{   /* StoragePoolIsActive => 154 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolIsActive,
+    .args_filter = (xdrproc_t) xdr_remote_storage_pool_is_active_args,
+    .ret_filter = (xdrproc_t) xdr_remote_storage_pool_is_active_ret,
+},
+{   /* StoragePoolIsPersistent => 155 */
+    .fn = (dispatch_fn) remoteDispatchStoragePoolIsPersistent,
+    .args_filter = (xdrproc_t) xdr_remote_storage_pool_is_persistent_args,
+    .ret_filter = (xdrproc_t) xdr_remote_storage_pool_is_persistent_ret,
+},
+{   /* InterfaceIsActive => 156 */
+    .fn = (dispatch_fn) remoteDispatchInterfaceIsActive,
+    .args_filter = (xdrproc_t) xdr_remote_interface_is_active_args,
+    .ret_filter = (xdrproc_t) xdr_remote_interface_is_active_ret,
+},
+{   /* GetLibVersion => 157 */
+    .fn = (dispatch_fn) remoteDispatchGetLibVersion,
+    .args_filter = (xdrproc_t) xdr_void,
+    .ret_filter = (xdrproc_t) xdr_remote_get_lib_version_ret,
+},
+{   /* CpuCompare => 158 */
+    .fn = (dispatch_fn) remoteDispatchCpuCompare,
+    .args_filter = (xdrproc_t) xdr_remote_cpu_compare_args,
+    .ret_filter = (xdrproc_t) xdr_remote_cpu_compare_ret,
+},
+{   /* DomainMemoryStats => 159 */
+    .fn = (dispatch_fn) remoteDispatchDomainMemoryStats,
+    .args_filter = (xdrproc_t) xdr_remote_domain_memory_stats_args,
+    .ret_filter = (xdrproc_t) xdr_remote_domain_memory_stats_ret,
+},
+{   /* DomainAttachDeviceFlags => 160 */
+    .fn = (dispatch_fn) remoteDispatchDomainAttachDeviceFlags,
+    .args_filter = (xdrproc_t) xdr_remote_domain_attach_device_flags_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},
+{   /* DomainDetachDeviceFlags => 161 */
+    .fn = (dispatch_fn) remoteDispatchDomainDetachDeviceFlags,
+    .args_filter = (xdrproc_t) xdr_remote_domain_detach_device_flags_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},
+{   /* CpuBaseline => 162 */
+    .fn = (dispatch_fn) remoteDispatchCpuBaseline,
+    .args_filter = (xdrproc_t) xdr_remote_cpu_baseline_args,
+    .ret_filter = (xdrproc_t) xdr_remote_cpu_baseline_ret,
+},
+{   /* DomainGetJobInfo => 163 */
+    .fn = (dispatch_fn) remoteDispatchDomainGetJobInfo,
+    .args_filter = (xdrproc_t) xdr_remote_domain_get_job_info_args,
+    .ret_filter = (xdrproc_t) xdr_remote_domain_get_job_info_ret,
+},
+{   /* DomainAbortJob => 164 */
+    .fn = (dispatch_fn) remoteDispatchDomainAbortJob,
+    .args_filter = (xdrproc_t) xdr_remote_domain_abort_job_args,
+    .ret_filter = (xdrproc_t) xdr_void,
+},

daemon/remote_generate_stubs.pl

@@ -115,6 +115,7 @@ elsif ($opt_p) {
 	print "    struct qemud_server *server,\n";
 	print "    struct qemud_client *client,\n";
 	print "    virConnectPtr conn,\n";
+	print "    remote_message_header *hdr,\n";
 	print "    remote_error *err,\n";
 	print "    $calls{$_}->{args} *args,\n";
 	print "    $calls{$_}->{ret} *ret);\n";

daemon/stream.c

@@ -0,0 +1,607 @@
+/*
+ * stream.c: APIs for managing client streams
+ *
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange@redhat.com>
+ */
+
+
+#include <config.h>
+
+#include "stream.h"
+#include "memory.h"
+#include "dispatch.h"
+#include "logging.h"
+
+static int
+remoteStreamHandleWrite(struct qemud_client *client,
+                        struct qemud_client_stream *stream);
+static int
+remoteStreamHandleRead(struct qemud_client *client,
+                       struct qemud_client_stream *stream);
+static int
+remoteStreamHandleFinish(struct qemud_client *client,
+                         struct qemud_client_stream *stream,
+                         struct qemud_client_message *msg);
+static int
+remoteStreamHandleAbort(struct qemud_client *client,
+                        struct qemud_client_stream *stream,
+                        struct qemud_client_message *msg);
+
+
+
+static void
+remoteStreamUpdateEvents(struct qemud_client_stream *stream)
+{
+    int newEvents = 0;
+    if (stream->rx)
+        newEvents |= VIR_STREAM_EVENT_WRITABLE;
+    if (stream->tx && !stream->recvEOF)
+        newEvents |= VIR_STREAM_EVENT_READABLE;
+
+    virStreamEventUpdateCallback(stream->st, newEvents);
+}
+
+
+/*
+ * Callback that gets invoked when a stream becomes writable/readable
+ */
+static void
+remoteStreamEvent(virStreamPtr st, int events, void *opaque)
+{
+    struct qemud_client *client = opaque;
+    struct qemud_client_stream *stream;
+
+    /* XXX sub-optimal - we really should be taking the server lock
+     * first, but we have no handle to the server object
+     * We're lucky to get away with it for now, due to this callback
+     * executing in the main thread, but this should really be fixed
+     */
+    virMutexLock(&client->lock);
+
+    stream = remoteFindClientStream(client, st);
+
+    if (!stream) {
+        VIR_WARN("event for client=%p stream st=%p, but missing stream state", client, st);
+        virStreamEventRemoveCallback(st);
+        goto cleanup;
+    }
+
+    DEBUG("st=%p events=%d", st, events);
+
+    if (events & VIR_STREAM_EVENT_WRITABLE) {
+        if (remoteStreamHandleWrite(client, stream) < 0) {
+            remoteRemoveClientStream(client, stream);
+            qemudDispatchClientFailure(client);
+            goto cleanup;
+        }
+    }
+
+    if (!stream->recvEOF &&
+        (events & (VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP))) {
+        events = events & ~(VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP);
+        if (remoteStreamHandleRead(client, stream) < 0) {
+            remoteRemoveClientStream(client, stream);
+            qemudDispatchClientFailure(client);
+            goto cleanup;
+        }
+    }
+
+    if (!stream->closed &&
+        (events & (VIR_STREAM_EVENT_ERROR | VIR_STREAM_EVENT_HANGUP))) {
+        int ret;
+        remote_error rerr;
+        memset(&rerr, 0, sizeof rerr);
+        stream->closed = 1;
+        virStreamAbort(stream->st);
+        if (events & VIR_STREAM_EVENT_HANGUP)
+            remoteDispatchFormatError(&rerr, "%s", _("stream had unexpected termination"));
+        else
+            remoteDispatchFormatError(&rerr, "%s", _("stream had I/O failure"));
+        ret = remoteSerializeStreamError(client, &rerr, stream->procedure, stream->serial);
+        remoteRemoveClientStream(client, stream);
+        if (ret < 0)
+            qemudDispatchClientFailure(client);
+        goto cleanup;
+    }
+
+    if (stream->closed) {
+        remoteRemoveClientStream(client, stream);
+    } else {
+        remoteStreamUpdateEvents(stream);
+    }
+
+cleanup:
+    virMutexUnlock(&client->lock);
+}
+
+
+/*
+ * @client: a locked client object
+ *
+ * Invoked by the main loop when filtering incoming messages.
+ *
+ * Returns 1 if the message was processed, 0 if skipped,
+ * -1 on fatal client error
+ */
+static int
+remoteStreamFilter(struct qemud_client *client,
+                   struct qemud_client_message *msg, void *opaque)
+{
+    struct qemud_client_stream *stream = opaque;
+
+    if (msg->hdr.serial == stream->serial &&
+        msg->hdr.proc == stream->procedure &&
+        msg->hdr.type == REMOTE_STREAM) {
+        DEBUG("Incoming rx=%p serial=%d proc=%d status=%d",
+              stream->rx, msg->hdr.proc, msg->hdr.serial, msg->hdr.status);
+
+        /* If there are queued packets, we need to queue all further
+         * messages, since they must be processed strictly in order.
+         * If there are no queued packets, then OK/ERROR messages
+         * should be processed immediately. Data packets are still
+         * queued to only be processed when the stream is marked as
+         * writable.
+         */
+        if (stream->rx) {
+            qemudClientMessageQueuePush(&stream->rx, msg);
+            remoteStreamUpdateEvents(stream);
+        } else {
+            int ret = 0;
+            switch (msg->hdr.status) {
+            case REMOTE_OK:
+                ret = remoteStreamHandleFinish(client, stream, msg);
+                if (ret == 0)
+                    qemudClientMessageRelease(client, msg);
+                break;
+
+            case REMOTE_CONTINUE:
+                qemudClientMessageQueuePush(&stream->rx, msg);
+                remoteStreamUpdateEvents(stream);
+                break;
+
+            case REMOTE_ERROR:
+            default:
+                ret = remoteStreamHandleAbort(client, stream, msg);
+                if (ret == 0)
+                    qemudClientMessageRelease(client, msg);
+                break;
+            }
+
+            if (ret < 0)
+                return -1;
+        }
+        return 1;
+    }
+    return 0;
+}
+
+
+/*
+ * @conn: a connection object to associate the stream with
+ * @hdr: the method call to associate with the stram
+ *
+ * Creates a new stream for this conn
+ *
+ * Returns a new stream object, or NULL upon OOM
+ */
+struct qemud_client_stream *
+remoteCreateClientStream(virConnectPtr conn,
+                         remote_message_header *hdr)
+{
+    struct qemud_client_stream *stream;
+
+    DEBUG("proc=%d serial=%d", hdr->proc, hdr->serial);
+
+    if (VIR_ALLOC(stream) < 0)
+        return NULL;
+
+    stream->procedure = hdr->proc;
+    stream->serial = hdr->serial;
+
+    stream->st = virStreamNew(conn, VIR_STREAM_NONBLOCK);
+    if (!stream->st) {
+        VIR_FREE(stream);
+        return NULL;
+    }
+
+    stream->filter.query = remoteStreamFilter;
+    stream->filter.opaque = stream;
+
+    return stream;
+}
+
+/*
+ * @stream: an unused client stream
+ *
+ * Frees the memory associated with this inactive client
+ * stream
+ */
+void remoteFreeClientStream(struct qemud_client *client,
+                            struct qemud_client_stream *stream)
+{
+    struct qemud_client_message *msg;
+
+    if (!stream)
+        return;
+
+    DEBUG("proc=%d serial=%d", stream->procedure, stream->serial);
+
+    msg = stream->rx;
+    while (msg) {
+        struct qemud_client_message *tmp = msg->next;
+        qemudClientMessageRelease(client, msg);
+        msg = tmp;
+    }
+
+    virStreamFree(stream->st);
+    VIR_FREE(stream);
+}
+
+
+/*
+ * @client: a locked client to add the stream to
+ * @stream: a stream to add
+ */
+int remoteAddClientStream(struct qemud_client *client,
+                          struct qemud_client_stream *stream,
+                          int transmit)
+{
+    struct qemud_client_stream *tmp = client->streams;
+
+    DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial);
+
+    if (virStreamEventAddCallback(stream->st, 0,
+                                  remoteStreamEvent, client, NULL) < 0)
+        return -1;
+
+    if (tmp) {
+        while (tmp->next)
+            tmp = tmp->next;
+        tmp->next = stream;
+    } else {
+        client->streams = stream;
+    }
+
+    stream->filter.next = client->filters;
+    client->filters = &stream->filter;
+
+    if (transmit)
+        stream->tx = 1;
+
+    remoteStreamUpdateEvents(stream);
+
+    return 0;
+}
+
+
+/*
+ * @client: a locked client object
+ * @procedure: procedure associated with the stream
+ * @serial: serial number associated with the stream
+ *
+ * Finds a existing active stream
+ *
+ * Returns a stream object matching the procedure+serial number, or NULL
+ */
+struct qemud_client_stream *
+remoteFindClientStream(struct qemud_client *client,
+                       virStreamPtr st)
+{
+    struct qemud_client_stream *stream = client->streams;
+
+    while (stream) {
+        if (stream->st == st)
+            return stream;
+        stream = stream->next;
+    }
+
+    return NULL;
+}
+
+
+/*
+ * @client: a locked client object
+ * @stream: an inactive, closed stream object
+ *
+ * Removes a stream from the list of active streams for the client
+ *
+ * Returns 0 if the stream was removd, -1 if it doesn't exist
+ */
+int
+remoteRemoveClientStream(struct qemud_client *client,
+                         struct qemud_client_stream *stream)
+{
+    DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial);
+
+    struct qemud_client_stream *curr = client->streams;
+    struct qemud_client_stream *prev = NULL;
+    struct qemud_client_filter *filter = NULL;
+
+    if (client->filters == &stream->filter) {
+        client->filters = client->filters->next;
+    } else {
+        filter = client->filters;
+        while (filter) {
+            if (filter->next == &stream->filter) {
+                filter->next = filter->next->next;
+                break;
+            }
+        }
+    }
+
+    if (!stream->closed)
+        virStreamAbort(stream->st);
+
+    while (curr) {
+        if (curr == stream) {
+            if (prev)
+                prev->next = curr->next;
+            else
+                client->streams = curr->next;
+            remoteFreeClientStream(client, stream);
+            return 0;
+        }
+        prev = curr;
+        curr = curr->next;
+    }
+    return -1;
+}
+
+
+/*
+ * Returns:
+ *   -1  if fatal error occurred
+ *    0  if message was fully processed
+ *    1  if message is still being processed
+ */
+static int
+remoteStreamHandleWriteData(struct qemud_client *client,
+                            struct qemud_client_stream *stream,
+                            struct qemud_client_message *msg)
+{
+    remote_error rerr;
+    int ret;
+
+    DEBUG("stream=%p proc=%d serial=%d len=%d offset=%d",
+          stream, msg->hdr.proc, msg->hdr.serial, msg->bufferLength, msg->bufferOffset);
+
+    memset(&rerr, 0, sizeof rerr);
+
+    ret = virStreamSend(stream->st,
+                        msg->buffer + msg->bufferOffset,
+                        msg->bufferLength - msg->bufferOffset);
+
+    if (ret > 0) {
+        msg->bufferOffset += ret;
+
+        /* Partial write, so indicate we have more todo later */
+        if (msg->bufferOffset < msg->bufferLength)
+            return 1;
+    } else if (ret == -2) {
+        /* Blocking, so indicate we have more todo later */
+        return 1;
+    } else {
+        VIR_INFO0("Stream send failed");
+        stream->closed = 1;
+        remoteDispatchConnError(&rerr, client->conn);
+        return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Process an finish handshake from the client.
+ *
+ * Returns a REMOTE_OK confirmation if successful, or a REMOTE_ERROR
+ * if there was a stream error
+ *
+ * Returns 0 if successfully sent RPC reply, -1 upon fatal error
+ */
+static int
+remoteStreamHandleFinish(struct qemud_client *client,
+                         struct qemud_client_stream *stream,
+                         struct qemud_client_message *msg)
+{
+    remote_error rerr;
+    int ret;
+
+    DEBUG("stream=%p proc=%d serial=%d",
+          stream, msg->hdr.proc, msg->hdr.serial);
+
+    memset(&rerr, 0, sizeof rerr);
+
+    stream->closed = 1;
+    ret = virStreamFinish(stream->st);
+
+    if (ret < 0) {
+        remoteDispatchConnError(&rerr, client->conn);
+        return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+    } else {
+        /* Send zero-length confirm */
+        if (remoteSendStreamData(client, stream, NULL, 0) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
+/*
+ * Process an abort request from the client.
+ *
+ * Returns 0 if successfully aborted, -1 upon error
+ */
+static int
+remoteStreamHandleAbort(struct qemud_client *client,
+                        struct qemud_client_stream *stream,
+                        struct qemud_client_message *msg)
+{
+    remote_error rerr;
+
+    DEBUG("stream=%p proc=%d serial=%d",
+          stream, msg->hdr.proc, msg->hdr.serial);
+
+    memset(&rerr, 0, sizeof rerr);
+
+    stream->closed = 1;
+    virStreamAbort(stream->st);
+
+    if (msg->hdr.status == REMOTE_ERROR)
+        remoteDispatchFormatError(&rerr, "%s", _("stream aborted at client request"));
+    else {
+        VIR_WARN("unexpected stream status %d", msg->hdr.status);
+        remoteDispatchFormatError(&rerr, _("stream aborted with unexpected status %d"),
+                                  msg->hdr.status);
+    }
+
+    return remoteSerializeReplyError(client, &rerr, &msg->hdr);
+}
+
+
+
+/*
+ * Called when the stream is signalled has being able to accept
+ * data writes. Will process all pending incoming messages
+ * until they're all gone, or I/O blocks
+ *
+ * Returns 0 on success, or -1 upon fatal error
+ */
+static int
+remoteStreamHandleWrite(struct qemud_client *client,
+                        struct qemud_client_stream *stream)
+{
+    struct qemud_client_message *msg, *tmp;
+
+    DEBUG("stream=%p", stream);
+
+    msg = stream->rx;
+    while (msg && !stream->closed) {
+        int ret;
+        switch (msg->hdr.status) {
+        case REMOTE_OK:
+            ret = remoteStreamHandleFinish(client, stream, msg);
+            break;
+
+        case REMOTE_CONTINUE:
+            ret = remoteStreamHandleWriteData(client, stream, msg);
+            break;
+
+        case REMOTE_ERROR:
+        default:
+            ret = remoteStreamHandleAbort(client, stream, msg);
+            break;
+        }
+
+        if (ret == 0)
+            qemudClientMessageQueueServe(&stream->rx);
+        else if (ret < 0)
+            return -1;
+        else
+            break; /* still processing data */
+
+        tmp = msg->next;
+        qemudClientMessageRelease(client, msg);
+        msg = tmp;
+    }
+
+    return 0;
+}
+
+
+
+/*
+ * Invoked when a stream is signalled as having data
+ * available to read. This reads upto one message
+ * worth of data, and then queues that for transmission
+ * to the client.
+ *
+ * Returns 0 if data was queued for TX, or a error RPC
+ * was sent, or -1 on fatal error, indicating client should
+ * be killed
+ */
+static int
+remoteStreamHandleRead(struct qemud_client *client,
+                       struct qemud_client_stream *stream)
+{
+    char *buffer;
+    size_t bufferLen = REMOTE_MESSAGE_PAYLOAD_MAX;
+    int ret;
+
+    DEBUG("stream=%p", stream);
+
+    /* Shouldn't ever be called unless we're marked able to
+     * transmit, but doesn't hurt to check */
+    if (!stream->tx)
+        return 0;
+
+    if (VIR_ALLOC_N(buffer, bufferLen) < 0)
+        return -1;
+
+    ret = virStreamRecv(stream->st, buffer, bufferLen);
+    if (ret == -2) {
+        /* Should never get this, since we're only called when we know
+         * we're readable, but hey things change... */
+        ret = 0;
+    } else if (ret < 0) {
+        remote_error rerr;
+        memset(&rerr, 0, sizeof rerr);
+        remoteDispatchConnError(&rerr, NULL);
+
+        ret = remoteSerializeStreamError(client, &rerr, stream->procedure, stream->serial);
+    } else {
+        stream->tx = 0;
+        if (ret == 0)
+            stream->recvEOF = 1;
+        ret = remoteSendStreamData(client, stream, buffer, ret);
+    }
+
+    VIR_FREE(buffer);
+    return ret;
+}
+
+
+/*
+ * Invoked when an outgoing data packet message has been fully sent.
+ * This simply re-enables TX of further data.
+ *
+ * The idea is to stop the daemon growing without bound due to
+ * fast stream, but slow client
+ */
+void
+remoteStreamMessageFinished(struct qemud_client *client,
+                            struct qemud_client_message *msg)
+{
+    struct qemud_client_stream *stream = client->streams;
+
+    while (stream) {
+        if (msg->hdr.proc == stream->procedure &&
+            msg->hdr.serial == stream->serial)
+            break;
+        stream = stream->next;
+    }
+
+    DEBUG("Message client=%p stream=%p proc=%d serial=%d", client, stream, msg->hdr.proc, msg->hdr.serial);
+
+    if (stream) {
+        stream->tx = 1;
+        remoteStreamUpdateEvents(stream);
+    }
+}

daemon/stream.h

@@ -0,0 +1,54 @@
+/*
+ * stream.h: APIs for managing client streams
+ *
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ *
+ * Author: Daniel P. Berrange <berrange@redhat.com>
+ */
+
+
+#ifndef __LIBVIRTD_STREAM_H__
+#define __LIBVIRTD_STREAM_H__
+
+#include "libvirtd.h"
+
+
+
+struct qemud_client_stream *
+remoteCreateClientStream(virConnectPtr conn,
+                         remote_message_header *hdr);
+
+void remoteFreeClientStream(struct qemud_client *client,
+                            struct qemud_client_stream *stream);
+
+int remoteAddClientStream(struct qemud_client *client,
+                          struct qemud_client_stream *stream,
+                          int transmit);
+
+struct qemud_client_stream *
+remoteFindClientStream(struct qemud_client *client,
+                       virStreamPtr stream);
+
+int
+remoteRemoveClientStream(struct qemud_client *client,
+                         struct qemud_client_stream *stream);
+
+void
+remoteStreamMessageFinished(struct qemud_client *client,
+                            struct qemud_client_message *msg);
+
+#endif /* __LIBVIRTD_STREAM_H__ */

docs/.gitignore

@@ -2,3 +2,6 @@ Makefile
 Makefile.in
 .memdump
 apibuild.pyc
+*.html
+libvirt-api.xml
+libvirt-refs.xml

docs/ChangeLog.xsl

@@ -4,7 +4,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- Generate XHTML-1.0 transitional -->
-  <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"
       doctype-public="-//W3C//DTD XHTML 1.0//EN"
       doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
 

docs/FAQ.html

@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from FAQ.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: FAQ</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <span class="active">FAQ</span>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>FAQ</h1>
-        <p>Table of Contents:</p>
-        <ul><li>
-        <a href="FAQ.html#License">License(s)</a>
-      </li><li>
-        <a href="FAQ.html#Installati">Installation</a>
-      </li><li>
-        <a href="FAQ.html#Compilatio">Compilation</a>
-      </li><li>
-        <a href="FAQ.html#Developer">Developer corner</a>
-      </li></ul>
-        <h3><a name="License" id="License">License</a>(s)</h3>
-        <ol><li>
-        <em>Licensing Terms for libvirt</em>
-        <p>libvirt is released under the <a href="http://www.opensource.org/licenses/lgpl-license.html">GNU Lesser
-    General Public License</a>, see the file COPYING.LIB in the distribution
-    for the precise wording. The only library that libvirt depends upon is
-    the Xen store access library which is also licenced under the LGPL.</p>
-      </li><li>
-        <em>Can I embed libvirt in a proprietary application ?</em>
-        <p>Yes. The LGPL allows you to embed libvirt into a proprietary
-    application. It would be graceful to send-back bug fixes and improvements
-    as patches for possible incorporation in the main development tree. It
-    will decrease your maintenance costs anyway if you do so.</p>
-      </li></ol>
-        <h3>
-      <a name="Installati" id="Installati">Installation</a>
-    </h3>
-        <ol><li><em>Where can I get libvirt</em> ?
-    <p>The original distribution comes from <a href="ftp://libvirt.org/libvirt/">ftp://libvirt.org/libvirt/</a>.</p>
-  </li><li>
-        <em>I can't install the libvirt/libvirt-devel RPM packages due to
-    failed dependencies</em>
-        <p>The most generic solution is to re-fetch the latest src.rpm , and
-    rebuild it locally with</p>
-        <p><code>rpm --rebuild libvirt-xxx.src.rpm</code>.</p>
-        <p>If everything goes well it will generate two binary rpm packages (one
-    providing the shared libs and virsh, and the other one, the -devel
-    package, providing includes, static libraries and scripts needed to build
-    applications with libvirt that you can install locally.</p>
-        <p>One can also rebuild the RPMs from a tarball:</p>
-        <p>
-          <code>rpmbuild -ta libdir-xxx.tar.gz</code>
-        </p>
-        <p>Or from a configured tree with:</p>
-        <p>
-          <code>make rpm</code>
-        </p>
-      </li><li>
-        <em>Failure to use the API for non-root users</em>
-        <p>Large parts of the API may only be accessible with root privileges,
-    however the read only access to the xenstore data doesnot have to be
-    forbidden to user, at least for monitoring purposes. If "virsh dominfo"
-    fails to run as an user, change the mode of the xenstore read-only socket
-    with:</p>
-        <p>
-          <code>chmod 666 /var/run/xenstored/socket_ro</code>
-        </p>
-        <p>and also make sure that the Xen Daemon is running correctly with local
-    HTTP server enabled, this is defined in
-    <code>/etc/xen/xend-config.sxp</code> which need the following line to be
-    enabled:</p>
-        <p>
-          <code>(xend-http-server yes)</code>
-        </p>
-        <p>If needed restart the xend daemon after making the change with the
-    following command run as root:</p>
-        <p>
-          <code>service xend restart</code>
-        </p>
-      </li></ol>
-        <h3>
-      <a name="Compilatio" id="Compilatio">Compilation</a>
-    </h3>
-        <ol><li>
-        <em>What is the process to compile libvirt ?</em>
-        <p>As most UNIX libraries libvirt follows the "standard":</p>
-        <p>
-          <code>gunzip -c libvirt-xxx.tar.gz | tar xvf -</code>
-        </p>
-        <p>
-          <code>cd libvirt-xxxx</code>
-        </p>
-        <p>
-          <code>./configure --help</code>
-        </p>
-        <p>to see the options, then the compilation/installation proper</p>
-        <p>
-          <code>./configure [possible options]</code>
-        </p>
-        <p>
-          <code>make</code>
-        </p>
-        <p>
-          <code>make install</code>
-        </p>
-        <p>At that point you may have to rerun ldconfig or a similar utility to
-    update your list of installed shared libs.</p>
-      </li><li>
-        <em>What other libraries are needed to compile/install libvirt ?</em>
-        <p>Libvirt requires libxenstore, which is usually provided by the xen
-    packages as well as the public headers to compile against libxenstore.</p>
-      </li><li>
-        <em>I use the CVS version and there is no configure script</em>
-        <p>The configure script (and other Makefiles) are generated. Use the
-    autogen.sh script to regenerate the configure script and Makefiles,
-    like:</p>
-        <p>
-          <code>./autogen.sh --prefix=/usr --disable-shared</code>
-        </p>
-      </li></ol>
-        <h3><a name="Developer" id="Developer">Developer</a> corner</h3>
-        <ol><li>
-        <em>Troubles compiling or linking programs using libvirt</em>
-        <p>To simplify the process of reusing the library, libvirt comes with
-    pkgconfig support, which can be used directly from autoconf support or
-    via the pkg-config command line tool, like:</p>
-        <p>
-          <code>pkg-config libvirt --libs</code>
-        </p>
-      </li></ol>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/FAQ.html.in

@@ -119,7 +119,7 @@
     packages as well as the public headers to compile against libxenstore.</p>
       </li>
       <li>
-        <em>I use the CVS version and there is no configure script</em>
+        <em>I use the GIT version and there is no configure script</em>
         <p>The configure script (and other Makefiles) are generated. Use the
     autogen.sh script to regenerate the configure script and Makefiles,
     like:</p>

docs/Goals

@@ -1,28 +0,0 @@
-
-         Why libxen:
-	 -----------
-
-
-  The main goals of the library is to provide an stable API abstracting
-the underlying acual implementation of the hypervisor calls.
-
-1/ Stable API:
-   by isolating the data structures and entry points used at the low
-   level Xen Hypervisor interfaces, allowing evolution of said interface
-   over time without breaking the application visible API and ABI
-
-2/ Abstraction:
-   by providing at the C level simplified concept exposed only as opaque
-   structure for the hypervisor connection, domains and other kind of
-   objects which may be needed in the future. It must also provide
-   a set of higher level function calls simplifying the developement
-   of applications using the supervisor.
-
-3/ Maintainability and openness:
-   All data structures and entry points must be fully documented, all
-   changes will be driven in an open fashion based on a publicly archived
-   mailing-list allowing peer-review before changes will be introduced.
-   Tools and regression tests will be implemented and shipped as part of the
-   releases of the library.
-
-Daniel Veillard <veillard@redhat.com>

docs/Makefile.am

@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS= schemas examples devhelp
+SUBDIRS= schemas
 
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../src
 
-man_MANS=
+DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
 
 apihtml =			\
   html/index.html		\
@@ -17,13 +17,27 @@ apipng =	\
   html/home.png	\
   html/right.png
 
+devhelphtml =			\
+  devhelp/libvirt.devhelp	\
+  devhelp/index.html		\
+  devhelp/general.html		\
+  devhelp/libvirt-libvirt.html	\
+  devhelp/libvirt-virterror.html
+
+devhelppng =		\
+  devhelp/home.png	\
+  devhelp/left.png	\
+  devhelp/right.png	\
+  devhelp/up.png
+
+devhelpcss = devhelp/style.css
+
+devhelpxsl = devhelp/devhelp.xsl devhelp/html.xsl
+
 png = \
-  16favicon.png \
   32favicon.png \
   footer_corner.png \
   footer_pattern.png \
-  libvirHeader.png \
-  libvirLogo.png \
   libvirt-header-bg.png \
   libvirt-header-logo.png \
   libvirtLogo.png \
@@ -33,13 +47,9 @@ png = \
   libvirt-driver-arch.png \
   libvirt-object-model.png \
   madeWith.png \
-  windows-cygwin-1.png \
-  windows-cygwin-2.png \
-  windows-cygwin-3.png \
   et.png
 
 gif = \
-  Libxml2-Logo-90x34.gif \
   architecture.gif \
   node.gif
 
@@ -50,14 +60,7 @@ patches = $(wildcard api_extension/*.patch)
 
 xml = \
   libvirt-api.xml \
-  libvirt-refs.xml \
-  testdomfc4.xml \
-  testdomfv0.xml \
-  testnetdef.xml \
-  testnetpriv.xml \
-  testnode.xml \
-  testpool.xml \
-  testvol.xml
+  libvirt-refs.xml
 
 fig = \
   libvirt-net-logical.fig \
@@ -70,20 +73,19 @@ EXTRA_DIST=					\
   libvirt-api.xml libvirt-refs.xml apibuild.py	\
   site.xsl newapi.xsl news.xsl page.xsl	ChangeLog.xsl	\
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
+  $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
   $(xml) $(fig) $(png) \
   $(patches) \
-  virsh.pod ChangeLog.awk
+  sitemap.html.in \
+  ChangeLog.awk
 
-all: web $(top_builddir)/NEWS $(man_MANS)
+MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml)
 
-virsh.1: virsh.pod
-	pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" $(srcdir)/virsh.pod > $@-t
-	mv $@-t $@
-	cp $@ $(top_builddir)
+all: web
 
-api: libvirt-api.xml libvirt-refs.xml $(srcdir)/html/index.html
+api: libvirt-api.xml libvirt-refs.xml
 
-web: $(dot_html)
+web: $(dot_html) html/index.html devhelp/index.html
 
 ChangeLog.xml: ../ChangeLog ChangeLog.awk
 	awk -f ChangeLog.awk < $< > $@
@@ -105,33 +107,35 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl
 
 %.html: %.html.tmp
 	@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
-	  if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
+	  if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
 	  echo "Validating $@" ; \
-	  $(XMLLINT) --nonet --format --valid $< > $@ || : ; \
+	  $(XMLLINT) --nonet --format --valid $< > $@ || (rm $@ && exit 1) ; \
 	  else echo "missing XHTML1 DTD" ; fi ; fi );
 
 
-$(srcdir)/html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
+html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
 	-@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Rebuilding the HTML pages from the XML API" ; \
 	  $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi )
 	-@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
-	  if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
+	  if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
 	  echo "Validating the resulting XHTML pages" ; \
 	  $(XMLLINT) --nonet --valid --noout html/*.html ; \
 	  else echo "missing XHTML1 DTD" ; fi ; fi );
 
-libvirt-api.xml libvirt-refs.xml: apibuild.py \
-		$(srcdir)/../include/libvirt/*.h \
-		$(srcdir)/../src/*.h $(srcdir)/../src/*.c
-	-(./apibuild.py)
+$(devhelphtml): libvirt-api.xml $(devhelpxsl)
+	-@(echo Rebuilding devhelp files)
+	-@(if [ -x $(XSLTPROC) ] ; then \
+	  $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \
+          $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi );
 
-$(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
-	-@(if [ -x $(XSLTPROC) ] ; then				\
-	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl	\
-	     $(top_srcdir)/docs/news.html.in			\
-	   | perl -0777 -pe 's/\n\n+$$/\n/'			\
-	   > $@-t && mv $@-t $@ ; fi );
+html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: $(srcdir)/apibuild.py
+	-srcdir=$(srcdir) $(srcdir)/apibuild.py
+
+html/%-%.html html/%-virterror.html %-api.xml %-refs.xml: \
+		$(srcdir)/../include/%/*.h \
+		$(srcdir)/../src/%.c \
+		$(srcdir)/../src/util/virterror.c
 
 clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
@@ -143,14 +147,21 @@ rebuild: api all
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/FAQ.html \
+	-$(INSTALL) -m 0644 $(srcdir)/FAQ.html \
 	    $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
 	for h in $(apihtml); do \
 	  $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done
 	for p in $(apipng); do \
 	  $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done
+	$(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
+	for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
+	    $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
+	done
 
 uninstall-local:
 	for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done
 	for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done
+	for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
+	  rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \
+	done

docs/api.html

@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from api.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: The libvirt API concepts</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">API concepts</span>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Providing isolated networks and NAT based network connectivity" class="inactive" href="archnetwork.html">Network</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing storage pools and volumes" class="inactive" href="archstorage.html">Storage</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enumerating host node devices" class="inactive" href="archnode.html">Node Devices</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>The libvirt API concepts</h1>
-        <p> This page describes the main principles and architecture choices
-    behind the definition of the libvirt API:
-    </p>
-        <ul><li>
-        <a href="#Objects">Objects exposed</a>
-      </li><li>
-        <a href="#Functions">Functions and naming conventions</a>
-      </li><li>
-        <a href="#Driver">The drivers</a>
-      </li><li>
-        <a href="#Remote">Daemon and remote access</a>
-      </li></ul>
-        <h2>
-          <a name="Objects" id="Objects">Objects exposed</a>
-        </h2>
-        <p> As defined in the <a href="goals.html">goals section</a>, libvirt
-    API need to expose all the resources needed to manage the virtualization
-    support of recent operating systems. The first object manipulated though
-    the API is <code>virConnectPtr</code> which represent a connection to
-    an hypervisor. Any application using libvirt is likely to start using the
-    API by calling one of <a href="html/libvirt-libvirt.html#virConnectOpen">the virConnectOpen functions</a>. You will note that those functions take
-    a name argument which is actually an URI to select the right hypervisor to
-    open, this is needed to allow remote connections and also select between
-    different possible hypervisors (for example on a Linux system it may be
-    possible to use both KVM and LinuxContainers on the same node). A NULL
-    name will default to a preselected hypervisor but it's probably not a
-    wise thing to do in most cases. See the <a href="uri.html">connection
-    URI</a> page for a full descriptions of the values allowed.</p>
-        <p>
-    </p>
-        <p> Once the application obtained a <a href="html/libvirt-libvirt.html#virConnectPtr"><code>virConnectPtr</code></a>
-    connection to the
-    hypervisor it can then use it to manage domains and related resources
-    available for virtualization like storage and networking. All those are
-    exposed as first class objects, and connected to the hypervisor connection
-    (and the node or cluster where it is available).</p>
-        <p class="image">
-      <img alt="first class objects exposed by the API" src="libvirt-object-model.png" /></p>
-        <p> The figure above shows the five main objects exported by the API:</p>
-        <ul><li>virConnectPtr: represent a connection to an hypervisor.</li><li>virDomainPtr: represent one domain either active or defined (i.e.
-      existing as permanent config file and storage but not currently running
-      on that node). The function <a href="html/libvirt-libvirt.html#virConnectListDomains"><code>virConnectListDomains</code></a>
-      allows to list all the IDs for the domains active on this hypervisor.</li><li>virNetworkPtr: represent one network either active or defined (i.e.
-      existing as permanent config file and storage but not currently activated.
-      The function <a href="html/libvirt-libvirt.html#virConnectListNetworks"><code>virConnectListNetworks</code></a>
-      allows to list all the virtualization networks actived on this node.</li><li>virStorageVolPtr: represent one storage volume, usually this is used
-      as a block device available to one of the domains. The function
-      <a href="html/libvirt-libvirt.html#virStorageVolLookupByPath"><code>virStorageVolLookupByPath</code></a> allows to find
-      the object based on its path on the node.</li><li>virStoragePoolPtr: represent a storage pool, i.e. a logical area
-      which can be used to allocate and store storage volumes. The function
-      <a href="html/libvirt-libvirt.html#virStoragePoolLookupByVolume"><code>virStoragePoolLookupByVolume</code></a> allows to find
-      the storage pool containing a given storage volume.</li></ul>
-        <p> Most object manipulated by the library can also be represented using
-      XML descriptions. This is used primarily to create those object, but is
-      also helpful to modify or save their description back.</p>
-        <p> Domains, network and storage pools can be either <code>active</code>
-      i.e. either running or available for immediate use, or
-      <code>defined</code> in which case they are inactive but there is
-      a permanent definition available in the system for them. Based on this
-      thay can be activated dynamically in order to be used.</p>
-        <p> Most kind of object can also be named in various ways:</p>
-        <p>
-    </p>
-        <ul><li>by their <code>name</code>, an user friendly identifier but
-      whose unicity cannot be garanteed between two nodes.</li><li>by their <code>ID</code>, which is a runtime unique identifier
-      provided by the hypervisor for one given activation of the object,
-      but it becomes invalid once the resource is deactivated.</li><li>by their <code>UUID</code>, a 16 bytes unique identifier
-      as defined in <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a>,
-      which is garanteed to be unique for long term usage and across a
-      set of nodes.</li></ul>
-        <h2>
-          <a name="Functions" id="Functions">Functions and naming
-      conventions</a>
-        </h2>
-        <p> The naming of the functions present in the library is usually
-      made of a prefix describing the object associated to the function
-      and a verb describing the action on that object.</p>
-        <p> For each first class object you will find apis
-      for the following actions:</p>
-        <ul><li><b>Lookup</b>:...LookupByName, 
-      </li><li><b>Enumeration</b>:virConnectList... and virConnectNumOf...:
-        those are used to enumerate a set of object available to an given
-        hypervisor connection like:
-        <a href="html/libvirt-libvirt.html#virConnectListDomains"><code>virConnectListDomains</code></a>,
-        <a href="html/libvirt-libvirt.html#virConnectNumOfDomains"><code>virConnectNumOfDomains</code></a>,
-        <a href="html/libvirt-libvirt.html#virConnectListNetworks"><code>virConnectListNetworks</code></a>,
-        <a href="html/libvirt-libvirt.html#virConnectListStoragePools"><code>virConnectListStoragePools</code></a>, etc.</li><li><b>Description</b>: ...GetInfo: those are generic accessor providing
-        a set of informations about an object, they are
-        <a href="html/libvirt-libvirt.html#virNodeGetInfo"><code>virNodeGetInfo</code></a>,
-        <a href="html/libvirt-libvirt.html#virDomainGetInfo"><code>virDomainGetInfo</code></a>,
-        <a href="html/libvirt-libvirt.html#virStoragePoolGetInfo"><code>virStoragePoolGetInfo</code></a>,
-        <a href="html/libvirt-libvirt.html#virStorageVolGetInfo"><code>virStorageVolGetInfo</code></a>.</li><li><b>Accessors</b>: ...Get... and ...Set...: those are more specific
-        accessors to query or modify the given object, like
-        <a href="html/libvirt-libvirt.html#virConnectGetType"><code>virConnectGetType</code></a>,
-        <a href="html/libvirt-libvirt.html#virDomainGetMaxMemory"><code>virDomainGetMaxMemory</code></a>,
-        <a href="html/libvirt-libvirt.html#virDomainSetMemory"><code>virDomainSetMemory</code></a>,
-        <a href="html/libvirt-libvirt.html#virDomainGetVcpus"><code>virDomainGetVcpus</code></a>,
-        <a href="html/libvirt-libvirt.html#virStoragePoolSetAutostart"><code>virStoragePoolSetAutostart</code></a>,
-        <a href="html/libvirt-libvirt.html#virNetworkGetBridgeName"><code>virNetworkGetBridgeName</code></a>, etc.</li><li><b>Creation</b>: </li><li><b>Destruction</b>: ... </li></ul>
-        <p> For more in-depth details of the storage related APIs see
-      <a href="storage.html">the storage management page</a>, 
-    </p>
-        <h2>
-          <a name="Driver" id="Driver">The libvirt drivers</a>
-        </h2>
-        <p></p>
-        <p class="image">
-      <img alt="The libvirt driver architecture" src="libvirt-driver-arch.png" /></p>
-        <h2>
-          <a name="Remote" id="Remote">Daemon and remote access</a>
-        </h2>
-        <p></p>
-        <p class="image">
-      <img alt="The libvirt daemon and remote architecture" src="libvirt-daemon-arch.png" /></p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/api.html.in

@@ -84,7 +84,7 @@
       which is garanteed to be unique for long term usage and across a
       set of nodes.</li>
     </ul>
-    
+
     <h2><a name="Functions" id="Functions">Functions and naming
       conventions</a></h2>
     <p> The naming of the functions present in the library is usually
@@ -93,7 +93,7 @@
     <p> For each first class object you will find apis
       for the following actions:</p>
     <ul>
-      <li><b>Lookup</b>:...LookupByName, 
+      <li><b>Lookup</b>:...LookupByName,
       <li><b>Enumeration</b>:virConnectList... and virConnectNumOf...:
         those are used to enumerate a set of object available to an given
         hypervisor connection like:
@@ -119,7 +119,7 @@
       <li><b>Destruction</b>: ... </li>
     </ul>
     <p> For more in-depth details of the storage related APIs see
-      <a href="storage.html">the storage management page</a>, 
+      <a href="storage.html">the storage management page</a>,
     <h2><a name="Driver" id="Driver">The libvirt drivers</a></h2>
     <p></p>
     <p class="image">

docs/api_extension.html

@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from api_extension.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Implementing a new API in Libvirt</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="active" href="internals.html">Internals</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="General hacking guidelines for contributors" class="inactive" href="hacking.html">Contributor guidelines</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">API extensions</span>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Implementing a new API in Libvirt</h1>
-        <ul><li>
-            <a href="#publicapi">Defining the public API</a>
-          </li><li>
-            <a href="#internalapi">Defining the internal API</a>
-          </li><li>
-            <a href="#implpublic">Implementing the public API</a>
-          </li><li>
-            <a href="#wireproto">Defining the wire protocol format</a>
-          </li><li>
-            <a href="#rpcclient">Implement the RPC client</a>
-          </li><li>
-            <a href="#serverdispatch">Implement the server side dispatcher</a>
-          </li><li>
-            <a href="#driverimpl">Implement the driver methods</a>
-          </li><li>
-            <a href="#virsh">Implement virsh commands</a>
-          </li></ul>
-        <p>
-      This document walks you through the process of implementing a new
-      API in libvirt.  It uses as an example the addition of the node device
-      create and destroy APIs.
-    </p>
-        <p>
-      Before you begin coding, it is critical that you propose your
-      changes on the libvirt mailing list and get feedback on your ideas to
-      make sure what you're proposing fits with the general direction of the
-      project.  Even before doing a proof of concept implementation, send an
-      email giving an overview of the functionality you think should be
-      added to libvirt.  Someone may already be working on the feature you
-      want.  Also, recognize that everything you write is likely to undergo
-      significant rework as you discuss it with the other developers, so
-      don't wait too long before getting feedback.
-    </p>
-        <p>
-      Adding a new API to libvirt is not difficult, but there are quite a
-      few steps.  This document assumes that you are familiar with C
-      programming and have checked out the libvirt code from the source code
-      repository and successfully built the existing tree.  Instructions on
-      how to check out and build the code can be found at:
-    </p>
-        <p>
-      <a href="http://libvirt.org/downloads.html">http://libvirt.org/downloads.html</a>
-    </p>
-        <p>
-      Once you have a working development environment, the steps to create a
-      new API are:
-    </p>
-        <ol><li>define the public API</li><li>define the internal driver API</li><li>implement the public API</li><li>define the wire protocol format</li><li>implement the RPC client</li><li>implement the server side dispatcher</li><li>implement the driver methods</li><li>add virsh support</li></ol>
-        <p>
-      It is, of course, possible to implement the pieces in any order, but
-      if the development tasks are completed in the order listed, the code
-      will compile after each step.  Given the number of changes required,
-      verification after each step is highly recommended.
-    </p>
-        <p>
-      Submit new code in the form shown in the example code: one patch
-      per step.  That's not to say submit patches before you have working
-      functionality--get the whole thing working and make sure you're happy
-      with it.  Then use git or some other version control system that lets
-      you rewrite your commit history and break patches into pieces so you
-      don't drop a big blob of code on the mailing list at one go.  For
-      example, I didn't follow my own advice when I originally submitted the
-      example code to the libvirt list but rather submitted it in several
-      large chunks.  I've used git's ability to rewrite my commit history to
-      break the code apart into the example patches shown.
-    </p>
-        <p>
-      Don't mix anything else into the patches you submit.  The patches
-      should be the minimal changes required to implement the functionality
-      you're adding.  If you notice a bug in unrelated code (i.e., code you
-      don't have to touch to implement your API change) during development,
-      create a patch that just addresses that bug and submit it
-      separately.
-    </p>
-        <p>With that said, let's begin.</p>
-        <h2>
-          <a name="publicapi" id="publicapi">Defining the public API</a>
-        </h2>
-        <p>The first task is to define the public API and add it to:</p>
-        <p>
-          <code>include/libvirt/libvirt.h.in</code>
-        </p>
-        <p>
-      This task is in many ways the most important to get right, since once
-      the API has been committed to the repository, it's libvirt's policy
-      never to change it.  Mistakes in the implementation are bugs that you
-      can fix.  Make a mistake in the API definition and you're stuck with
-      it, so think carefully about the interface and don't be afraid to
-      rework it as you go through the process of implementing it.
-    </p>
-        <p>Once you have defined the API, you have to add the symbol names to:</p>
-        <p>
-          <code>src/libvirt_public.syms</code>
-        </p>
-        <p class="example">See <a href="api_extension/0001-Step-1-of-8-Define-the-public-API.patch">0001-Step-1-of-8-Define-the-public-API.patch</a> for example code.</p>
-        <h2>
-          <a name="internalapi" id="internalapi">Defining the internal API</a>
-        </h2>
-        <p>
-      Each public API call is associated with a driver, such as a host
-      virtualization driver, a network virtualization driver, a storage
-      virtualization driver, a state driver, or a device monitor.  Adding
-      the internal API is ordinarily a matter of adding a new member to the
-      struct representing one of these drivers.
-    </p>
-        <p>
-      Of course, it's possible that the new API will involve the creation of
-      an entire new driver type, in which case the changes will include the
-      creation of a new struct type to represent the new driver type.
-    </p>
-        <p>The driver structs are defined in:</p>
-        <p>
-          <code>src/driver.h</code>
-        </p>
-        <p>
-      To define the internal API, first typedef the driver function
-      prototype and then add a new field for it to the relevant driver
-      struct.
-    </p>
-        <p class="example">See <a href="api_extension/0002-Step-2-of-8-Define-the-internal-driver-API.patch">0002-Step-2-of-8-Define-the-internal-driver-API.patch</a></p>
-        <h2>
-          <a name="implpublic" id="implpublic">Implementing the public API</a>
-        </h2>
-        <p>
-      Implementing the public API is largely a formality in which we wire up
-      public API to the internal driver API.  The public API implementation
-      takes care of some basic validity checks before passing control to the
-      driver implementation.  In RFC 2119 vocabulary, this function:
-    </p>
-        <ol class="ordinarylist"><li>SHOULD log a message with VIR_DEBUG() indicating that it is
-	being called and its parameters;</li><li>MUST call virResetLastError();</li><li>SHOULD confirm that the connection is valid with
-	VIR_IS_CONNECT(conn);</li><li><strong>SECURITY: If the API requires a connection with write
-	  privileges, MUST confirm that the connection flags do not
-	  indicate that the connection is read-only;</strong></li><li>SHOULD do basic validation of the parameters that are being
-	passed in;</li><li>MUST confirm that the driver for this connection exists and that
-	it implements this function;</li><li>MUST call the internal API;</li><li>SHOULD log a message with VIR_DEBUG() indicating that it is
-	returning, its return value, and status.</li><li>MUST return status to the caller.</li></ol>
-        <p>The public API calls are implemented in:</p>
-        <p>
-          <code>src/libvirt.c</code>
-        </p>
-        <p class="example">See <a href="api_extension/0003-Step-3-of-8-Implement-the-public-API.patch">0003-Step-3-of-8-Implement-the-public-API.patch</a></p>
-        <h2>
-          <a name="wireproto" id="wireproto">Defining the wire protocol format</a>
-        </h2>
-        <p>
-      Defining the wire protocol is essentially a straightforward exercise
-      which is probably most easily understood by referring to the existing
-      remote protocol wire format definitions and the example patch.  It
-      involves making two additions to:
-    </p>
-        <p>
-          <code>qemud/remote_protocol.x</code>
-        </p>
-        <p>
-      First, create two new structs for each new function that you're adding
-      to the API.  One struct describes the parameters to be passed to the
-      remote function, and a second struct describes the value returned by
-      the remote function.  The one exception to this rule is that functions
-      that return only integer status do not require a struct for returned
-      data.
-    </p>
-        <p>
-      Second, add values to the remote_procedure enum for each new function
-      added to the API.
-    </p>
-        <p class="example">See <a href="api_extension/0004-Step-4-of-8-Define-the-wire-protocol-format.patch">0004-Step-4-of-8-Define-the-wire-protocol-format.patch</a></p>
-        <p>
-      Once these changes are in place, it's necessary to run 'make rpcgen'
-      in the qemud directory to create the .c and .h files required by the
-      remote protocol code. This must be done on a Linux host using the
-      GLibC rpcgen program. Other rpcgen versions may generate code which
-      results in bogus compile time warnings
-    </p>
-        <h2>
-          <a name="rpcclient" id="rpcclient">Implement the RPC client</a>
-        </h2>
-        <p>
-      Implementing the RPC client is also relatively mechanical, so refer to
-      the exising code and example patch for guidance.  The RPC client uses
-      the rpcgen generated .h files.  The remote method calls go in:
-    </p>
-        <p>
-          <code>src/remote_internal.c</code>
-        </p>
-        <p>Each remote method invocation does the following:</p>
-        <ol class="ordinarylist"><li>locks the remote driver;</li><li>sets up the method arguments;</li><li>invokes the remote function;</li><li>checks the return value, if necessary;</li><li>extracts any returned data;</li><li>frees any returned data;</li><li>unlocks the remote driver.</li></ol>
-        <p>
-      Once you have created the remote method calls, you have to add fields
-      for them to the driver structs for the appropriate remote driver.
-    </p>
-        <p class="example">See <a href="api_extension/0005-Step-5-of-8-Implement-the-RPC-client.patch">0005-Step-5-of-8-Implement-the-RPC-client.patch</a></p>
-        <h2>
-          <a name="serverdispatch" id="serverdispatch">Implement the server side dispatcher</a>
-        </h2>
-        <p>
-      Implementing the server side of the remote function calls is simply a
-      matter of deserializing the parameters passed in from the remote
-      caller and passing them to the corresponding internal API function.
-      The server side dispatchers are implemented in:
-    </p>
-        <p>
-          <code>qemud/remote.c</code>
-        </p>
-        <p>Again, this step uses the .h files generated by make rpcgen.</p>
-        <p class="example">See <a href="api_extension/0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch">0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch</a></p>
-        <h2>
-          <a name="driverimpl" id="driverimpl">Implement the driver methods</a>
-        </h2>
-        <p>
-      So, after all that, we get to the fun part.  All functionality in
-      libvirt is implemented inside a driver.  Thus, here is where you
-      implement whatever functionality you're adding to libvirt.  You'll
-      either need to add additional files to the src directory or extend
-      files that are already there, depending on what functionality you're
-      adding.
-    </p>
-        <p>
-      In the example code, the extension is only an additional two function
-      calls in the node device API, so most of the new code is additions to
-      existing files.  The only new files are there for multi-platform
-      implementation convenience, as some of the new code is Linux specific.
-    </p>
-        <p>
-      The example code is probably uninteresting unless you're concerned
-      with libvirt storage, but I've included it here to show how new files
-      are added to the build environment.
-    </p>
-        <p class="example">See <a href="api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch">0007-Step-7-of-8-Implement-the-driver-methods.patch</a></p>
-        <h2>
-          <a name="virsh" id="virsh">Implement virsh commands</a>
-        </h2>
-        <p>
-      Once you have the new functionality in place, the easiest way to test
-      it and also to provide it to end users is to implement support for it
-      in virsh.
-    </p>
-        <p>
-      A virsh command is composed of a few pieces of code.  You need to
-      define an array of vshCmdInfo structs for each new command that
-      contain the help text and the command description text.  You also need
-      an array of vshCmdOptDef structs to describe the command options.
-      Once you have those pieces of data in place you can write the function
-      implementing the virsh command.  Finally, you need to add the new
-      command to the commands[] array.
-    </p>
-        <p class="example">See <a href="api_extension/0008-Step-8-of-8-Add-virsh-support.patch">0008-Step-8-of-8-Add-virsh-support.patch</a></p>
-        <p>Once you have working functionality, run make check and make
-      syntax-check before generating patches.</p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/api_extension.html.in

@@ -145,20 +145,20 @@
 
     <ol class="ordinarylist">
       <li>SHOULD log a message with VIR_DEBUG() indicating that it is
-	being called and its parameters;</li>
+        being called and its parameters;</li>
       <li>MUST call virResetLastError();</li>
       <li>SHOULD confirm that the connection is valid with
-	VIR_IS_CONNECT(conn);</li>
+        VIR_IS_CONNECT(conn);</li>
       <li><strong>SECURITY: If the API requires a connection with write
-	  privileges, MUST confirm that the connection flags do not
-	  indicate that the connection is read-only;</strong></li>
+          privileges, MUST confirm that the connection flags do not
+          indicate that the connection is read-only;</strong></li>
       <li>SHOULD do basic validation of the parameters that are being
-	passed in;</li>
+        passed in;</li>
       <li>MUST confirm that the driver for this connection exists and that
-	it implements this function;</li>
+        it implements this function;</li>
       <li>MUST call the internal API;</li>
       <li>SHOULD log a message with VIR_DEBUG() indicating that it is
-	returning, its return value, and status.</li>
+        returning, its return value, and status.</li>
       <li>MUST return status to the caller.</li>
     </ol>
 
@@ -178,7 +178,7 @@
       involves making two additions to:
     </p>
 
-    <p><code>qemud/remote_protocol.x</code></p>
+    <p><code>src/remote/remote_protocol.x</code></p>
 
     <p>
       First, create two new structs for each new function that you're adding
@@ -198,7 +198,7 @@
 
     <p>
       Once these changes are in place, it's necessary to run 'make rpcgen'
-      in the qemud directory to create the .c and .h files required by the
+      in the src directory to create the .c and .h files required by the
       remote protocol code. This must be done on a Linux host using the
       GLibC rpcgen program. Other rpcgen versions may generate code which
       results in bogus compile time warnings
@@ -213,7 +213,7 @@
       the rpcgen generated .h files.  The remote method calls go in:
     </p>
 
-    <p><code>src/remote_internal.c</code></p>
+    <p><code>src/remote/remote_internal.c</code></p>
 
     <p>Each remote method invocation does the following:</p>
 
@@ -243,7 +243,7 @@
       The server side dispatchers are implemented in:
     </p>
 
-    <p><code>qemud/remote.c</code></p>
+    <p><code>daemon/remote.c</code></p>
 
     <p>Again, this step uses the .h files generated by make rpcgen.</p>
 

docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch

@@ -141,7 +141,7 @@ index b84729f..4f73baf 100644
 +                    parent_host,
 +                    operation_file) < 0) {
 +
-+        virReportOOMError(conn);
++        virReportOOMError();
 +        retval = -1;
 +        goto cleanup;
 +    }
@@ -151,7 +151,7 @@ index b84729f..4f73baf 100644
 +    fd = open(operation_path, O_WRONLY);
 +
 +    if (fd < 0) {
-+        virReportSystemError(conn, errno,
++        virReportSystemError(errno,
 +                             _("Could not open '%s' for vport operation"),
 +                             operation_path);
 +        retval = -1;
@@ -163,7 +163,7 @@ index b84729f..4f73baf 100644
 +                    wwpn,
 +                    wwnn) < 0) {
 +
-+        virReportOOMError(conn);
++        virReportOOMError();
 +        retval = -1;
 +        goto cleanup;
 +    }
@@ -171,7 +171,7 @@ index b84729f..4f73baf 100644
 +    towrite = strlen(vport_name);
 +    written = safewrite(fd, vport_name, towrite);
 +    if (written != towrite) {
-+        virReportSystemError(conn, errno,
++        virReportSystemError(errno,
 +                             _("Write of '%s' to '%s' during "
 +                               "vport create/delete failed "
 +                               "(towrite: %lu written: %d)"),
@@ -223,7 +223,7 @@ index b84729f..4f73baf 100644
 +        VIR_FREE(wwnn);
 +        VIR_FREE(wwpn);
 +        ret = -1;
-+        virReportOOMError(conn);
++        virReportOOMError();
 +    }
 +
 +    return ret;
@@ -431,7 +431,7 @@ index b84729f..4f73baf 100644
 +    obj = NULL;
 +
 +    if (parent_name == NULL) {
-+        virReportOOMError(dev->conn);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -478,7 +478,7 @@ index b84729f..4f73baf 100644
 +     * If this fails for any reason, we still have the backup of polling for
 +     * 5 seconds for device nodes.
 +     */
-+    virRun(conn, settleprog, &exitstatus);
++    virRun(settleprog, &exitstatus);
 +}
 +#else
 +void virNodeDeviceWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {}
@@ -550,7 +550,7 @@ index 6e04112..5b35b60 100644
 +{
 +    char *s;
 +
-+    s = virXPathString(conn, xpath, ctxt);
++    s = virXPathString(xpath, ctxt);
 +    if (s == NULL) {
 +        virNodeDeviceReportError(conn, VIR_ERR_INTERNAL_ERROR,
 +                                 missing_error_fmt,
@@ -611,7 +611,7 @@ index 6e04112..5b35b60 100644
          goto out;
 +    }
 +
-+    if ((n = virXPathNodeSet(conn, "./capability", ctxt, &nodes)) < 0) {
++    if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) {
 +        virNodeDeviceReportError(conn, VIR_ERR_INTERNAL_ERROR,
 +                                 _("error parsing SCSI host capabilities for '%s'"),
 +                                 def->name);
@@ -713,9 +713,9 @@ index 6e04112..5b35b60 100644
      }
  
      /* Extract device name */
--    def->name = virXPathString(conn, "string(./name[1])", ctxt);
+-    def->name = virXPathString("string(./name[1])", ctxt);
 +    if (create == EXISTING_DEVICE) {
-+        def->name = virXPathString(conn, "string(./name[1])", ctxt);
++        def->name = virXPathString("string(./name[1])", ctxt);
 +    } else {
 +        def->name = strdup("new device");
 +    }
@@ -964,7 +964,7 @@ index 0000000..1deb6d2
 +    if (virAsprintf(&sysfs_path, "%s/host%d",
 +                    LINUX_SYSFS_FC_HOST_PREFIX,
 +                    d->scsi_host.host) < 0) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -977,7 +977,7 @@ index 0000000..1deb6d2
 +
 +    if (virAsprintf(&wwnn_path, "%s/node_name",
 +                    sysfs_path) < 0) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -1002,7 +1002,7 @@ index 0000000..1deb6d2
 +
 +    d->scsi_host.wwnn = strndup(p, sizeof(buf));
 +    if (d->scsi_host.wwnn == NULL) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -1013,7 +1013,7 @@ index 0000000..1deb6d2
 +
 +    if (virAsprintf(&wwpn_path, "%s/port_name",
 +                    sysfs_path) < 0) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -1038,7 +1038,7 @@ index 0000000..1deb6d2
 +
 +    d->scsi_host.wwpn = strndup(p, sizeof(buf));
 +    if (d->scsi_host.wwpn == NULL) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -1066,7 +1066,7 @@ index 0000000..1deb6d2
 +    if (virAsprintf(&sysfs_path, "%s/host%d/vport_create",
 +                    LINUX_SYSFS_FC_HOST_PREFIX,
 +                    d->scsi_host.host) < 0) {
-+        virReportOOMError(NULL);
++        virReportOOMError();
 +        goto out;
 +    }
 +
@@ -1131,7 +1131,7 @@ index b154140..74759cf 100644
 -     * If this fails for any reason, we still have the backup of polling for
 -     * 5 seconds for device nodes.
 -     */
--    virRun(conn, settleprog, &exitstatus);
+-    virRun(settleprog, &exitstatus);
 +    virNodeDeviceWaitForDevices(conn);
 +    return;
  }

docs/apibuild.py

@@ -26,6 +26,7 @@ included_files = {
 
 ignored_words = {
   "ATTRIBUTE_UNUSED": (0, "macro keyword"),
+  "ATTRIBUTE_SENTINEL": (0, "macro keyword"),
   "VIR_DEPRECATED": (0, "macro keyword"),
   "WINAPI": (0, "Windows keyword"),
   "__declspec": (3, "Windows keyword"),
@@ -38,6 +39,7 @@ ignored_functions = {
   "virDomainMigratePerform": "private function for migration",
   "virDomainMigratePrepare": "private function for migration",
   "virDomainMigratePrepare2": "private function for migration",
+  "virDomainMigratePrepareTunnel": "private function for tunnelled migration",
   "virDrvSupportsFeature": "private function for remote access",
   "DllMain": "specific function for Win32",
 }
@@ -54,7 +56,9 @@ def uniq(items):
     d = {}
     for item in items:
         d[item]=1
-    return d.keys()
+    k = d.keys()
+    k.sort()
+    return k
 
 class identifier:
     def __init__(self, name, header=None, module=None, type=None, lineno = 0,
@@ -838,14 +842,20 @@ class CParser:
 		       arg, name))
 	while len(lines) > 0 and lines[0] == '*':
 	    del lines[0]
-	desc = ""
+	desc = None
 	while len(lines) > 0:
 	    l = lines[0]
-	    while len(l) > 0 and l[0] == '*':
-	        l = l[1:]
-	    l = string.strip(l)
-	    if len(l) >= 6 and  l[0:6] == "return" or l[0:6] == "Return":
-	        try:
+	    i = 0
+	    # Remove all leading '*', followed by at most one ' ' character
+	    # since we need to preserve correct identation of code examples
+	    while i < len(l) and l[i] == '*':
+		i = i + 1
+	    if i > 0:
+		if i < len(l) and l[i] == ' ':
+		    i = i + 1
+		l = l[i:]
+	    if len(l) >= 6 and  l[0:7] == "returns" or l[0:7] == "Returns":
+		try:
 		    l = string.split(l, ' ', 1)[1]
 		except:
 		    l = ""
@@ -859,9 +869,14 @@ class CParser:
 		    retdesc = retdesc + " " + l
 		    del lines[0]
 	    else:
-	        desc = desc + " " + l
+		if desc is not None:
+		    desc = desc + "\n" + l
+		else:
+		    desc = l
 		del lines[0]
 
+	if desc is None:
+	    desc = ""
 	retdesc = string.strip(retdesc)
 	desc = string.strip(desc)
 
@@ -1716,7 +1731,7 @@ class docBuilder:
             try:
 		(args, desc) = id.info
 		if desc != None and desc != "":
-		    output.write("      <info>%s</info>\n" % (escape(desc)))
+		    output.write("      <info><![CDATA[%s]]></info>\n" % (desc))
 		    self.indexString(name, desc)
 		for arg in args:
 		    (name, desc) = arg
@@ -1760,7 +1775,7 @@ class docBuilder:
             try:
 		desc = id.extra
 		if desc != None and desc != "":
-		    output.write(">\n      <info>%s</info>\n" % (escape(desc)))
+		    output.write(">\n      <info><![CDATA[%s]]></info>\n" % (desc))
 		    output.write("    </typedef>\n")
 		else:
 		    output.write("/>\n")
@@ -1796,7 +1811,7 @@ class docBuilder:
 	    output.write("      <cond>%s</cond>\n"% (apstr));
 	try:
 	    (ret, params, desc) = id.info
-	    output.write("      <info>%s</info>\n" % (escape(desc)))
+	    output.write("      <info><![CDATA[%s]]></info>\n" % (desc))
 	    self.indexString(name, desc)
 	    if ret[0] != None:
 	        if ret[0] == "void":
@@ -2087,13 +2102,17 @@ class docBuilder:
 
 def rebuild():
     builder = None
-    if glob.glob("../src/libvirt.c") != [] :
+    srcdir = os.environ["srcdir"]
+    if glob.glob(srcdir + "/../src/libvirt.c") != [] :
         print "Rebuilding API description for libvirt"
-	builder = docBuilder("libvirt", ["../src", "../include/libvirt"],
-	                     [])
+	builder = docBuilder("libvirt",
+                             [srcdir + "/../src",
+                              srcdir + "/../src/util",
+                              srcdir + "/../include/libvirt"],
+                             [])
     elif glob.glob("src/libvirt.c") != [] :
         print "Rebuilding API description for libvir"
-	builder = docBuilder("libvirt", ["src", "include/libvirt"],
+	builder = docBuilder("libvirt", ["src", "src/util", "include/libvirt"],
 	                     [])
     else:
         print "rebuild() failed, unable to guess the module"

docs/apps.html

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from apps.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Applications using libvirt</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="active" href="relatedlinks.html">Related Links</a>
-              <ul class="l1"><li>
-                  <div>
-                    <span class="active">Applications</span>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Applications using <strong>libvirt</strong></h1>
-        <p>
-      This page provides an illustration of the wide variety of
-      applications using the libvirt management API. If you know
-      of interesting applications not listed on this page, send
-      a message to the <a href="contact.html">mailing list</a>
-      to request that it be added here. If your application uses
-      libvirt as its API, the following graphic is available for
-      your website to advertise support for libvirt:
-    </p>
-        <p class="image">
-      <img src="madeWith.png" alt="Made with libvirt" /></p>
-        <h2>Command line tools</h2>
-        <dl><dt>virsh</dt><dd>
-	An interactive shell, and batch scriptable tool for performing
-	management tasks on all libvirt managed domains, networks and
-	storage. This is part of the libvirt core distribution.
-      </dd><dt><a href="http://virt-manager.org/">virt-install</a></dt><dd>
-	Provides a way to provision new virtual machines from a
-	OS distribution install tree. It supports provisioning from
-	local CD images, and the network over NFS, HTTP and FTP.
-      </dd><dt><a href="http://virt-manager.org/">virt-clone</a></dt><dd>
-	Allows the disk image(s) and configuration for an existing
-	virtual machine to be cloned to form a new virtual machine.
-	It automates copying of data across to new disk images, and
-	updates the UUID, Mac address and name in the configuration
-      </dd><dt><a href="http://virt-manager.org/">virt-image</a></dt><dd>
-	Provides a way to deploy virtual appliances. It defines a
-	simplified portable XML format describing the pre-requisites
-	of a virtual machine. At time of deployment this is translated
-	into the domain XML format for execution under any libvirt
-	hypervisor meeting the pre-requisites.
-      </dd><dt><a href="http://et.redhat.com/~rjones/virt-df/">virt-df</a></dt><dd>
-	Examine the utilization of each filesystem in a virtual machine
-	from the comfort of the host machine. This tool peeks into the
-	guest disks and determines how much space is used. It can cope
-	with common Linux filesystems and LVM volumes.
-      </dd><dt><a href="http://et.redhat.com/~rjones/virt-top/">virt-top</a></dt><dd>
-	Watch the CPU, memory, network and disk utilization of all
-	virtual machines running on a host.
-      </dd></dl>
-        <h2>Desktop applications</h2>
-        <dl><dt><a href="http://virt-manager.org/">virt-manager</a></dt><dd>
-	A general purpose desktop management tool, able to manage
-	virtual machines across both local and remotely accessed
-	hypervisors. It is targeted at home and small office usage
-	upto managing 10-20 hosts and their VMs.
-      </dd><dt><a href="http://virt-manager.org/">virt-viewer</a></dt><dd>
-	A lightweight tool for accessing the graphical console
-	associated with a virtual machine. It can securely connect
-	to remote consoles supporting the VNC protocol. Also provides
-	an optional mozilla browser plugin.
-      </dd></dl>
-        <h2>Web applications</h2>
-        <dl><dt><a href="http://ovirt.org/">oVirt</a></dt><dd>
-	oVirt provides the ability to manage large numbers of virtual
-	machines across an entire data center of hosts. It integrates
-	with FreeIPA for Kerberos authentication, and in the future,
-	certificate management.
-      </dd><dt><a href="http://community.abiquo.com/display/AbiCloud">AbiCloud</a></dt><dd>
-	AbiCloud is an open source cloud platform manager which allows to
-	easily deploy a private cloud in your datacenter. One of the key
-	differences of AbiCloud is the web rich interface for managing the
-	infrastructure. You can deploy a new service just dragging and
-	dropping a VM.
-      </dd></dl>
-        <h2>LiveCD / Appliances</h2>
-        <dl><dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt><dd>
-	A tool for converting a physical machine into a virtual machine. It
-	is a LiveCD which is booted on the machine to be converted. It collects
-	a little information from the user and then copies the disks over to
-	a remote machine and defines the XML for a domain to run the guest.
-      </dd></dl>
-        <h2>Monitoring plugins</h2>
-        <dl><dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt><dd>
-	The plugins provided by Guido Günther allow to monitor various things
-        like network and block I/O with
-        <a href="http://munin.projects.linpro.no/">Munin</a>.
-      </dd><dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt><dd>
-	The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a>
-        and gather statistics about virtualized guests on a system. This
-        way, you can collect CPU, network interface and block device usage
-        for each guest without installing collectd on the guest systems.
-        or a full description of available please refer to the libvirt section
-        in the collectd.conf(5) manual page.
-      </dd><dt><a href="http://et.redhat.com/~rjones/nagios-virt/">nagios-virt</a></dt><dd>
-	Nagios-virt is a configuration tool for adding monitoring of your
-	virtualised domains to <a href="http://www.nagios.org/">Nagios</a>.
-        You can use this tool to either set up a new Nagios installation for
-        your Xen or QEMU/KVM guests, or to integrate with your existing Nagios
-        installation.
-      </dd></dl>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/apps.html.in

@@ -21,42 +21,42 @@
     <dl>
       <dt>virsh</dt>
       <dd>
-	An interactive shell, and batch scriptable tool for performing
-	management tasks on all libvirt managed domains, networks and
-	storage. This is part of the libvirt core distribution.
+        An interactive shell, and batch scriptable tool for performing
+        management tasks on all libvirt managed domains, networks and
+        storage. This is part of the libvirt core distribution.
       </dd>
       <dt><a href="http://virt-manager.org/">virt-install</a></dt>
       <dd>
-	Provides a way to provision new virtual machines from a
-	OS distribution install tree. It supports provisioning from
-	local CD images, and the network over NFS, HTTP and FTP.
+        Provides a way to provision new virtual machines from a
+        OS distribution install tree. It supports provisioning from
+        local CD images, and the network over NFS, HTTP and FTP.
       </dd>
       <dt><a href="http://virt-manager.org/">virt-clone</a></dt>
       <dd>
-	Allows the disk image(s) and configuration for an existing
-	virtual machine to be cloned to form a new virtual machine.
-	It automates copying of data across to new disk images, and
-	updates the UUID, Mac address and name in the configuration
+        Allows the disk image(s) and configuration for an existing
+        virtual machine to be cloned to form a new virtual machine.
+        It automates copying of data across to new disk images, and
+        updates the UUID, Mac address and name in the configuration
       </dd>
       <dt><a href="http://virt-manager.org/">virt-image</a></dt>
       <dd>
-	Provides a way to deploy virtual appliances. It defines a
-	simplified portable XML format describing the pre-requisites
-	of a virtual machine. At time of deployment this is translated
-	into the domain XML format for execution under any libvirt
-	hypervisor meeting the pre-requisites.
+        Provides a way to deploy virtual appliances. It defines a
+        simplified portable XML format describing the pre-requisites
+        of a virtual machine. At time of deployment this is translated
+        into the domain XML format for execution under any libvirt
+        hypervisor meeting the pre-requisites.
       </dd>
       <dt><a href="http://et.redhat.com/~rjones/virt-df/">virt-df</a></dt>
       <dd>
-	Examine the utilization of each filesystem in a virtual machine
-	from the comfort of the host machine. This tool peeks into the
-	guest disks and determines how much space is used. It can cope
-	with common Linux filesystems and LVM volumes.
+        Examine the utilization of each filesystem in a virtual machine
+        from the comfort of the host machine. This tool peeks into the
+        guest disks and determines how much space is used. It can cope
+        with common Linux filesystems and LVM volumes.
       </dd>
       <dt><a href="http://et.redhat.com/~rjones/virt-top/">virt-top</a></dt>
       <dd>
-	Watch the CPU, memory, network and disk utilization of all
-	virtual machines running on a host.
+        Watch the CPU, memory, network and disk utilization of all
+        virtual machines running on a host.
       </dd>
     </dl>
 
@@ -65,17 +65,17 @@
     <dl>
       <dt><a href="http://virt-manager.org/">virt-manager</a></dt>
       <dd>
-	A general purpose desktop management tool, able to manage
-	virtual machines across both local and remotely accessed
-	hypervisors. It is targeted at home and small office usage
-	upto managing 10-20 hosts and their VMs.
+        A general purpose desktop management tool, able to manage
+        virtual machines across both local and remotely accessed
+        hypervisors. It is targeted at home and small office usage
+        upto managing 10-20 hosts and their VMs.
       </dd>
       <dt><a href="http://virt-manager.org/">virt-viewer</a></dt>
       <dd>
-	A lightweight tool for accessing the graphical console
-	associated with a virtual machine. It can securely connect
-	to remote consoles supporting the VNC protocol. Also provides
-	an optional mozilla browser plugin.
+        A lightweight tool for accessing the graphical console
+        associated with a virtual machine. It can securely connect
+        to remote consoles supporting the VNC protocol. Also provides
+        an optional mozilla browser plugin.
       </dd>
     </dl>
 
@@ -84,18 +84,18 @@
     <dl>
       <dt><a href="http://ovirt.org/">oVirt</a></dt>
       <dd>
-	oVirt provides the ability to manage large numbers of virtual
-	machines across an entire data center of hosts. It integrates
-	with FreeIPA for Kerberos authentication, and in the future,
-	certificate management.
+        oVirt provides the ability to manage large numbers of virtual
+        machines across an entire data center of hosts. It integrates
+        with FreeIPA for Kerberos authentication, and in the future,
+        certificate management.
       </dd>
       <dt><a href="http://community.abiquo.com/display/AbiCloud">AbiCloud</a></dt>
       <dd>
-	AbiCloud is an open source cloud platform manager which allows to
-	easily deploy a private cloud in your datacenter. One of the key
-	differences of AbiCloud is the web rich interface for managing the
-	infrastructure. You can deploy a new service just dragging and
-	dropping a VM.
+        AbiCloud is an open source cloud platform manager which allows to
+        easily deploy a private cloud in your datacenter. One of the key
+        differences of AbiCloud is the web rich interface for managing the
+        infrastructure. You can deploy a new service just dragging and
+        dropping a VM.
       </dd>
     </dl>
 
@@ -104,10 +104,10 @@
     <dl>
       <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt>
       <dd>
-	A tool for converting a physical machine into a virtual machine. It
-	is a LiveCD which is booted on the machine to be converted. It collects
-	a little information from the user and then copies the disks over to
-	a remote machine and defines the XML for a domain to run the guest.
+        A tool for converting a physical machine into a virtual machine. It
+        is a LiveCD which is booted on the machine to be converted. It collects
+        a little information from the user and then copies the disks over to
+        a remote machine and defines the XML for a domain to run the guest.
       </dd>
     </dl>
 
@@ -115,13 +115,13 @@
     <dl>
       <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt>
       <dd>
-	The plugins provided by Guido Günther allow to monitor various things
+        The plugins provided by Guido Günther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd>
       <dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt>
       <dd>
-	The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a>
+        The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a>
         and gather statistics about virtualized guests on a system. This
         way, you can collect CPU, network interface and block device usage
         for each guest without installing collectd on the guest systems.
@@ -130,8 +130,8 @@
       </dd>
       <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">nagios-virt</a></dt>
       <dd>
-	Nagios-virt is a configuration tool for adding monitoring of your
-	virtualised domains to <a href="http://www.nagios.org/">Nagios</a>.
+        Nagios-virt is a configuration tool for adding monitoring of your
+        virtualised domains to <a href="http://www.nagios.org/">Nagios</a>.
         You can use this tool to either set up a new Nagios installation for
         your Xen or QEMU/KVM guests, or to integrate with your existing Nagios
         installation.

docs/archdomain.html

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from archdomain.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Domain management architecture</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">Domains</span>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Providing isolated networks and NAT based network connectivity" class="inactive" href="archnetwork.html">Network</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing storage pools and volumes" class="inactive" href="archstorage.html">Storage</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enumerating host node devices" class="inactive" href="archnode.html">Node Devices</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Domain management architecture</h1>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/architecture.html

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from architecture.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: libvirt architecture</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>libvirt architecture</h1>
-        <p>Currently libvirt supports 2 kind of virtualization, and its
-internal structure is based on a driver model which simplifies adding new
-engines:</p>
-        <ul><li>
-        <a href="#Xen">Xen hypervisor</a>
-      </li><li>
-        <a href="#QEmu">QEmu and KVM based virtualization</a>
-      </li><li>
-        <a href="#drivers">the driver architecture</a>
-      </li></ul>
-        <h3>
-      <a name="Xen" id="Xen">Libvirt Xen support</a>
-    </h3>
-        <p>When running in a Xen environment, programs using libvirt have to execute
-in "Domain 0", which is the primary Linux OS loaded on the machine. That OS
-kernel provides most if not all of the actual drivers used by the set of
-domains. It also runs the Xen Store, a database of information shared by the
-hypervisor, the kernels, the drivers and the xen daemon. Xend. The xen daemon
-supervise the control and execution of the sets of domains. The hypervisor,
-drivers, kernels and daemons communicate though a shared system bus
-implemented in the hypervisor. The figure below tries to provide a view of
-this environment:</p>
-        <img src="architecture.gif" alt="The Xen architecture" />
-        <p>The library can be initialized in 2 ways depending on the level of
-privilege of the embedding program. If it runs with root access,
-virConnectOpen() can be used, it will use three different ways to connect to
-the Xen infrastructure:</p>
-        <ul><li>a connection to the Xen Daemon though an HTTP RPC layer</li><li>a read/write connection to the Xen Store</li><li>use Xen Hypervisor calls</li><li>when used as non-root libvirt connect to a proxy daemon running
-      as root and providing read-only support</li></ul>
-        <p>The library will usually interact with the Xen daemon for any operation
-changing the state of the system, but for performance and accuracy reasons
-may talk directly to the hypervisor when gathering state information at
-least when possible (i.e. when the running program using libvirt has root
-privilege access).</p>
-        <p>If it runs without root access virConnectOpenReadOnly() should be used to
-connect to initialize the library. It will then fork a libvirt_proxy
-program running as root and providing read_only access to the API, this is
-then only useful for reporting and monitoring.</p>
-        <h3>
-      <a name="QEmu" id="QEmu">Libvirt QEmu and KVM support</a>
-    </h3>
-        <p>The model for QEmu and KVM is completely similar, basically KVM is based
-on QEmu for the process controlling a new domain, only small details differs
-between the two. In both case the libvirt API is provided by a controlling
-process forked by libvirt in the background and which launch and control the
-QEmu or KVM process. That program called libvirt_qemud talks though a specific
-protocol to the library, and connects to the console of the QEmu process in
-order to control and report on its status. Libvirt tries to expose all the
-emulations models of QEmu, the selection is done when creating the new
-domain, by specifying the architecture and machine type targeted.</p>
-        <p>The code controlling the QEmu process is available in the
-<code>qemud/</code> directory.</p>
-        <h3>
-      <a name="drivers" id="drivers">the driver based architecture</a>
-    </h3>
-        <p>As the previous section explains, libvirt can communicate using different
-channels with the current hypervisor, and should also be able to use
-different kind of hypervisor. To simplify the internal design, code, ease
-maintenance and simplify the support of other virtualization engine the
-internals have been structured as one core component, the libvirt.c module
-acting as a front-end for the library API and a set of hypervisor drivers
-defining a common set of routines. That way the Xen Daemon access, the Xen
-Store one, the Hypervisor hypercall are all isolated in separate C modules
-implementing at least a subset of the common operations defined by the
-drivers present in driver.h:</p>
-        <ul><li>xend_internal: implements the driver functions though the Xen
-  Daemon</li><li>xs_internal: implements the subset of the driver available though the
-    Xen Store</li><li>xen_internal: provide the implementation of the functions possible via
-    direct hypervisor access</li><li>proxy_internal: provide read-only Xen access via a proxy, the proxy code
-    is in the <code>proxy/</code>directory.</li><li>xm_internal: provide support for Xen defined but not running
-    domains.</li><li>qemu_internal: implement the driver functions for QEmu and
-    KVM virtualization engines. It also uses a qemud/ specific daemon
-    which interacts with the QEmu process to implement libvirt API.</li><li>test: this is a test driver useful for regression tests of the
-    front-end part of libvirt.</li></ul>
-        <p>Note that a given driver may only implement a subset of those functions,
-(for example saving a Xen domain state to disk and restoring it is only
-possible though the Xen Daemon), in that case the driver entry points for
-unsupported functions are initialized to NULL.</p>
-        <p></p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/architecture.html.in

@@ -83,7 +83,7 @@ drivers present in driver.h:</p>
       <li>xen_internal: provide the implementation of the functions possible via
     direct hypervisor access</li>
       <li>proxy_internal: provide read-only Xen access via a proxy, the proxy code
-    is in the <code>proxy/</code>directory.</li>
+    is in the <code>proxy/</code> directory.</li>
       <li>xm_internal: provide support for Xen defined but not running
     domains.</li>
       <li>qemu_internal: implement the driver functions for QEmu and

docs/archnetwork.html

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from archnetwork.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Network management architecture</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">Network</span>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing storage pools and volumes" class="inactive" href="archstorage.html">Storage</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enumerating host node devices" class="inactive" href="archnode.html">Node Devices</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Network management architecture</h1>
-        <h2>Architecture illustration</h2>
-        <p>
-      The diagrams below illustrate some of the network configurations
-      enabled by the libvirt networking APIs
-    </p>
-        <ul><li><strong>VLAN 1</strong>. This virtual network has connectivity
-	to <code>LAN 2</code> with traffic forwarded and NATed.
-      </li><li><strong>VLAN 2</strong>. This virtual network is completely
-	isolated from any physical LAN.
-      </li><li><strong>Guest A</strong>. The first network interface is bridged
-	to the physical <code>LAN 1</code>. The second interface is connected
-	to a virtual network <code>VLAN 1</code>.
-      </li><li><strong>Guest B</strong>. The first network interface is connected
-	to a virtual network <code>VLAN 1</code>, giving it limited NAT
-	based connectivity to LAN2. It has a second network interface
-	connected to <code>VLAN 2</code>. It acts a router allowing limited
-	traffic between the two VLANs, thus giving <code>Guest C</code>
-	connectivity to the physical <code>LAN 2</code>.
-	</li><li><strong>Guest C</strong>. The only network interface is connected
-	to a virtual network <code>VLAN 2</code>. It has no direct connectivity
-	to a physical LAN, relying on <code>Guest B</code> to route traffic
-	on its behalf.
-      </li></ul>
-        <h3>Logical diagram</h3>
-        <p class="image">
-      <img src="libvirt-net-logical.png" alt="Logical network architecture" /></p>
-        <h3>Physical diagram</h3>
-        <p class="image">
-      <img src="libvirt-net-physical.png" alt="Physical network architecture" /></p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/archnetwork.html.in

@@ -11,26 +11,26 @@
 
     <ul>
       <li><strong>VLAN 1</strong>. This virtual network has connectivity
-	to <code>LAN 2</code> with traffic forwarded and NATed.
+        to <code>LAN 2</code> with traffic forwarded and NATed.
       </li>
       <li><strong>VLAN 2</strong>. This virtual network is completely
-	isolated from any physical LAN.
+        isolated from any physical LAN.
       </li>
       <li><strong>Guest A</strong>. The first network interface is bridged
-	to the physical <code>LAN 1</code>. The second interface is connected
-	to a virtual network <code>VLAN 1</code>.
+        to the physical <code>LAN 1</code>. The second interface is connected
+        to a virtual network <code>VLAN 1</code>.
       </li>
       <li><strong>Guest B</strong>. The first network interface is connected
-	to a virtual network <code>VLAN 1</code>, giving it limited NAT
-	based connectivity to LAN2. It has a second network interface
-	connected to <code>VLAN 2</code>. It acts a router allowing limited
-	traffic between the two VLANs, thus giving <code>Guest C</code>
-	connectivity to the physical <code>LAN 2</code>.
-	</li>
+        to a virtual network <code>VLAN 1</code>, giving it limited NAT
+        based connectivity to LAN2. It has a second network interface
+        connected to <code>VLAN 2</code>. It acts a router allowing limited
+        traffic between the two VLANs, thus giving <code>Guest C</code>
+        connectivity to the physical <code>LAN 2</code>.
+        </li>
       <li><strong>Guest C</strong>. The only network interface is connected
-	to a virtual network <code>VLAN 2</code>. It has no direct connectivity
-	to a physical LAN, relying on <code>Guest B</codE> to route traffic
-	on its behalf.
+        to a virtual network <code>VLAN 2</code>. It has no direct connectivity
+        to a physical LAN, relying on <code>Guest B</codE> to route traffic
+        on its behalf.
       </li>
     </ul>
 

docs/archnode.html

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from archnode.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Node device management architecture</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Providing isolated networks and NAT based network connectivity" class="inactive" href="archnetwork.html">Network</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing storage pools and volumes" class="inactive" href="archstorage.html">Storage</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">Node Devices</span>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Node device management architecture</h1>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/archstorage.html

@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from archstorage.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Storage management architecture</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Providing isolated networks and NAT based network connectivity" class="inactive" href="archnetwork.html">Network</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">Storage</span>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enumerating host node devices" class="inactive" href="archnode.html">Node Devices</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Storage management architecture</h1>
-        <p>
-      The storage management APIs are based around 2 core concepts
-    </p>
-        <ol><li>
-	<strong>Volume</strong> - a single storage volume which can
-	be assigned to a guest, or used for creating further pools. A
-	volume is either a block device, a raw file, or a special format
-	file.
-      </li><li>
-	<strong>Pool</strong> - provides a means for taking a chunk
-	of storage and carving it up into volumes. A pool can be used to
-	manage things such as a physical disk, a NFS server, a iSCSI target,
-	a host adapter, an LVM group.
-      </li></ol>
-        <p>
-      These two concepts are mapped through to two libvirt objects, a
-      <code>virStorageVolPtr</code> and a <code>virStoragePoolPtr</code>,
-      each with a collection of APIs for their management.
-    </p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/archstorage.html.in

@@ -7,16 +7,16 @@
     </p>
     <ol>
       <li>
-	<strong>Volume</strong> - a single storage volume which can
-	be assigned to a guest, or used for creating further pools. A
-	volume is either a block device, a raw file, or a special format
-	file.
+        <strong>Volume</strong> - a single storage volume which can
+        be assigned to a guest, or used for creating further pools. A
+        volume is either a block device, a raw file, or a special format
+        file.
       </li>
       <li>
-	<strong>Pool</strong> - provides a means for taking a chunk
-	of storage and carving it up into volumes. A pool can be used to
-	manage things such as a physical disk, a NFS server, a iSCSI target,
-	a host adapter, an LVM group.
+        <strong>Pool</strong> - provides a means for taking a chunk
+        of storage and carving it up into volumes. A pool can be used to
+        manage things such as a physical disk, a NFS server, a iSCSI target,
+        a host adapter, an LVM group.
       </li>
     </ol>
 

docs/auth.html

@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from auth.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Access control</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="active" href="deployment.html">Deployment</a>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="The URI formats used for connecting to libvirt" class="inactive" href="uri.html">URI format</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enable remote access over TCP" class="inactive" href="remote.html">Remote access</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <span class="active">Authentication</span>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Access the libvirt daemon from a native Windows client" class="inactive" href="windows.html">Windows port</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The library and the daemon logging support" class="inactive" href="logging.html">Logging</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Access control</h1>
-        <p>
-When connecting to libvirt, some connections may require client
-authentication before allowing use of the APIs. The set of possible
-authentication mechanisms is administrator controlled, independent
-of applications using libvirt.
-</p>
-        <ul><li>
-        <a href="#ACL_server_config">Server configuration</a>
-      </li><li>
-        <a href="#ACL_server_unix_perms">UNIX socket permissions/group</a>
-      </li><li>
-        <a href="#ACL_server_polkit">UNIX socket PolicyKit auth</a>
-      </li><li>
-        <a href="#ACL_server_username">Username/password auth</a>
-      </li><li>
-        <a href="#ACL_server_kerberos">Kerberos auth</a>
-      </li></ul>
-        <h3>
-          <a name="ACL_server_config" id="ACL_server_config">Server configuration</a>
-        </h3>
-        <p>
-The libvirt daemon allows the administrator to choose the authentication
-mechanisms used for client connections on each network socket independently.
-This is primarily controlled via the libvirt daemon master config file in
-<code>/etc/libvirt/libvirtd.conf</code>. Each of the libvirt sockets can
-have its authentication mechanism configured independently. There is
-currently a choice of <code>none</code>, <code>polkit</code>, and <code>sasl</code>.
-The SASL scheme can be further configured to choose between a large
-number of different mechanisms.
-</p>
-        <h3>
-          <a name="ACL_server_unix_perms" id="ACL_server_unix_perms">UNIX socket permissions/group</a>
-        </h3>
-        <p>
-If libvirt does not contain support for PolicyKit, then access control for
-the UNIX domain socket is done using traditional file user/group ownership
-and permissions. There are 2 sockets, one for full read-write access, the
-other for read-only access. The RW socket will be restricted (mode 0700) to
-only allow the <code>root</code> user to connect. The read-only socket will
-be open access (mode 0777) to allow any user to connect.
-</p>
-        <p>
-To allow non-root users greater access, the <code>libvirtd.conf</code> file
-can be edited to change the permissions via the <code>unix_sock_rw_perms</code>,
-config parameter and to set a user group via the <code>unix_sock_group</code>
-parameter. For example, setting the former to mode <code>0770</code> and the
-latter <code>wheel</code> would let any user in the wheel group connect to
-the libvirt daemon.
-</p>
-        <h3>
-          <a name="ACL_server_polkit" id="ACL_server_polkit">UNIX socket PolicyKit auth</a>
-        </h3>
-        <p>
-If libvirt contains support for PolicyKit, then access control options are
-more advanced. The <code>unix_sock_auth</code> parameter will default to
-<code>polkit</code>, and the file permissions will default to <code>0777</code>
-even on the RW socket. Upon connecting to the socket, the client application
-will be required to identify itself with PolicyKit. The default policy for the
-RW daemon socket will require any application running in the current desktop
-session to authenticate using the user's password. This is akin to <code>sudo</code>
-auth, but does not require that the client application ultimately run as root.
-Default policy will still allow any application to connect to the RO socket.
-</p>
-        <p>
-The default policy can be overridden by the administrator using the PolicyKit
-master configuration file in <code>/etc/PolicyKit/PolicyKit.conf</code>. The
-<code>PolicyKit.conf(5)</code> manual page provides details on the syntax
-available. The two libvirt daemon actions available are named <code>org.libvirt.unix.monitor</code>
-for the RO socket, and <code>org.libvirt.unix.manage</code> for the RW socket.
-</p>
-        <p>
-As an example, to allow a user <code>fred</code>full access to the RW socket,
-while requiring <code>joe</code> to authenticate with the admin password,
-would require adding the following snippet to <code>PolicyKit.conf</code>.
-</p>
-        <pre>
-  &lt;match action="org.libvirt.unix.manage"&gt;
-    &lt;match user="fred"&gt;
-      &lt;return result="yes"/&gt;
-    &lt;/match&gt;
-  &lt;/match&gt;
-  &lt;match action="org.libvirt.unix.manage"&gt;
-    &lt;match user="joe"&gt;
-      &lt;return result="auth_admin"/&gt;
-    &lt;/match&gt;
-  &lt;/match&gt;
-</pre>
-        <h3>
-          <a name="ACL_server_username" id="ACL_server_username">Username/password auth</a>
-        </h3>
-        <p>
-The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
-The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
-username+password style authentication. It also provides for encryption of the data
-stream, so the security of the plain TCP socket is on a par with that of the TLS
-socket. If desired the UNIX socket and TLS socket can also have SASL enabled by
-setting the <code>auth_unix_ro</code>, <code>auth_unix_rw</code>, <code>auth_tls</code>
-config params in <code>libvirt.conf</code>.
-</p>
-        <p>
-Out of the box, no user accounts are defined, so no clients will be able to authenticate
-on the TCP socket. Adding users and setting their passwords is done with the <code>saslpasswd2</code>
-command. When running this command it is important to tell it that the appname is <code>libvirt</code>.
-As an example, to add a user <code>fred</code>, run
-</p>
-        <pre>
-# saslpasswd2 -a libvirt fred
-Password: xxxxxx
-Again (for verification): xxxxxx
-</pre>
-        <p>
-To see a list of all accounts the <code>sasldblistusers2</code> command can be used.
-This command expects to be given the path to the libvirt user database, which is kept
-in <code>/etc/libvirt/passwd.db</code>
-</p>
-        <pre>
-# sasldblistusers2 -f /etc/libvirt/passwd.db
-fred@t60wlan.home.berrange.com: userPassword
-</pre>
-        <p>
-Finally, to disable a user's access, the <code>saslpasswd2</code> command can be used
-again:
-</p>
-        <pre>
-# saslpasswd2 -a libvirt -d fred
-</pre>
-        <h3>
-          <a name="ACL_server_kerberos" id="ACL_server_kerberos">Kerberos auth</a>
-        </h3>
-        <p>
-The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
-The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
-username+password style authentication. To enable Kerberos single-sign-on instead,
-the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
-The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
-instead of the default <code>digest-md5</code>. If SASL is enabled on the UNIX
-and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos
-mechanism provides data encryption of the session.
-</p>
-        <p>
-Some operating systems do not install the SASL kerberos plugin by default. It
-may be necessary to install a sub-package such as <code>cyrus-sasl-gssapi</code>.
-To check whether the Kerberos plugin is installed run the <code>pluginviewer</code>
-program and verify that <code>gssapi</code> is listed,eg:
-</p>
-        <pre>
-# pluginviewer
-...snip...
-Plugin "gssapiv2" [loaded],     API version: 4
-        SASL mechanism: GSSAPI, best SSF: 56
-        security flags: NO_ANONYMOUS|NO_PLAINTEXT|NO_ACTIVE|PASS_CREDENTIALS|MUTUAL_AUTH
-        features: WANT_CLIENT_FIRST|PROXY_AUTHENTICATION|NEED_SERVER_FQDN
-</pre>
-        <p>
-Next is is necessary for the administrator of the Kerberos realm to issue a principle
-for the libvirt server. There needs to be one principle per host running the libvirt
-daemon. The principle should be named <code>libvirt/full.hostname@KERBEROS.REALM</code>.
-This is typically done by running the <code>kadmin.local</code> command on the Kerberos
-server, though some Kerberos servers have alternate ways of setting up service principles.
-Once created, the principle should be exported to a keytab, copied to the host running
-the libvirt daemon and placed in <code>/etc/libvirt/krb5.tab</code>
-</p>
-        <pre>
-# kadmin.local
-kadmin.local: add_principal libvirt/foo.example.com
-Enter password for principal "libvirt/foo.example.com@EXAMPLE.COM":
-Re-enter password for principal "libvirt/foo.example.com@EXAMPLE.COM":
-Principal "libvirt/foo.example.com@EXAMPLE.COM" created.
-
-kadmin.local:  ktadd -k /root/libvirt-foo-example.tab libvirt/foo.example.com@EXAMPLE.COM
-Entry for principal libvirt/foo.example.com@EXAMPLE.COM with kvno 4, encryption type Triple DES cbc mode with HMAC/sha1 added to keytab WRFILE:/root/libvirt-foo-example.tab.
-Entry for principal libvirt/foo.example.com@EXAMPLE.COM with kvno 4, encryption type ArcFour with HMAC/md5 added to keytab WRFILE:/root/libvirt-foo-example.tab.
-Entry for principal libvirt/foo.example.com@EXAMPLE.COM with kvno 4, encryption type DES with HMAC/sha1 added to keytab WRFILE:/root/libvirt-foo-example.tab.
-Entry for principal libvirt/foo.example.com@EXAMPLE.COM with kvno 4, encryption type DES cbc mode with RSA-MD5 added to keytab WRFILE:/root/libvirt-foo-example.tab.
-
-kadmin.local: quit
-
-# scp /root/libvirt-foo-example.tab root@foo.example.com:/etc/libvirt/krb5.tab
-# rm /root/libvirt-foo-example.tab
-</pre>
-        <p>
-Any client application wishing to connect to a Kerberos enabled libvirt server
-merely needs to run <code>kinit</code> to gain a user principle. This may well
-be done automatically when a user logs into a desktop session, if PAM is setup
-to authenticate against Kerberos.
-</p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/auth.html.in

@@ -72,7 +72,7 @@ available. The two libvirt daemon actions available are named <code>org.libvirt.
 for the RO socket, and <code>org.libvirt.unix.manage</code> for the RW socket.
 </p>
     <p>
-As an example, to allow a user <code>fred</code>full access to the RW socket,
+As an example, to allow a user <code>fred</code> full access to the RW socket,
 while requiring <code>joe</code> to authenticate with the admin password,
 would require adding the following snippet to <code>PolicyKit.conf</code>.
 </p>
@@ -151,7 +151,7 @@ Plugin "gssapiv2" [loaded],     API version: 4
         features: WANT_CLIENT_FIRST|PROXY_AUTHENTICATION|NEED_SERVER_FQDN
 </pre>
     <p>
-Next is is necessary for the administrator of the Kerberos realm to issue a principle
+Next it is necessary for the administrator of the Kerberos realm to issue a principle
 for the libvirt server. There needs to be one principle per host running the libvirt
 daemon. The principle should be named <code>libvirt/full.hostname@KERBEROS.REALM</code>.
 This is typically done by running the <code>kadmin.local</code> command on the Kerberos

docs/bindings.html

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from bindings.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Bindings for other languages</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <span class="active">Language bindings</span>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="overview of the python API bindings" class="inactive" href="python.html">Python</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="overview of the Java API bindings" class="inactive" href="java.html">Java</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Bindings for other languages</h1>
-        <p>Libvirt comes with bindings to support other languages than
-pure <strong>C</strong>. First the headers embeds the necessary declarations to
-allow direct access from <strong>C++</strong> code, but also we have bindings for
-higher level kind of languages:</p>
-        <ul><li><strong>Python</strong>: Libvirt comes with direct support for the Python language
-     (just make sure you installed the libvirt-python package if not
-     compiling from sources). See below for more information about
-     using libvirt with python</li><li><strong>Perl</strong>: Daniel Berrange provides <a href="http://search.cpan.org/dist/Sys-Virt/">bindings for
-     Perl</a>.</li><li><strong>OCaml</strong>: Richard Jones supplies <a href="http://libvirt.org/ocaml/">bindings for OCaml</a>.</li><li><strong>Ruby</strong>: David Lutterkort provides <a href="http://libvirt.org/ruby/">bindings for Ruby</a>.</li><li><strong>Java</strong>: Daniel Veillard maintains <a href="java.html">Java bindings</a>.</li><li><strong>C#</strong>: Richard Jones wrote about <a href="https://www.redhat.com/archives/libvir-list/2008-September/msg00283.html">calling libvirt from C# on the mailing list</a>.</li></ul>
-        <p>For information on using libvirt on <strong>Windows</strong>
-      <a href="windows.html">please see the Windows
-        support page</a>.
-    </p>
-        <p>Support, requests or help for libvirt bindings are welcome on
-the <a href="https://www.redhat.com/mailman/listinfo/libvir-list/">mailing
-list</a>, as usual try to provide enough background information
-and make sure you use recent version, see the <a href="bugs.html">help
-page</a>.</p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/bindings.html.in

@@ -15,7 +15,7 @@ higher level kind of languages:</p>
       <li><strong>OCaml</strong>: Richard Jones supplies <a href="http://libvirt.org/ocaml/">bindings for OCaml</a>.</li>
       <li><strong>Ruby</strong>: David Lutterkort provides <a href="http://libvirt.org/ruby/">bindings for Ruby</a>.</li>
       <li><strong>Java</strong>: Daniel Veillard maintains <a href="java.html">Java bindings</a>.</li>
-      <li><strong>C#</strong>: Richard Jones wrote about <a href="https://www.redhat.com/archives/libvir-list/2008-September/msg00283.html">calling libvirt from C# on the mailing list</a>.</li>
+      <li><strong>C#</strong>: Jarom&iacute;r &#x010C;ervenka maintains <a href="http://svn.i-tux.cz/listing.php?repname=SharpLibVirt">C# bindings here</a>.</li>
     </ul>
     <p>For information on using libvirt on <strong>Windows</strong>
       <a href="windows.html">please see the Windows

docs/bugs.html

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from bugs.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Bug reporting</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <span class="active">Bug reports</span>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Bug reporting</h1>
-        <p>
-      The <a href="http://bugzilla.redhat.com">Red Hat Bugzilla Server</a>
-      should be used to report bugs and request features against libvirt.
-      Before submitting a ticket, check the existing tickets to see if
-      the bug/feature is already tracked.
-    </p>
-        <h2>General libvirt bug reports</h2>
-        <p>
-      If you are using official libvirt binaries from a Linux distribution
-      check below for distribution specific bug reporting policies first.
-      For general libvirt bug reports, from self-built releases, CVS snapshots
-      and any other non-distribution supported builds, enter tickets under
-      the <code>Virtualization Tools</code> product and the <code>libvirt</code>
-      component.
-    </p>
-        <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Virtualization%20Tools">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20Tools&amp;component=libvirt">New libvirt ticket</a></li></ul>
-        <h2>Linux Distribution specific bug reports</h2>
-        <ul><li>
-	If you are using official binaries from a <strong>Fedora distribution</strong>, enter
-	tickets against the <code>Fedora</code> product and the <code>libvirt</code>
-	component.
-	<ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Fedora">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li></ul></li><li>
-	If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>,
-	tickets against the <code>Red Hat Enterprise Linux 5</code> product and
-	the <code>libvirt</code> component.
-	<ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Red%20Hat%20Enterprise%20Linux%205">View Red Hat Enterprise Linux libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li></ul></li><li>
-	If you are using official binaries from another Linux distribution first
-	follow their own bug reporting guidelines.
-      </li></ul>
-        <h2>How to file high quality bug reports</h2>
-        <p>
-      To increase the likelihood of your bug report being addressed it is
-      important to provide as much information as possible. When filing
-      libvirt bugs use this checklist to see if you are providing enough
-      information:
-    </p>
-        <ul><li>The version number of the libvirt build, or date of the CVS
-	checkout</li><li>The hardware architecture being used</li><li>The name of the hypervisor (Xen, QEMU, KVM)</li><li>The XML config of the guest domain if relevant</li><li>For Xen hypervisor, the XenD logfile from /var/log/xen</li><li>For QEMU/KVM, the domain logfile from /var/log/libvirt/qemu</li></ul>
-        <p>
-      If requesting a new feature attach any available patch to the ticket
-      and also email the patch to the libvirt mailing list for discussion
-    </p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/bugs.html.in

@@ -16,7 +16,7 @@
     <p>
       If you are using official libvirt binaries from a Linux distribution
       check below for distribution specific bug reporting policies first.
-      For general libvirt bug reports, from self-built releases, CVS snapshots
+      For general libvirt bug reports, from self-built releases, GIT snapshots
       and any other non-distribution supported builds, enter tickets under
       the <code>Virtualization Tools</code> product and the <code>libvirt</code>
       component.
@@ -30,26 +30,26 @@
     <h2>Linux Distribution specific bug reports</h2>
     <ul>
       <li>
-	If you are using official binaries from a <strong>Fedora distribution</strong>, enter
-	tickets against the <code>Fedora</code> product and the <code>libvirt</code>
-	component.
-	<ul>
-	  <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Fedora">View Fedora libvirt tickets</a></li>
-	  <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li>
-	</ul>
+        If you are using official binaries from a <strong>Fedora distribution</strong>, enter
+        tickets against the <code>Fedora</code> product and the <code>libvirt</code>
+        component.
+        <ul>
+          <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Fedora">View Fedora libvirt tickets</a></li>
+          <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li>
+        </ul>
       </li>
       <li>
-	If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>,
-	tickets against the <code>Red Hat Enterprise Linux 5</code> product and
-	the <code>libvirt</code> component.
-	<ul>
-	  <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Red%20Hat%20Enterprise%20Linux%205">View Red Hat Enterprise Linux libvirt tickets</a></li>
-	  <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li>
-	</ul>
+        If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>,
+        tickets against the <code>Red Hat Enterprise Linux 5</code> product and
+        the <code>libvirt</code> component.
+        <ul>
+          <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Red%20Hat%20Enterprise%20Linux%205">View Red Hat Enterprise Linux libvirt tickets</a></li>
+          <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li>
+        </ul>
       </li>
       <li>
-	If you are using official binaries from another Linux distribution first
-	follow their own bug reporting guidelines.
+        If you are using official binaries from another Linux distribution first
+        follow their own bug reporting guidelines.
       </li>
     </ul>
 
@@ -64,8 +64,8 @@
     </p>
 
     <ul>
-      <li>The version number of the libvirt build, or date of the CVS
-	checkout</li>
+      <li>The version number of the libvirt build, or SHA1 of the GIT
+        commit</li>
       <li>The hardware architecture being used</li>
       <li>The name of the hypervisor (Xen, QEMU, KVM)</li>
       <li>The XML config of the guest domain if relevant</li>

docs/contact.html

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from contact.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Contacting the development team</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <span class="active">Contact</span>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Contacting the development team</h1>
-        <h2>Mailing list</h2>
-        <p>
-      There is a mailing-list <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> for libvirt,
-      with an  <a href="https://www.redhat.com/archives/libvir-list/">on-line archive</a>.
-      Please subscribe to this list before posting by visiting the
-      <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a>
-      page and follow the instructions. Patches with explanations and provided as
-      attachments are really appreciated and will be discussed on the mailing list.
-      If possible generate the patches by using <code>cvs diff -up</code> in a CVS
-      checkout.
-    </p>
-        <h2>IRC discussion</h2>
-        <p>
-      Some of the libvirt developers may be found on IRC on the <a href="http://oftc.net">OFTC IRC</a>
-      network. Use the settings:
-    </p>
-        <ul><li>server: irc.oftc.net</li><li>port: 6667 (the usual IRC port)</li><li>channel: #virt</li></ul>
-        <p>
-      NB There is no guarantee that someone will be watching or able to reply
-      promptly, so use the mailing-list if you don't get an answer on the IRC
-      channel.
-    </p>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/contact.html.in

@@ -3,17 +3,46 @@
   <body>
     <h1>Contacting the development team</h1>
 
-    <h2>Mailing list</h2>
+    <h2>Mailing lists</h2>
 
     <p>
-      There is a mailing-list <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> for libvirt,
-      with an  <a href="https://www.redhat.com/archives/libvir-list/">on-line archive</a>.
-      Please subscribe to this list before posting by visiting the
-      <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a>
-      page and follow the instructions. Patches with explanations and provided as
-      attachments are really appreciated and will be discussed on the mailing list.
-      If possible generate the patches by using <code>cvs diff -up</code> in a CVS
-      checkout.
+      There are two mailing-lists:
+    </p>
+
+    <dl>
+      <dt><a href="https://www.redhat.com/archives/libvir-list/">libvir-list@redhat.com</a></dt>
+      <dd>This list a place for discussions about the <strong>development</strong> of libvirt. Topics for discussion include
+	<ul>
+	  <li>New features for libvirt</li>
+	  <li>Bug fixing of libvirt</li>
+	  <li>New hypervisor drivers</li>
+	  <li>Development of language bindings for libvirt API</li>
+	  <li>Testing and documentation of libvirt</li>
+	</ul>
+      </dd>
+
+      <dt><a href="">libvirt-users@redhat.com</a></dt>
+      <dd>This list a place for discussions involving libvirt <strong>users</strong>. Topics for discussion include
+	<ul>
+	  <li>Usage of libvirt / virsh</li>
+	  <li>Administration of libvirtd</li>
+	  <li>Deployment of libvirt with hypervisors</li>
+	  <li>Development of applications on top of / using the libvirt API(s)</li>
+	  <li>Any other topics along these lines</li>
+	</ul>
+      </dd>
+    </dl>
+
+    <p>
+      Both mailing lists require that you subscribe before posting to the list,
+      otherwise your posting will be delayed for manual approval by mailman.
+      You can subscribe at the linked webpages above.
+    </p>
+    <p>
+      Patches with explanations and provided as attachments are really appreciated and should
+      be directed to the development mailing list will be discussed on the mailing list.
+      If possible generate the patches by using <code>git format-patch</code> in a GIT
+      clone.
     </p>
 
     <h2>IRC discussion</h2>

docs/deployment.html

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from deployment.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Deployment</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <span class="active">Deployment</span>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="The URI formats used for connecting to libvirt" class="inactive" href="uri.html">URI format</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Enable remote access over TCP" class="inactive" href="remote.html">Remote access</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Configure authentication for the libvirt daemon" class="inactive" href="auth.html">Authentication</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Access the libvirt daemon from a native Windows client" class="inactive" href="windows.html">Windows port</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="The library and the daemon logging support" class="inactive" href="logging.html">Logging</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Deployment</h1>
-        <h2>Pre-packaged releases</h2>
-        <p>
-      The libvirt API is now available in all major Linux distributions
-      so the simplest deployment approach is to use your distributions'
-      package management software to install the <code>libvirt</code>
-      module.
-    </p>
-        <h2>Self-built releases</h2>
-        <p>
-      libvirt uses GNU autotools for its build system, so deployment
-      follows the usual process of <code>configure; make ; make install</code>
-    </p>
-        <pre>
-
-      # ./configure --prefix=$HOME/usr
-      # make
-      # make install
-    </pre>
-        <h2>Built from CVS / GIT</h2>
-        <p>
-      When building from CVS it is necessary to generate the autotools
-      support files. This requires having <code>autoconf</code>,
-      <code>automake</code>, <code>libtool</code> and <code>intltool</code>
-      installed. The process can be automated with the <code>autogen.sh</code>
-      script.
-    </p>
-        <pre>
-
-      # ./autogen.sh --prefix=$HOME/usr
-      # make
-      # make install
-    </pre>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/deployment.html.in

@@ -25,10 +25,10 @@
       # make install
     </pre>
 
-    <h2>Built from CVS / GIT</h2>
+    <h2>Built from GIT</h2>
 
     <p>
-      When building from CVS it is necessary to generate the autotools
+      When building from GIT it is necessary to generate the autotools
       support files. This requires having <code>autoconf</code>,
       <code>automake</code>, <code>libtool</code> and <code>intltool</code>
       installed. The process can be automated with the <code>autogen.sh</code>

docs/devhelp/.gitignore

@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 libvirt.devhelp
+*.html

docs/devhelp/Makefile.am

@@ -1,29 +0,0 @@
-DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
-HTML_FILES=index.html general.html $(HTML_MODULES)
-HTML_MODULES=				\
-	libvirt-libvirt.html		\
-	libvirt-virterror.html
-
-EXTRA_FORMAT=				\
-	home.png			\
-	left.png			\
-	right.png			\
-	up.png				\
-	style.css
-
-EXTRA_DIST=devhelp.xsl html.xsl libvirt.devhelp $(HTML_FILES) $(EXTRA_FORMAT)
-
-all: libvirt.devhelp $(HTML_FILES)
-
-libvirt.devhelp $(HTML_FILES): $(srcdir)/devhelp.xsl html.xsl $(top_srcdir)/docs/libvirt-api.xml
-	-@(echo Rebuilding devhelp files)
-	-@(if [ -x $(XSLTPROC) ] ; then \
-	  $(XSLTPROC) --nonet -o libvirt.devhelp $(srcdir)/devhelp.xsl $(top_srcdir)/docs/libvirt-api.xml ; fi );
-
-install-data-local: libvirt.devhelp $(HTML_FILES)
-	$(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR)
-	-@INSTALL@ -m 0644 libvirt.devhelp $(DESTDIR)$(DEVHELP_DIR)
-	-@INSTALL@ -m 0644 $(HTML_FILES) $(DESTDIR)$(DEVHELP_DIR)
-	-for file in $(EXTRA_FORMAT); do \
-	    @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
-	done

docs/devhelp/general.html

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>libvirt: </title>
-    <meta name="generator" content="Libvirt devhelp stylesheet"/>
-    <link rel="start" href="index.html" title="libvirt Reference Manual"/>
-    <link rel="up" href="index.html" title="libvirt Reference Manual"/>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-    <link rel="chapter" href="index.html" title="libvirt Reference Manual"/>
-  </head>
-  <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-    <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-      <tr valign="middle">
-        <td>
-          <a accesskey="u" href="index.html">
-            <img src="up.png" width="24" height="24" border="0" alt="Up"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="h" href="index.html">
-            <img src="home.png" width="24" height="24" border="0" alt="Home"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="n" href="libvirt-libvirt.html">
-            <img src="right.png" width="24" height="24" border="0" alt="Next"/>
-          </a>
-        </td>
-        <th width="100%" align="center">libvirt Reference Manual</th>
-      </tr>
-    </table>
-    <h2>
-      <span class="refentrytitle">libvirt API Modules</span>
-    </h2>
-    <p><a href="libvirt-libvirt.html">libvirt</a> - core interfaces for the libvirt library<br/><a href="libvirt-virterror.html">virterror</a> - error handling interfaces for the libvirt library<br/></p>
-  </body>
-</html>

docs/devhelp/index.html

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>libvirt Reference Manual</title>
-    <meta name="generator" content="Libvirt devhelp stylesheet"/>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-  </head>
-  <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-    <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-      <tr valign="middle">
-        <td>
-          <a accesskey="h" href="index.html">
-            <img src="home.png" width="24" height="24" border="0" alt="Home"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="n" href="general.html">
-            <img src="right.png" width="24" height="24" border="0" alt="Next"/>
-          </a>
-        </td>
-        <th width="100%" align="center">libvirt Reference Manual</th>
-      </tr>
-    </table>
-    <h2>
-      <span class="refentrytitle">libvirt Reference Manual</span>
-    </h2>
-    <p>Libvir is a C toolkit to interact with the virtualization capabilities of
-recent versions of Linux (and other OSes). It is free software available
-under the <a href="http://www.opensource.org/licenses/lgpl-license.html">GNU
-Lesser General Public License</a>. Virtualization of the Linux Operating
-System means the ability to run multiple instances of Operating Systems
-concurrently on a single hardware system where the basic resources are driven
-by a Linux instance. The library aim at providing long term stable C API
-initially for the <a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen
-paravirtualization</a> but should be able to integrate other virtualization
-mechanisms if needed.</p>
-    <p> If you get lost searching for some specific API use, try
-<a href="http://libvirt.org/search.php">the online search
-engine</a> hosted on <a href="http://libvirt.org/">libvirt.org</a>
-it indexes the project page, the APIs as well as the mailing-list archives. </p>
-  </body>
-</html>

docs/devhelp/libvirt-conf.html

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>conf: </title>
-    <meta name="generator" content="Libvirt devhelp stylesheet"/>
-    <link rel="start" href="index.html" title="libvirt Reference Manual"/>
-    <link rel="up" href="general.html" title="API"/>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-    <link rel="chapter" href="general.html" title="API"/>
-  </head>
-  <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-    <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-      <tr valign="middle">
-        <td>
-          <a accesskey="p" href="libvirt-virterror.html">
-            <img src="left.png" width="24" height="24" border="0" alt="Prev"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="u" href="general.html">
-            <img src="up.png" width="24" height="24" border="0" alt="Up"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="h" href="index.html">
-            <img src="home.png" width="24" height="24" border="0" alt="Home"/>
-          </a>
-        </td>
-        <th width="100%" align="center">libvirt Reference Manual</th>
-      </tr>
-    </table>
-    <h2>
-      <span class="refentrytitle">conf</span>
-    </h2>
-    <p>conf - </p>
-    <p></p>
-    <p>Author(s): </p>
-    <div class="refsynopsisdiv">
-      <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libvirt-conf.html#virConfValue">virConfValue</a> * <a href="#virConfValuePtr">virConfValuePtr</a>;
-typedef enum <a href="#virConfType">virConfType</a>;
-typedef struct _virConfValue <a href="#virConfValue">virConfValue</a>;
-typedef struct _virConf <a href="#virConf">virConf</a>;
-typedef <a href="libvirt-conf.html#virConf">virConf</a> * <a href="#virConfPtr">virConfPtr</a>;
-int	<a href="#virConfWriteFile">virConfWriteFile</a>		(const char * filename, <br/>					 <a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf);
-<a href="libvirt-conf.html#virConfValuePtr">virConfValuePtr</a>	<a href="#virConfGetValue">virConfGetValue</a>		(<a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf, <br/>					 const char * setting);
-<a href="libvirt-conf.html#virConfPtr">virConfPtr</a>	<a href="#virConfReadMem">virConfReadMem</a>		(const char * memory, <br/>					 int len);
-int	<a href="#virConfFree">virConfFree</a>			(<a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf);
-<a href="libvirt-conf.html#virConfPtr">virConfPtr</a>	<a href="#virConfReadFile">virConfReadFile</a>		(const char * filename);
-int	<a href="#virConfWriteMem">virConfWriteMem</a>			(char * memory, <br/>					 int * len, <br/>					 <a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf);
-</pre>
-    </div>
-    <div class="refsect1" lang="en">
-      <h2>Description</h2>
-    </div>
-    <div class="refsect1" lang="en">
-      <h2>Details</h2>
-      <div class="refsect2" lang="en">
-        <div class="refsect2" lang="en"><h3><a name="virConf">Structure </a>virConf</h3><pre class="programlisting">struct _virConf {
-The content of this structure is not made public by the API.
-} virConf;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfPtr">Typedef </a>virConfPtr</h3><pre class="programlisting"><a href="libvirt-conf.html#virConf">virConf</a> * virConfPtr;
-</pre><p>a pointer to a parsed configuration file</p>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfType">Enum </a>virConfType</h3><pre class="programlisting">enum <a href="#virConfType">virConfType</a> {
-    <a name="VIR_CONF_NONE">VIR_CONF_NONE</a> = 0 /* undefined */
-    <a name="VIR_CONF_LONG">VIR_CONF_LONG</a> = 1 /* a long int */
-    <a name="VIR_CONF_STRING">VIR_CONF_STRING</a> = 2 /* a string */
-    <a name="VIR_CONF_LIST">VIR_CONF_LIST</a> = 3 /*  a list */
-};
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfValue">Structure </a>virConfValue</h3><pre class="programlisting">struct _virConfValue {
-    <a href="libvirt-conf.html#virConfType">virConfType</a>	type	: the <a href="libvirt-conf.html#virConfType">virConfType</a>
-    <a href="libvirt-conf.html#virConfValuePtr">virConfValuePtr</a>	next	: next element if in a list
-    long	l	: long integer
-    char *	str	: pointer to 0 terminated string
-    <a href="libvirt-conf.html#virConfValuePtr">virConfValuePtr</a>	list	: list of a list
-} virConfValue;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfValuePtr">Typedef </a>virConfValuePtr</h3><pre class="programlisting"><a href="libvirt-conf.html#virConfValue">virConfValue</a> * virConfValuePtr;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfFree"/>virConfFree ()</h3><pre class="programlisting">int	virConfFree			(<a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf)<br/>
-</pre><p>Frees all data associated to the handle</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conf</tt></i>:</span></td><td>a configuration file handle</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfGetValue"/>virConfGetValue ()</h3><pre class="programlisting"><a href="libvirt-conf.html#virConfValuePtr">virConfValuePtr</a>	virConfGetValue		(<a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf, <br/>					 const char * setting)<br/>
-</pre><p>Lookup the value associated to this entry in the configuration file</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conf</tt></i>:</span></td><td>a configuration file handle</td></tr><tr><td><span class="term"><i><tt>setting</tt></i>:</span></td><td/></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the value or NULL if the lookup failed, the data associated will be freed when virConfFree() is called</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfReadFile"/>virConfReadFile ()</h3><pre class="programlisting"><a href="libvirt-conf.html#virConfPtr">virConfPtr</a>	virConfReadFile		(const char * filename)<br/>
-</pre><p>Reads a configuration file.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>filename</tt></i>:</span></td><td>the path to the configuration file.</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>an handle to lookup settings or NULL if it failed to read or parse the file, use virConfFree() to free the data.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfReadMem"/>virConfReadMem ()</h3><pre class="programlisting"><a href="libvirt-conf.html#virConfPtr">virConfPtr</a>	virConfReadMem		(const char * memory, <br/>					 int len)<br/>
-</pre><p>Reads a configuration file loaded in memory. The string can be zero terminated in which case @len can be 0</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>memory</tt></i>:</span></td><td>pointer to the content of the configuration file</td></tr><tr><td><span class="term"><i><tt>len</tt></i>:</span></td><td>length in byte</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>an handle to lookup settings or NULL if it failed to parse the content, use virConfFree() to free the data.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfWriteFile"/>virConfWriteFile ()</h3><pre class="programlisting">int	virConfWriteFile		(const char * filename, <br/>					 <a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf)<br/>
-</pre><p>Writes a configuration file back to a file.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>filename</tt></i>:</span></td><td>the path to the configuration file.</td></tr><tr><td><span class="term"><i><tt>conf</tt></i>:</span></td><td>the conf</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of bytes written or -1 in case of error.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConfWriteMem"/>virConfWriteMem ()</h3><pre class="programlisting">int	virConfWriteMem			(char * memory, <br/>					 int * len, <br/>					 <a href="libvirt-conf.html#virConfPtr">virConfPtr</a> conf)<br/>
-</pre><p>Writes a configuration file back to a memory area. @len is an IN/OUT parameter, it indicates the size available in bytes, and on output the size required for the configuration file (even if the call fails due to insufficient space).</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>memory</tt></i>:</span></td><td>pointer to the memory to store the config file</td></tr><tr><td><span class="term"><i><tt>len</tt></i>:</span></td><td>pointer to the length in byte of the store, on output the size</td></tr><tr><td><span class="term"><i><tt>conf</tt></i>:</span></td><td>the conf</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of bytes written or -1 in case of error.</td></tr></tbody></table></div></div>
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>

docs/devhelp/libvirt-virterror.html

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>virterror: error handling interfaces for the libvirt library</title>
-    <meta name="generator" content="Libvirt devhelp stylesheet"/>
-    <link rel="start" href="index.html" title="libvirt Reference Manual"/>
-    <link rel="up" href="general.html" title="API"/>
-    <link rel="stylesheet" href="style.css" type="text/css"/>
-    <link rel="chapter" href="general.html" title="API"/>
-  </head>
-  <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-    <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-      <tr valign="middle">
-        <td>
-          <a accesskey="p" href="libvirt-libvirt.html">
-            <img src="left.png" width="24" height="24" border="0" alt="Prev"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="u" href="general.html">
-            <img src="up.png" width="24" height="24" border="0" alt="Up"/>
-          </a>
-        </td>
-        <td>
-          <a accesskey="h" href="index.html">
-            <img src="home.png" width="24" height="24" border="0" alt="Home"/>
-          </a>
-        </td>
-        <th width="100%" align="center">libvirt Reference Manual</th>
-      </tr>
-    </table>
-    <h2>
-      <span class="refentrytitle">virterror</span>
-    </h2>
-    <p>virterror - error handling interfaces for the libvirt library</p>
-    <p>Provides the interfaces of the libvirt library to handle errors raised while using the library. </p>
-    <p>Author(s): Daniel Veillard &lt;veillard@redhat.com&gt; </p>
-    <div class="refsynopsisdiv">
-      <h2>Synopsis</h2>
-      <pre class="synopsis">typedef <a href="libvirt-virterror.html#virError">virError</a> * <a href="#virErrorPtr">virErrorPtr</a>;
-typedef enum <a href="#virErrorLevel">virErrorLevel</a>;
-typedef enum <a href="#virErrorDomain">virErrorDomain</a>;
-typedef enum <a href="#virErrorNumber">virErrorNumber</a>;
-typedef struct _virError <a href="#virError">virError</a>;
-void	<a href="#virFreeError">virFreeError</a>			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err);
-int	<a href="#virCopyLastError">virCopyLastError</a>		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to);
-void	<a href="#virConnSetErrorFunc">virConnSetErrorFunc</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler);
-void	<a href="#virResetLastError">virResetLastError</a>		(void);
-typedef void <a href="#virErrorFunc">virErrorFunc</a>			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> error);
-void	<a href="#virResetError">virResetError</a>			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err);
-<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	<a href="#virConnGetLastError">virConnGetLastError</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
-void	<a href="#virDefaultErrorFunc">virDefaultErrorFunc</a>		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err);
-<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	<a href="#virGetLastError">virGetLastError</a>		(void);
-void	<a href="#virSetErrorFunc">virSetErrorFunc</a>			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler);
-int	<a href="#virConnCopyLastError">virConnCopyLastError</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to);
-void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
-<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	<a href="#virSaveLastError">virSaveLastError</a>	(void);
-</pre>
-    </div>
-    <div class="refsect1" lang="en">
-      <h2>Description</h2>
-    </div>
-    <div class="refsect1" lang="en">
-      <h2>Details</h2>
-      <div class="refsect2" lang="en">
-        <div class="refsect2" lang="en"><h3><a name="virError">Structure </a>virError</h3><pre class="programlisting">struct _virError {
-    int	code	: The error code, a <a href="libvirt-virterror.html#virErrorNumber">virErrorNumber</a>
-    int	domain	: What part of the library raised this error
-    char *	message	: human-readable informative error message
-    <a href="libvirt-virterror.html#virErrorLevel">virErrorLevel</a>	level	: how consequent is the error
-    <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	conn	: connection if available, deprecated see note above
-    <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	dom	: domain if available, deprecated see note above
-    char *	str1	: extra string information
-    char *	str2	: extra string information
-    char *	str3	: extra string information
-    int	int1	: extra number information
-    int	int2	: extra number information
-    <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	net	: network if available, deprecated see note above
-} virError;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virErrorDomain">Enum </a>virErrorDomain</h3><pre class="programlisting">enum <a href="#virErrorDomain">virErrorDomain</a> {
-    <a name="VIR_FROM_NONE">VIR_FROM_NONE</a> = 0
-    <a name="VIR_FROM_XEN">VIR_FROM_XEN</a> = 1 /* Error at Xen hypervisor layer */
-    <a name="VIR_FROM_XEND">VIR_FROM_XEND</a> = 2 /* Error at connection with xend daemon */
-    <a name="VIR_FROM_XENSTORE">VIR_FROM_XENSTORE</a> = 3 /* Error at connection with xen store */
-    <a name="VIR_FROM_SEXPR">VIR_FROM_SEXPR</a> = 4 /* Error in the S-Expression code */
-    <a name="VIR_FROM_XML">VIR_FROM_XML</a> = 5 /* Error in the XML code */
-    <a name="VIR_FROM_DOM">VIR_FROM_DOM</a> = 6 /* Error when operating on a domain */
-    <a name="VIR_FROM_RPC">VIR_FROM_RPC</a> = 7 /* Error in the XML-RPC code */
-    <a name="VIR_FROM_PROXY">VIR_FROM_PROXY</a> = 8 /* Error in the proxy code */
-    <a name="VIR_FROM_CONF">VIR_FROM_CONF</a> = 9 /* Error in the configuration file handling */
-    <a name="VIR_FROM_QEMU">VIR_FROM_QEMU</a> = 10 /* Error at the QEMU daemon */
-    <a name="VIR_FROM_NET">VIR_FROM_NET</a> = 11 /* Error when operating on a network */
-    <a name="VIR_FROM_TEST">VIR_FROM_TEST</a> = 12 /* Error from test driver */
-    <a name="VIR_FROM_REMOTE">VIR_FROM_REMOTE</a> = 13 /* Error from remote driver */
-    <a name="VIR_FROM_OPENVZ">VIR_FROM_OPENVZ</a> = 14 /* Error from OpenVZ driver */
-    <a name="VIR_FROM_XENXM">VIR_FROM_XENXM</a> = 15 /* Error at Xen XM layer */
-    <a name="VIR_FROM_STATS_LINUX">VIR_FROM_STATS_LINUX</a> = 16 /* Error in the Linux Stats code */
-    <a name="VIR_FROM_LXC">VIR_FROM_LXC</a> = 17 /* Error from Linux Container driver */
-    <a name="VIR_FROM_STORAGE">VIR_FROM_STORAGE</a> = 18 /* Error from storage driver */
-    <a name="VIR_FROM_NETWORK">VIR_FROM_NETWORK</a> = 19 /* Error from network config */
-    <a name="VIR_FROM_DOMAIN">VIR_FROM_DOMAIN</a> = 20 /* Error from domain config */
-    <a name="VIR_FROM_UML">VIR_FROM_UML</a> = 21 /* Error at the UML driver */
-    <a name="VIR_FROM_NODEDEV">VIR_FROM_NODEDEV</a> = 22 /* Error from node device monitor */
-    <a name="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a> = 23 /* Error from xen inotify layer */
-    <a name="VIR_FROM_SECURITY">VIR_FROM_SECURITY</a> = 24 /* Error from security framework */
-    <a name="VIR_FROM_VBOX">VIR_FROM_VBOX</a> = 25 /* Error from VirtualBox driver */
-    <a name="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a> = 26 /* Error when operating on an interface */
-    <a name="VIR_FROM_ONE">VIR_FROM_ONE</a> = 27 /* Error from OpenNebula driver */
-    <a name="VIR_FROM_ESX">VIR_FROM_ESX</a> = 28 /* Error from ESX driver */
-    <a name="VIR_FROM_PHYP">VIR_FROM_PHYP</a> = 29 /* Error from IBM power hypervisor */
-    <a name="VIR_FROM_SECRET">VIR_FROM_SECRET</a> = 30 /*  Error from secret storage */
-};
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virErrorLevel">Enum </a>virErrorLevel</h3><pre class="programlisting">enum <a href="#virErrorLevel">virErrorLevel</a> {
-    <a name="VIR_ERR_NONE">VIR_ERR_NONE</a> = 0
-    <a name="VIR_ERR_WARNING">VIR_ERR_WARNING</a> = 1 /* A simple warning */
-    <a name="VIR_ERR_ERROR">VIR_ERR_ERROR</a> = 2 /*  An error */
-};
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virErrorNumber">Enum </a>virErrorNumber</h3><pre class="programlisting">enum <a href="#virErrorNumber">virErrorNumber</a> {
-    <a name="VIR_ERR_OK">VIR_ERR_OK</a> = 0
-    <a name="VIR_ERR_INTERNAL_ERROR">VIR_ERR_INTERNAL_ERROR</a> = 1 /* internal error */
-    <a name="VIR_ERR_NO_MEMORY">VIR_ERR_NO_MEMORY</a> = 2 /* memory allocation failure */
-    <a name="VIR_ERR_NO_SUPPORT">VIR_ERR_NO_SUPPORT</a> = 3 /* no support for this function */
-    <a name="VIR_ERR_UNKNOWN_HOST">VIR_ERR_UNKNOWN_HOST</a> = 4 /* could not resolve hostname */
-    <a name="VIR_ERR_NO_CONNECT">VIR_ERR_NO_CONNECT</a> = 5 /* can't connect to hypervisor */
-    <a name="VIR_ERR_INVALID_CONN">VIR_ERR_INVALID_CONN</a> = 6 /* invalid connection object */
-    <a name="VIR_ERR_INVALID_DOMAIN">VIR_ERR_INVALID_DOMAIN</a> = 7 /* invalid domain object */
-    <a name="VIR_ERR_INVALID_ARG">VIR_ERR_INVALID_ARG</a> = 8 /* invalid function argument */
-    <a name="VIR_ERR_OPERATION_FAILED">VIR_ERR_OPERATION_FAILED</a> = 9 /* a command to hypervisor failed */
-    <a name="VIR_ERR_GET_FAILED">VIR_ERR_GET_FAILED</a> = 10 /* a HTTP GET command to failed */
-    <a name="VIR_ERR_POST_FAILED">VIR_ERR_POST_FAILED</a> = 11 /* a HTTP POST command to failed */
-    <a name="VIR_ERR_HTTP_ERROR">VIR_ERR_HTTP_ERROR</a> = 12 /* unexpected HTTP error code */
-    <a name="VIR_ERR_SEXPR_SERIAL">VIR_ERR_SEXPR_SERIAL</a> = 13 /* failure to serialize an S-Expr */
-    <a name="VIR_ERR_NO_XEN">VIR_ERR_NO_XEN</a> = 14 /* could not open Xen hypervisor control */
-    <a name="VIR_ERR_XEN_CALL">VIR_ERR_XEN_CALL</a> = 15 /* failure doing an hypervisor call */
-    <a name="VIR_ERR_OS_TYPE">VIR_ERR_OS_TYPE</a> = 16 /* unknown OS type */
-    <a name="VIR_ERR_NO_KERNEL">VIR_ERR_NO_KERNEL</a> = 17 /* missing kernel information */
-    <a name="VIR_ERR_NO_ROOT">VIR_ERR_NO_ROOT</a> = 18 /* missing root device information */
-    <a name="VIR_ERR_NO_SOURCE">VIR_ERR_NO_SOURCE</a> = 19 /* missing source device information */
-    <a name="VIR_ERR_NO_TARGET">VIR_ERR_NO_TARGET</a> = 20 /* missing target device information */
-    <a name="VIR_ERR_NO_NAME">VIR_ERR_NO_NAME</a> = 21 /* missing domain name information */
-    <a name="VIR_ERR_NO_OS">VIR_ERR_NO_OS</a> = 22 /* missing domain OS information */
-    <a name="VIR_ERR_NO_DEVICE">VIR_ERR_NO_DEVICE</a> = 23 /* missing domain devices information */
-    <a name="VIR_ERR_NO_XENSTORE">VIR_ERR_NO_XENSTORE</a> = 24 /* could not open Xen Store control */
-    <a name="VIR_ERR_DRIVER_FULL">VIR_ERR_DRIVER_FULL</a> = 25 /* too many drivers registered */
-    <a name="VIR_ERR_CALL_FAILED">VIR_ERR_CALL_FAILED</a> = 26 /* not supported by the drivers (DEPRECATED) */
-    <a name="VIR_ERR_XML_ERROR">VIR_ERR_XML_ERROR</a> = 27 /* an XML description is not well formed or broken */
-    <a name="VIR_ERR_DOM_EXIST">VIR_ERR_DOM_EXIST</a> = 28 /* the domain already exist */
-    <a name="VIR_ERR_OPERATION_DENIED">VIR_ERR_OPERATION_DENIED</a> = 29 /* operation forbidden on read-only connections */
-    <a name="VIR_ERR_OPEN_FAILED">VIR_ERR_OPEN_FAILED</a> = 30 /* failed to open a conf file */
-    <a name="VIR_ERR_READ_FAILED">VIR_ERR_READ_FAILED</a> = 31 /* failed to read a conf file */
-    <a name="VIR_ERR_PARSE_FAILED">VIR_ERR_PARSE_FAILED</a> = 32 /* failed to parse a conf file */
-    <a name="VIR_ERR_CONF_SYNTAX">VIR_ERR_CONF_SYNTAX</a> = 33 /* failed to parse the syntax of a conf file */
-    <a name="VIR_ERR_WRITE_FAILED">VIR_ERR_WRITE_FAILED</a> = 34 /* failed to write a conf file */
-    <a name="VIR_ERR_XML_DETAIL">VIR_ERR_XML_DETAIL</a> = 35 /* detail of an XML error */
-    <a name="VIR_ERR_INVALID_NETWORK">VIR_ERR_INVALID_NETWORK</a> = 36 /* invalid network object */
-    <a name="VIR_ERR_NETWORK_EXIST">VIR_ERR_NETWORK_EXIST</a> = 37 /* the network already exist */
-    <a name="VIR_ERR_SYSTEM_ERROR">VIR_ERR_SYSTEM_ERROR</a> = 38 /* general system call failure */
-    <a name="VIR_ERR_RPC">VIR_ERR_RPC</a> = 39 /* some sort of RPC error */
-    <a name="VIR_ERR_GNUTLS_ERROR">VIR_ERR_GNUTLS_ERROR</a> = 40 /* error from a GNUTLS call */
-    <a name="VIR_WAR_NO_NETWORK">VIR_WAR_NO_NETWORK</a> = 41 /* failed to start network */
-    <a name="VIR_ERR_NO_DOMAIN">VIR_ERR_NO_DOMAIN</a> = 42 /* domain not found or unexpectedly disappeared */
-    <a name="VIR_ERR_NO_NETWORK">VIR_ERR_NO_NETWORK</a> = 43 /* network not found */
-    <a name="VIR_ERR_INVALID_MAC">VIR_ERR_INVALID_MAC</a> = 44 /* invalid MAC address */
-    <a name="VIR_ERR_AUTH_FAILED">VIR_ERR_AUTH_FAILED</a> = 45 /* authentication failed */
-    <a name="VIR_ERR_INVALID_STORAGE_POOL">VIR_ERR_INVALID_STORAGE_POOL</a> = 46 /* invalid storage pool object */
-    <a name="VIR_ERR_INVALID_STORAGE_VOL">VIR_ERR_INVALID_STORAGE_VOL</a> = 47 /* invalid storage vol object */
-    <a name="VIR_WAR_NO_STORAGE">VIR_WAR_NO_STORAGE</a> = 48 /* failed to start storage */
-    <a name="VIR_ERR_NO_STORAGE_POOL">VIR_ERR_NO_STORAGE_POOL</a> = 49 /* storage pool not found */
-    <a name="VIR_ERR_NO_STORAGE_VOL">VIR_ERR_NO_STORAGE_VOL</a> = 50 /* storage pool not found */
-    <a name="VIR_WAR_NO_NODE">VIR_WAR_NO_NODE</a> = 51 /* failed to start node driver */
-    <a name="VIR_ERR_INVALID_NODE_DEVICE">VIR_ERR_INVALID_NODE_DEVICE</a> = 52 /* invalid node device object */
-    <a name="VIR_ERR_NO_NODE_DEVICE">VIR_ERR_NO_NODE_DEVICE</a> = 53 /* node device not found */
-    <a name="VIR_ERR_NO_SECURITY_MODEL">VIR_ERR_NO_SECURITY_MODEL</a> = 54 /* security model not found */
-    <a name="VIR_ERR_OPERATION_INVALID">VIR_ERR_OPERATION_INVALID</a> = 55 /* operation is not applicable at this time */
-    <a name="VIR_WAR_NO_INTERFACE">VIR_WAR_NO_INTERFACE</a> = 56 /* failed to start interface driver */
-    <a name="VIR_ERR_NO_INTERFACE">VIR_ERR_NO_INTERFACE</a> = 57 /* interface driver not running */
-    <a name="VIR_ERR_INVALID_INTERFACE">VIR_ERR_INVALID_INTERFACE</a> = 58 /* invalid interface object */
-    <a name="VIR_ERR_MULTIPLE_INTERFACES">VIR_ERR_MULTIPLE_INTERFACES</a> = 59 /* more than one matching interface found */
-    <a name="VIR_WAR_NO_SECRET">VIR_WAR_NO_SECRET</a> = 60 /* failed to start secret storage */
-    <a name="VIR_ERR_INVALID_SECRET">VIR_ERR_INVALID_SECRET</a> = 61 /* invalid secret */
-    <a name="VIR_ERR_NO_SECRET">VIR_ERR_NO_SECRET</a> = 62 /*  secret not found */
-};
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virErrorPtr">Typedef </a>virErrorPtr</h3><pre class="programlisting"><a href="libvirt-virterror.html#virError">virError</a> * virErrorPtr;
-</pre><p/>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virErrorFunc"/>Function type virErrorFunc</h3><pre class="programlisting">void	virErrorFunc			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> error)<br/>
-</pre><p>Signature of a function to use when there is an error raised by the library.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>userData</tt></i>:</span></td><td>user provided data for the error callback</td></tr><tr><td><span class="term"><i><tt>error</tt></i>:</span></td><td>the error being raised.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConnCopyLastError"/>virConnCopyLastError ()</h3><pre class="programlisting">int	virConnCopyLastError		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to)<br/>
-</pre><p>Copy the content of the last error caught on that connection This method is not protected against access from multiple threads. In a multi-threaded application, always use the global virGetLastError() API which is backed by thread local storage. If the connection object was discovered to be invalid by an API call, then the error will be reported against the global error object. Since 0.6.0, all errors reported in the per-connection object are also duplicated in the global error object. As such an application can always use virGetLastError(). This method remains for backwards compatability. One will need to free the result with virResetError()</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>to</tt></i>:</span></td><td>target to receive the copy</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no error was found and the error code otherwise and -1 in case of parameter error.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConnGetLastError"/>virConnGetLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virConnGetLastError	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
-</pre><p>Provide a pointer to the last error caught on that connection This method is not protected against access from multiple threads. In a multi-threaded application, always use the global virGetLastError() API which is backed by thread local storage. If the connection object was discovered to be invalid by an API call, then the error will be reported against the global error object. Since 0.6.0, all errors reported in the per-connection object are also duplicated in the global error object. As such an application can always use virGetLastError(). This method remains for backwards compatability.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the last error or NULL if none occurred.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConnResetLastError"/>virConnResetLastError ()</h3><pre class="programlisting">void	virConnResetLastError		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
-</pre><p>The error object is kept in thread local storage, so separate threads can safely access this concurrently. Reset the last error caught on that connection</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virConnSetErrorFunc"/>virConnSetErrorFunc ()</h3><pre class="programlisting">void	virConnSetErrorFunc		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler)<br/>
-</pre><p>Set a connection error handling function, if @handler is NULL it will reset to default which is to pass error back to the global library handler.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>userData</tt></i>:</span></td><td>pointer to the user data provided in the handler callback</td></tr><tr><td><span class="term"><i><tt>handler</tt></i>:</span></td><td>the function to get called in case of error or NULL</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virCopyLastError"/>virCopyLastError ()</h3><pre class="programlisting">int	virCopyLastError		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to)<br/>
-</pre><p>Copy the content of the last error caught at the library level The error object is kept in thread local storage, so separate threads can safely access this concurrently. One will need to free the result with virResetError()</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>to</tt></i>:</span></td><td>target to receive the copy</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no error was found and the error code otherwise and -1 in case of parameter error.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virDefaultErrorFunc"/>virDefaultErrorFunc ()</h3><pre class="programlisting">void	virDefaultErrorFunc		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
-</pre><p>Default routine reporting an error to stderr.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>pointer to the error.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virFreeError"/>virFreeError ()</h3><pre class="programlisting">void	virFreeError			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
-</pre><p>Resets and frees the given error.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>error to free</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virGetLastError"/>virGetLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virGetLastError		(void)<br/>
-</pre><p>Provide a pointer to the last error caught at the library level The error object is kept in thread local storage, so separate threads can safely access this concurrently.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the last error or NULL if none occurred.</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virResetError"/>virResetError ()</h3><pre class="programlisting">void	virResetError			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
-</pre><p>Reset the error being pointed to</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>pointer to the <a href="libvirt-virterror.html#virError">virError</a> to clean up</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virResetLastError"/>virResetLastError ()</h3><pre class="programlisting">void	virResetLastError		(void)<br/>
-</pre><p>Reset the last error caught at the library level. The error object is kept in thread local storage, so separate threads can safely access this concurrently, only resetting their own error object.</p>
-</div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virSaveLastError"/>virSaveLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virSaveLastError	(void)<br/>
-</pre><p>Save the last error into a new error object.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the copied error or NULL if allocation failed. It is the caller's responsibility to free the error with virFreeError().</td></tr></tbody></table></div></div>
-        <hr/>
-        <div class="refsect2" lang="en"><h3><a name="virSetErrorFunc"/>virSetErrorFunc ()</h3><pre class="programlisting">void	virSetErrorFunc			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler)<br/>
-</pre><p>Set a library global error handling function, if @handler is NULL, it will reset to default printing on stderr. The error raised there are those for which no handler at the connection level could caught.</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>userData</tt></i>:</span></td><td>pointer to the user data provided in the handler callback</td></tr><tr><td><span class="term"><i><tt>handler</tt></i>:</span></td><td>the function to get called in case of error or NULL</td></tr></tbody></table></div></div>
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>

docs/docs.html

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from docs.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Documentation</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <span class="active">Documentation</span>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Hypervisor specific driver information" class="inactive" href="drivers.html">Drivers</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Documentation</h1>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/downloads.html

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from downloads.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Downloads</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <span class="active">Downloads</span>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="inactive" href="docs.html">Documentation</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Downloads</h1>
-        <h2>Official Releases</h2>
-        <p>
-      The latest versions of the libvirt C library can be downloaded from:
-    </p>
-        <ul><li><a href="ftp://libvirt.org/libvirt/">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/">libvirt.org HTTP server</a></li></ul>
-        <h2>Hourly development snapshots</h2>
-        <p>
-      Once an hour, an automated snapshot is made from the git server
-      source tree. These snapshots should be usable, but we make no guarantees
-      about their stability:
-    </p>
-        <ul><li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.gz">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li></ul>
-        <h2>GIT source repository</h2>
-        <p> Libvirt code source is now maintained in a <a href="http://git-scm.com/">git</a> repository available on
-      <a href="http://libvirt.org/git/">libvirt.org</a>:
-    </p>
-        <pre>
-
-      git clone git://libvirt.org/libvirt.git
-    </pre>
-        <p>
-      It can also be browsed at
-    </p>
-        <pre>
-
-      <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a>
-    </pre>
-        <h2>CVS repository access (Deprecated) </h2>
-        <p>
-      The master source repository used to be under <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
-      with anonymous access at:
-       </p>
-        <pre>
-
-      # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt
-    </pre>
-        <p> The server is maintainened temporarilly for existing uses, but all
-      changes are only commited to git now and we expect to deprecate the CVS
-      server during summer 2009. </p>
-        <h2>Building from a source code checkout</h2>
-        <p> The libvirt build process uses GNU autotools, so after obtaining a
-    checkout it is necessary to generate the configure script and Makefile.in
-    templates using the <code>autogen.sh</code> command, passing the extra
-    arguments as as for configure. As an example, to do a complete build and
-    install it into your home directory run:</p>
-        <pre>
-
-      ./autogen.sh --prefix=$HOME/usr
-      make
-      make install
-    </pre>
-        <h2>GIT repository mirror</h2>
-        <p>
-      Jim Mereying was maintaining a CVS to git mirror on
-      <a href="http://git.et.redhat.com/?p=libvirt.git">git.et.redhat.com</a>.
-      Existing users should migrate to the new libvirt.org git server, as the
-      old one is now deprecated.  For the sake of old links including now-
-      rewritten SHA1s, we'll leave the old repository on-line for some time.
-      It is available as:
-    </p>
-        <pre>
-
-      git clone git://git.et.redhat.com/libvirt.git
-    </pre>
-        <p>
-      It can also be browsed at
-    </p>
-        <pre>
-      <a href="http://git.et.redhat.com/?p=libvirt.git;a=summary">http://git.et.redhat.com/?p=libvirt.git;a=summary</a>
-    </pre>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>

docs/downloads.html.in

@@ -60,7 +60,7 @@
     <p> The libvirt build process uses GNU autotools, so after obtaining a
     checkout it is necessary to generate the configure script and Makefile.in
     templates using the <code>autogen.sh</code> command, passing the extra
-    arguments as as for configure. As an example, to do a complete build and
+    arguments as for configure. As an example, to do a complete build and
     install it into your home directory run:</p>
         <pre>
 

docs/drivers.html

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<!--
-        This file is autogenerated from drivers.html.in
-        Do not edit this file. Changes will be lost.
-      -->
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-    <link rel="stylesheet" type="text/css" href="main.css" />
-    <link rel="SHORTCUT ICON" href="32favicon.png" />
-    <title>libvirt: Internal drivers</title>
-    <meta name="description" content="libvirt, virtualization, virtualization API" />
-  </head>
-  <body>
-    <div id="header">
-      <div id="headerLogo"></div>
-      <div id="headerSearch">
-        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
-            <input id="query" name="query" type="text" size="12" value="" />
-            <input id="submit" name="submit" type="submit" value="Search" />
-          </div></form>
-      </div>
-    </div>
-    <div id="body">
-      <div id="menu">
-        <ul class="l0"><li>
-            <div>
-              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
-              <ul class="l1"><li>
-                  <div>
-                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <span class="active">Drivers</span>
-                    <ul class="l2"><li>
-                        <div>
-                          <a title="Driver the Xen hypervisor" class="inactive" href="drvxen.html">Xen</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for QEMU, KQEMU, KVM and Xenner" class="inactive" href="drvqemu.html">QEMU / KVM</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for the Linux native container API" class="inactive" href="drvlxc.html">Linux Container</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Psuedo-driver simulating APIs in memory for test suites" class="inactive" href="drvtest.html">Test</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver providing secure remote to the libvirt APIs" class="inactive" href="drvremote.html">Remote</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for the OpenVZ container technology" class="inactive" href="drvopenvz.html">OpenVZ</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for the User Mode Linux technology" class="inactive" href="drvuml.html">UML</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
-                        </div>
-                      </li><li>
-                        <div>
-                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
-                        </div>
-                      </li></ul>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
-                  </div>
-                </li><li>
-                  <div>
-                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
-                  </div>
-                </li></ul>
-            </div>
-          </li><li>
-            <div>
-              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
-            </div>
-          </li><li>
-            <div>
-              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
-            </div>
-          </li></ul>
-      </div>
-      <div id="content">
-        <h1>Internal drivers</h1>
-        <p>
-      The libvirt public API delegates its implementation to one or
-      more internal drivers, depending on the <a href="uri.html">connection URI</a>
-      passed when initializing the library. There is always a hypervisor driver
-      active, and if the libvirt daemon is available there will usually be a
-      network and storage driver active.
-    </p>
-        <h2>Hypervisor drivers</h2>
-        <p>
-      The hypervisor drivers currently supported by libvirt are:
-    </p>
-        <ul><li><strong><a href="drvxen.html">Xen</a></strong></li><li><strong><a href="drvqemu.html">QEMU</a></strong></li><li><strong><a href="drvlxc.html">LXC</a></strong></li><li><strong><a href="drvtest.html">Test</a></strong></li><li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li><li><strong><a href="drvvbox.html">VirtualBox</a></strong></li><li><strong><a href="drvone.html">OpenNebula</a></strong></li></ul>
-      </div>
-    </div>
-    <div id="footer">
-      <p id="sponsor">
-	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
-    </div>
-  </body>
-</html>