Prep for release 3.2.1

New maint release version numbers of just A.B.C format, not the old
A.B.C.D format. Adjust the check that dynamically changes the Source
URL for maint releases

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Acked-by: Andrea Bolognani <abologna@redhat.com>
(cherry picked from commit 1d07a5bf3c)

.color_coded.in

@@ -1,40 +0,0 @@
--I@abs_top_builddir@
--I@abs_top_srcdir@
--I@abs_top_builddir@/gnulib/lib
--I@abs_top_srcdir@/gnulib/lib
--I@abs_top_builddir@/include
--I@abs_top_srcdir@/include
--I@abs_top_builddir@/src
--I@abs_top_srcdir@/src
--I@abs_top_builddir@/src/access
--I@abs_top_srcdir@/src/access
--I@abs_top_builddir@/src/admin
--I@abs_top_srcdir@/src/admin
--I@abs_top_builddir@/src/bhyve
--I@abs_top_srcdir@/src/bhyve
--I@abs_top_builddir@/src/conf
--I@abs_top_srcdir@/src/conf
--I@abs_top_builddir@/src/libxl
--I@abs_top_srcdir@/src/libxl
--I@abs_top_builddir@/src/locking
--I@abs_top_srcdir@/src/locking
--I@abs_top_builddir@/src/logging
--I@abs_top_srcdir@/src/logging
--I@abs_top_builddir@/src/lxc
--I@abs_top_srcdir@/src/lxc
--I@abs_top_builddir@/src/qemu
--I@abs_top_srcdir@/src/qemu
--I@abs_top_builddir@/src/remote
--I@abs_top_srcdir@/src/remote
--I@abs_top_builddir@/src/rpc
--I@abs_top_srcdir@/src/rpc
--I@abs_top_builddir@/src/secret
--I@abs_top_srcdir@/src/secret
--I@abs_top_builddir@/src/security
--I@abs_top_srcdir@/src/security
--I@abs_top_builddir@/src/util
--I@abs_top_srcdir@/src/util
--I@abs_top_builddir@/src/vmx
--I@abs_top_srcdir@/src/vmx
--I@abs_top_builddir@/src/xenconfig
--I@abs_top_srcdir@/src/xenconfig

.gitignore

@@ -1,7 +1,7 @@
 *#*#
 *.#*#
-*.[187]
-*.[187].in
+*.[18]
+*.[18].in
 *.a
 *.cov
 *.exe
@@ -26,7 +26,6 @@
 *.swp
 *~
 .#*
-.color_coded
 .deps
 .dirstamp
 .gdb_history
@@ -36,7 +35,6 @@
 .lvimrc
 .memdump
 .sc-start-sc_*
-.ycm_extra_conf.py
 /ABOUT-NLS
 /AUTHORS
 /ChangeLog
@@ -161,8 +159,7 @@
 /src/test_libvirt*.aug
 /src/test_virtlockd.aug
 /src/test_virtlogd.aug
-/src/util/virkeycodetable*.h
-/src/util/virkeynametable*.h
+/src/util/virkeymaps.h
 /src/virt-aa-helper
 /src/virtlockd
 /src/virtlogd

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "gnulib"]
 	path = .gnulib
 	url = git://git.sv.gnu.org/gnulib.git
-[submodule "keycodemapdb"]
-	path = src/keycodemapdb
-	url = https://gitlab.com/keycodemap/keycodemapdb.git

.travis.yml

@@ -1,123 +0,0 @@
-sudo: false
-language: c
-cache: ccache
-
-matrix:
-  include:
-    - compiler: gcc
-      dist: precise
-    - compiler: gcc
-      dist: trusty
-    - compiler: clang
-      dist: precise
-    - compiler: clang
-      dist: trusty
-    - compiler: clang
-      os: osx
-
-addons:
-  apt:
-    # Please keep this list sorted alphabetically
-    packages:
-      - autoconf
-      - automake
-      - autopoint
-      - ccache
-      - dnsmasq-base
-      - ebtables
-      - gcc
-      - gettext
-      - glusterfs-client
-      - libacl1-dev
-      - libapparmor-dev
-      - libattr1-dev
-      - libaudit-dev
-      - libavahi-client-dev
-      - libblkid-dev
-      - libc6-dev
-      - libcap-ng-dev
-      - libcurl4-gnutls-dev
-      - libdbus-1-dev
-      - libdevmapper-dev
-      - libfuse-dev
-      - libgnutls-dev
-      - libnetcf-dev
-      - libnl-3-dev
-      - libnl-route-3-dev
-      - libnuma-dev
-      - libopenwsman-dev
-      - libparted-dev
-      - libpcap-dev
-      - libpciaccess-dev
-      - librbd-dev
-      - libreadline-dev
-      - libsasl2-dev
-      - libssh2-1-dev
-      - libssl-dev
-      - libtool
-      - libudev-dev
-      - libxen-dev
-      - libxml2-dev
-      - libxml2-utils
-      - libyajl-dev
-      - lvm2
-      - make
-      - nfs-common
-      - open-iscsi
-      - parted
-      - patch
-      - pkg-config
-      - policykit-1
-      - scrub
-      - sheepdog
-      - systemtap-sdt-dev
-      - xsltproc
-      - zfs-fuse
-
-git:
-  submodules: true
-
-env:
-  global:
-    # The custom $PATH is just to pick up some extra binaries installed
-    # through homebrew on macOS and it's completely harmless on Linux
-    - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/rpcgen/bin:$PATH"
-    # The hyperv driver fails to build with clang on precise due to this
-    # error being raised in one of openwsman header files
-    - CFLAGS="-Wno-error=variadic-macros"
-    - VIR_TEST_DEBUG=1
-
-before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install gnutls libgcrypt yajl gettext rpcgen; fi
-
-before_script:
-  - ./autogen.sh
-
-script:
-  # Many unit tests still fail on macOS, and there are a bunch of issues with
-  # syntax-check as well, so skip those steps on that platform for now
-  - make -j3 && if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j3 syntax-check && make -j3 check; fi
-
-after_failure:
-  - echo '============================================================================'
-  - 'if [ -f $(pwd)/tests/test-suite.log ]; then
-        cat $(pwd)/tests/test-suite.log;
-    else
-        echo "=== NO LOG FILE FOUND ===";
-    fi'
-
-notifications:
-  irc:
-    # The channel name "irc.oftc.net#virt" is encrypted against libvirt/libvirt
-    # to prevent IRC notifications from github forks. This was created using:
-    # $ travis encrypt -r "libvirt/libvirt" "irc.oftc.net#virt"
-    channels:
-      - secure: "hUPdkLxX7nh75+clpnk4U0XLExLfV9DFKSvQSAUtf5JtDNMslj7AeOCf2wcbkNsEhkiF557odTAnov1s5m1w/yaa56zbjFAh5agzqRKya3QjqsrvlBKw/WuN+l82iMNLLeebTgCPAXrbAbGWH8YmYssp/7+eMsnKaVh84EQQNbMCHlLg6ovE26Fs18mZ6J5RC3OPa1vbv+xkdCHvGg/Oyp4K8bpU7RYyimA56jdxI/OfdTH9HxntHYSzykR7hDbyzZhdIlAUyRKReQVjcV5+R8fdDL/1imyGA/88KTztMeKXpZ5Rf+Ss3vYLZb6qsLLegCZ4AU/q0vvbWxjpZGJZoeyrVpfBTZdYGIzmLTMl9GYXXa/gDwFlbvRDiPDG4TIy6GlMUROinj7KRKEHu1fWRYu012ife5OjidxcwrTnz21vYaCv3AKWPpMPxwIzQPkY1hex9uLLX6z+TrAxxDLF+7UzRT9w2RLFBkLYlj2aDVrLAVb/ynRsxDz5CGzC61FSQVft2e308SkGjdn8YxvguCuXv+N70Fu1cvFyh5XYeHb4fbBRo0Ctzaec78leHlQvRGWKJxXDXRkE2lvvBc7YbBNSAYh7Fs8Y+zY7l7rMxvXdrt3nuaNQhe74V3yhxPDAld66qmAn9TYMmaZW2f5/KKKILLbCa0t2MxiAc6L2OI8="
-    on_success: change
-    on_failure: always
-  email:
-    # The list name 'libvirt-ci@redhat.com" is encrypted against libvirt/libvirt
-    # to prevent IRC notifications from github forks. This was created using:
-    # $ travis encrypt -r "libvirt/libvirt" "libvirt-ci@redhat.com"
-    recipients:
-      - secure: "QcU9eP96P0RlDNzVRZl/4sxyydPStGzECrpgJhr2IPB/7pHk23yaBrmUsq9S830tB+jwLGma1IscNB8uf7Sf7WY+cYIpfR8v030OffWnaipo/Gcs0dpnlfURWHjOFQI3RJzGEihsqvbwUFOwsM+3IDyO3qdWaiT6cN2Tj9ROlwYCySSX5YWzLyX7arBZ4lp8ESs7ohQaEwp2cegnMP2oGPJJe4SebvlCDjHZbjkU5aEradwUWnRQDJZWTKknpNLArVFxN2/ixp6f/MGY4DmkHoDweio6mHIPN5zTs5Jt32aiX6wDBa+bBa4v8TCRqzhYkQ63ZZhNV8bY5Uf9ufTdyvt96yIANyakd85b1QpMdAX76IyJi1l0/Uub6DTQZAcq3vK7iPjGeTVSpyoXrqTfGy4JxMjqDoocpWvv8ALX1wrYI/HfN2R2Aepw9jModTimOsebYhJ1yMhSt8qnh5AQNftGKL2JBKoA1LWdU2YJ5fO1bGjKNiVEkGFQTPYFWrYCUY5JcT+s5WCzNeMNm8s9na8liYhGl3WtS3rPr5M8bof+BMsBhG2hQ0loduc94x2GkvyhQZUgRbqrwNR+y4hn+rWFC3hBzzyiAULs43vY/PJ+eBdKEf3VAc0MkhQ8GgXGSA61fR6aXYonroI/WnBVItwDmUnnMfSziZXxk09GLl4="

.ycm_extra_conf.py.in

@@ -1,45 +0,0 @@
-flags = [
-  '-I@abs_top_builddir@',
-  '-I@abs_top_srcdir@',
-  '-I@abs_top_builddir@/gnulib/lib',
-  '-I@abs_top_srcdir@/gnulib/lib',
-  '-I@abs_top_builddir@/include',
-  '-I@abs_top_srcdir@/include',
-  '-I@abs_top_builddir@/src',
-  '-I@abs_top_srcdir@/src',
-  '-I@abs_top_builddir@/src/access',
-  '-I@abs_top_srcdir@/src/access',
-  '-I@abs_top_builddir@/src/admin',
-  '-I@abs_top_srcdir@/src/admin',
-  '-I@abs_top_builddir@/src/bhyve',
-  '-I@abs_top_srcdir@/src/bhyve',
-  '-I@abs_top_builddir@/src/conf',
-  '-I@abs_top_srcdir@/src/conf',
-  '-I@abs_top_builddir@/src/libxl',
-  '-I@abs_top_srcdir@/src/libxl',
-  '-I@abs_top_builddir@/src/locking',
-  '-I@abs_top_srcdir@/src/locking',
-  '-I@abs_top_builddir@/src/logging',
-  '-I@abs_top_srcdir@/src/logging',
-  '-I@abs_top_builddir@/src/lxc',
-  '-I@abs_top_srcdir@/src/lxc',
-  '-I@abs_top_builddir@/src/qemu',
-  '-I@abs_top_srcdir@/src/qemu',
-  '-I@abs_top_builddir@/src/remote',
-  '-I@abs_top_srcdir@/src/remote',
-  '-I@abs_top_builddir@/src/rpc',
-  '-I@abs_top_srcdir@/src/rpc',
-  '-I@abs_top_builddir@/src/secret',
-  '-I@abs_top_srcdir@/src/secret',
-  '-I@abs_top_builddir@/src/security',
-  '-I@abs_top_srcdir@/src/security',
-  '-I@abs_top_builddir@/src/util',
-  '-I@abs_top_srcdir@/src/util',
-  '-I@abs_top_builddir@/src/vmx',
-  '-I@abs_top_srcdir@/src/vmx',
-  '-I@abs_top_builddir@/src/xenconfig',
-  '-I@abs_top_srcdir@/src/xenconfig',
-]
-
-def FlagsForFile(filename, **kwargs):
-  return { 'flags': flags, 'do_cache': True }

Makefile.am

@@ -36,11 +36,11 @@ EXTRA_DIST = \
   libvirt-qemu.pc.in \
   libvirt-lxc.pc.in \
   libvirt-admin.pc.in \
+  autobuild.sh \
   Makefile.nonreentrant \
   autogen.sh \
   cfg.mk \
   run.in \
-  README.md \
   AUTHORS.in
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -66,6 +66,17 @@ EXTRA_DIST += \
 	$(srcdir)/docs/news-ascii.xsl \
 	$(srcdir)/docs/reformat-news.py
 
+$(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl \
+			$(top_srcdir)/docs/hacking2.xsl \
+			$(top_srcdir)/docs/wrapstring.xsl \
+			$(top_srcdir)/docs/hacking.html.in
+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
+	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl \
+		$(top_srcdir)/docs/hacking.html.in | \
+	   $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \
+	   | perl -0777 -pe 's/\n\n+$$/\n/' \
+	   > $@-t && mv $@-t $@ ; fi;
+
 rpm: clean
 	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz)
 

Makefile.nonreentrant

@@ -15,9 +15,9 @@
 ## <http://www.gnu.org/licenses/>.
 
 #
-# Generated by running the following on Fedora 26:
+# Generated by running the following on Fedora 9:
 #
-#  nm -D --defined-only /lib64/libc.so.6  \
+#  nm -D --defined-only /lib/libc.so.6  \
 #      | grep '_r$' \
 #      | awk '{print $3}' \
 #      | grep -v __ \
@@ -43,7 +43,6 @@ NON_REENTRANT += ether_ntoa
 NON_REENTRANT += fcvt
 NON_REENTRANT += fgetgrent
 NON_REENTRANT += fgetpwent
-NON_REENTRANT += fgetsgent
 NON_REENTRANT += fgetspent
 NON_REENTRANT += getaliasbyname
 NON_REENTRANT += getaliasent
@@ -73,8 +72,6 @@ NON_REENTRANT += getrpcent
 NON_REENTRANT += getservbyname
 NON_REENTRANT += getservbyport
 NON_REENTRANT += getservent
-NON_REENTRANT += getsgent
-NON_REENTRANT += getsgnam
 NON_REENTRANT += getspent
 NON_REENTRANT += getspnam
 NON_REENTRANT += getutent
@@ -98,7 +95,6 @@ NON_REENTRANT += random
 NON_REENTRANT += rand
 NON_REENTRANT += seed48
 NON_REENTRANT += setstate
-NON_REENTRANT += sgetsgent
 NON_REENTRANT += sgetspent
 NON_REENTRANT += srand48
 NON_REENTRANT += srandom

README

@@ -1 +0,0 @@
-README.md

README

@@ -0,0 +1,13 @@
+
+         LibVirt : simple API for virtualization
+
+  Libvirt 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 GNU Lesser General Public License. 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 Xen paravirtualization but
+should be able to integrate other virtualization mechanisms if needed.
+
+Daniel Veillard <veillard@redhat.com>

README-hacking

@@ -2,8 +2,7 @@
 
 These notes intend to help people working on the checked-out sources.
 These requirements do not apply when building from a distribution tarball.
-See also docs/hacking.html (after building libvirt using the information
-included in this file) for more detailed contribution guidelines.
+See also HACKING for more detailed libvirt contribution guidelines.
 
 * Requirements
 

README.md

@@ -1,82 +0,0 @@
-[![Build Status](https://travis-ci.org/libvirt/libvirt.svg)](https://travis-ci.org/libvirt/libvirt)
-
-Libvirt API for virtualization
-==============================
-
-Libvirt provides a portable, long term stable C API for managing the
-virtualization technologies provided by many operating systems. It
-includes support for QEMU, KVM, Xen, LXC, bhyve, Virtuozzo, VMware
-vCenter and ESX, VMware Desktop, Hyper-V, VirtualBox and the POWER
-Hypervisor.
-
-For some of these hypervisors, it provides a stateful management
-daemon which runs on the virtualization host allowing access to the
-API both by non-privileged local users and remote users.
-
-Layered packages provide bindings of the libvirt C API into other
-languages including Python, Perl, PHP, Go, Java, OCaml, as well as
-mappings into object systems such as GObject, CIM and SNMP.
-
-Further information about the libvirt project can be found on the
-website:
-
-[https://libvirt.org](https://libvirt.org)
-
-
-License
--------
-
-The libvirt C API is distributed under the terms of GNU Lesser General
-Public License, version 2.1 (or later). Some parts of the code that are
-not part of the C library may have the more restrictive GNU General
-Public License, version 2.1 (or later). See the files `COPYING.LESSER`
-and `COPYING` for full license terms & conditions.
-
-
-Installation
-------------
-
-Libvirt uses the GNU Autotools build system, so in general can be built
-and installed with the usual commands. For example, to build in a manner
-that is suitable for installing as root, use:
-
-```
-$ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-$ make
-$ sudo make install
-```
-
-While to build & install as an unprivileged user
-
-```
-$ ./configure --prefix=$HOME/usr
-$ make
-$ make install
-```
-
-The libvirt code relies on a large number of 3rd party libraries. These will
-be detected during execution of the `configure` script and a summary printed
-which lists any missing (optional) dependencies.
-
-
-Contributing
-------------
-
-The libvirt project welcomes contributions in many ways. For most components
-the best way to contribute is to send patches to the primary development
-mailing list. Further guidance on this can be found on the website:
-
-[https://libvirt.org/contribute.html](https://libvirt.org/contribute.html)
-
-
-Contact
--------
-
-The libvirt project has two primary mailing lists:
-
-  * libvirt-users@redhat.com (**for user discussions**)
-  * libvir-list@redhat.com (**for development only**)
-
-Further details on contacting the project are available on the website:
-
-[https://libvirt.org/contact.html](https://libvirt.org/contact.html)

autobuild.sh

@@ -0,0 +1,122 @@
+#!/bin/sh
+
+set -e
+set -v
+
+# Make things clean.
+
+test -n "$1" && RESULTS=$1 || RESULTS=results.log
+: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder}
+
+# If run under the autobuilder, we must use --nodeps with rpmbuild;
+# but this can lead to odd error diagnosis for normal development.
+nodeps=
+if test "${AUTOBUILD_COUNTER+set}"; then
+  nodeps=--nodeps
+fi
+
+test -f Makefile && make -k distclean || :
+rm -rf coverage
+
+rm -rf build
+mkdir build
+cd build
+
+# Run with options not normally exercised by the rpm build, for
+# more complete code coverage.
+../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \
+  --enable-expensive-tests \
+  --enable-test-coverage \
+  --disable-nls \
+  --enable-werror \
+  --enable-static
+
+# If the MAKEFLAGS envvar does not yet include a -j option,
+# add -jN where N depends on the number of processors.
+case $MAKEFLAGS in
+  *-j*) ;;
+  *) n=$(getconf _NPROCESSORS_ONLN 2> /dev/null)
+    test "$n" -gt 0 || n=1
+    n=$(expr $n + 1)
+    MAKEFLAGS="$MAKEFLAGS -j$n"
+    export MAKEFLAGS
+    ;;
+esac
+
+make
+make install
+
+# set -o pipefail is a bashism; this use of exec is the POSIX alternative
+exec 3>&1
+st=$(
+  exec 4>&1 >&3
+  { make check syntax-check 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS"
+)
+exec 3>&-
+test "$st" = 0
+test -x /usr/bin/lcov && make cov
+
+rm -f *.tar.xz
+make dist
+
+if test -n "$AUTOBUILD_COUNTER" ; then
+  EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
+else
+  NOW=`date +"%s"`
+  EXTRA_RELEASE=".$USER$NOW"
+fi
+
+if test -f /usr/bin/rpmbuild ; then
+  rpmbuild $nodeps \
+     --define "extra_release $EXTRA_RELEASE" \
+     --define "_sourcedir `pwd`" \
+     -ba --clean libvirt.spec
+fi
+
+# Test mingw32 cross-compile
+if test -x /usr/bin/i686-w64-mingw32-gcc ; then
+  make distclean
+
+  PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="i686-w64-mingw32-gcc" \
+  ../configure \
+    --build=$(uname -m)-w64-linux \
+    --host=i686-w64-mingw32 \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
+    --enable-expensive-tests \
+    --enable-werror
+
+  make
+  make install
+
+fi
+
+# Test mingw64 cross-compile
+if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
+  make distclean
+
+  PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \
+  PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \
+  CC="x86_64-w64-mingw32-gcc" \
+  ../configure \
+    --build=$(uname -m)-w64-linux \
+    --host=x86_64-w64-mingw32 \
+    --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
+    --enable-expensive-tests \
+    --enable-werror
+
+  make
+  make install
+
+fi
+
+
+if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
+  if test -f /usr/bin/rpmbuild ; then
+    rpmbuild $nodeps \
+       --define "extra_release $EXTRA_RELEASE" \
+       --define "_sourcedir `pwd`" \
+       -ba --clean mingw-libvirt.spec
+  fi
+fi

autogen.sh

@@ -1,196 +1,117 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-die()
-{
-    echo "error: $1" >&2
+set -e
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+THEDIR=`pwd`
+cd "$srcdir"
+
+test -f src/libvirt.c || {
+    echo "You must run this script in the top-level libvirt directory"
     exit 1
 }
 
-starting_point=$(pwd)
 
-srcdir=$(dirname "$0")
-test "$srcdir" || srcdir=.
-
-cd "$srcdir" || {
-    die "Failed to cd into $srcdir"
-}
-
-test -f src/libvirt.c || {
-    die "$0 must live in the top-level libvirt directory"
-}
-
-dry_run=
+EXTRA_ARGS=
 no_git=
-gnulib_srcdir=
-extra_args=
-while test "$#" -gt 0; do
-    case "$1" in
-    --dry-run)
-        # This variable will serve both as an indicator of the fact that
-        # a dry run has been requested, and to store the result of the
-        # dry run. It will be ultimately used as return code for the
-        # script: 0 means no action is necessary, 2 means that autogen.sh
-        # needs to be executed, and 1 is reserved for failures
-        dry_run=0
-        shift
-        ;;
-    --no-git)
-        no_git=" $1"
-        shift
-        ;;
-    --gnulib-srcdir=*)
-        gnulib_srcdir=" $1"
-        shift
-        ;;
-    --gnulib-srcdir)
-        gnulib_srcdir=" $1=$2"
-        shift
-        shift
-        ;;
-    --system)
-        prefix=/usr
-        sysconfdir=/etc
-        localstatedir=/var
-        if test -d $prefix/lib64; then
-            libdir=$prefix/lib64
-        else
-            libdir=$prefix/lib
-        fi
-        extra_args="--prefix=$prefix --localstatedir=$localstatedir"
-        extra_args="$extra_args --sysconfdir=$sysconfdir --libdir=$libdir"
-        shift
-        ;;
-    *)
-        # All remaining arguments will be passed to configure verbatim
-        break
-        ;;
-    esac
-done
-no_git="$no_git$gnulib_srcdir"
+if test "x$1" = "x--no-git"; then
+  no_git=" $1"
+  shift
+  case "$1 $2" in
+    --gnulib-srcdir=*) no_git="$no_git $1"; shift ;;
+    --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;;
+  esac
+fi
+if test -z "$NOCONFIGURE" ; then
+  if test "x$1" = "x--system"; then
+    shift
+    prefix=/usr
+    libdir=$prefix/lib
+    sysconfdir=/etc
+    localstatedir=/var
+    if [ -d /usr/lib64 ]; then
+      libdir=$prefix/lib64
+    fi
+    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
+    echo "Running ./configure with $EXTRA_ARGS $@"
+  else
+    if test -z "$*" && test ! -f "$THEDIR/config.status"; 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
+fi
 
-gnulib_hash()
+# Compute the hash we'll use to determine whether rerunning bootstrap
+# is required.  The first is just the SHA1 that selects a gnulib snapshot.
+# The second ensures that whenever we change the set of gnulib modules used
+# by this package, we rerun bootstrap to pull in the matching set of files.
+# The third ensures that whenever we change the set of local gnulib diffs,
+# we rerun bootstrap to pull in those diffs.
+bootstrap_hash()
 {
-    local no_git=$1
-
     if test "$no_git"; then
-        echo "no-git"
+        echo no-git
         return
     fi
-
-    # Compute the hash we'll use to determine whether rerunning bootstrap
-    # is required. The first is just the SHA1 that selects a gnulib snapshot.
-    # The second ensures that whenever we change the set of gnulib modules used
-    # by this package, we rerun bootstrap to pull in the matching set of files.
-    # The third ensures that whenever we change the set of local gnulib diffs,
-    # we rerun bootstrap to pull in those diffs.
-    git submodule status .gnulib | awk '{ print $1 }'
+    git submodule status | sed 's/^[ +-]//;s/ .*//'
     git hash-object bootstrap.conf
-    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
+    git ls-tree -d HEAD gnulib/local | awk '{print $3}'
 }
 
-# Only look into git submodules if we're in a git checkout
+# 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.
+# Also, running 'make rpm' tends to litter the po/ directory, and some people
+# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates
+# the required file po/Makevars.
+# Only run bootstrap from a git checkout, never from a tarball.
 if test -d .git || test -f .git; then
-
-    # Check for dirty submodules
-    if test -z "$CLEAN_SUBMODULE"; then
-        for path in $(git submodule status | awk '{ print $2 }'); do
-            case "$(git diff "$path")" in
-                *-dirty*)
-                    echo "error: $path is dirty, please investigate" >&2
-                    echo "set CLEAN_SUBMODULE to discard submodule changes" >&2
-                    exit 1
-                    ;;
-            esac
-        done
+    curr_status=.git-module-status t=
+    if test "$no_git"; then
+        t=no-git
+    elif test -d .gnulib; then
+        t=$(bootstrap_hash; git diff .gnulib)
     fi
-    if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then
-        if test -z "$dry_run"; then
-            echo "Cleaning up submodules..."
-            git submodule foreach 'git clean -dfqx && git reset --hard' || {
-                die "Cleaning up submodules failed"
-            }
-        fi
-    fi
-
-    # Update all submodules. If any of the submodules has not been
-    # initialized yet, it will be initialized now; moreover, any submodule
-    # with uncommitted changes will be returned to the expected state
-    echo "Updating submodules..."
-    git submodule update --init || {
-        die "Updating submodules failed"
-    }
-
-    # The expected hash, eg. the one computed after the last
-    # successful bootstrap run, is stored on disk
-    state_file=.git-module-status
-    expected_hash=$(cat "$state_file" 2>/dev/null)
-    actual_hash=$(gnulib_hash "$no_git")
-
-    if test "$actual_hash" = "$expected_hash" && \
-       test -f po/Makevars && test -f AUTHORS; then
-        # The gnulib hash matches our expectations, and all the files
-        # that can only be generated through bootstrap are present:
-        # we just need to run autoreconf. Unless we're performing a
-        # dry run, of course...
-        if test -z "$dry_run"; then
-            echo "Running autoreconf..."
-            autoreconf -if || {
-                die "autoreconf failed"
-            }
-        fi
+    case $t:${CLEAN_SUBMODULE+set} in
+        *:set) ;;
+        *-dirty*)
+            echo "error: gnulib submodule is dirty, please investigate" 2>&1
+            echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1
+            exit 1 ;;
+    esac
+    # Keep this test in sync with cfg.mk:_update_required
+    if test "$t" = "$(cat $curr_status 2>/dev/null)" \
+        && test -f "po/Makevars" && test -f AUTHORS; then
+        # good, it's up to date, all we need is autoreconf
+        autoreconf -if
     else
-        # Whenever the gnulib submodule or any of the related bits
-        # has been changed in some way (see gnulib_hash) we need to
-        # run bootstrap again. If we're performing a dry run, we
-        # change the return code instead to signal our caller
-        if test "$dry_run"; then
-            dry_run=2
-        else
-            echo "Running bootstrap..."
-            ./bootstrap$no_git --bootstrap-sync || {
-                die "bootstrap failed"
-            }
-            gnulib_hash >"$state_file"
+        if test -z "$no_git" && test ${CLEAN_SUBMODULE+set}; then
+            echo cleaning up submodules...
+            git submodule foreach 'git clean -dfqx && git reset --hard'
         fi
+        echo running bootstrap$no_git...
+        ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \
+            || { echo "Failed to bootstrap, please investigate."; exit 1; }
     fi
 fi
 
-# When performing a dry run, we can stop here
-test "$dry_run" && exit "$dry_run"
+test -n "$NOCONFIGURE" && exit 0
 
-# If asked not to run configure, we can stop here
-test "$NOCONFIGURE" && exit 0
+cd "$THEDIR"
 
-cd "$starting_point" || {
-    die "Failed to cd into $starting_point"
-}
-
-if test "$OBJ_DIR"; then
-    mkdir -p "$OBJ_DIR" || {
-        die "Failed to create $OBJ_DIR"
-    }
-    cd "$OBJ_DIR" || {
-        die "Failed to cd into $OBJ_DIR"
-    }
+if test "x$OBJ_DIR" != x; then
+    mkdir -p "$OBJ_DIR"
+    cd "$OBJ_DIR"
 fi
 
-if test -z "$*" && test -z "$extra_args" && test -f config.status; then
-    echo "Running config.status..."
-    ./config.status --recheck || {
-        die "config.status failed"
-    }
+if test -z "$*" && test -z "$EXTRA_ARGS" && test -f config.status; then
+    ./config.status --recheck
 else
-    if test -z "$*" && test -z "$extra_args"; 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."
-    else
-        echo "Running configure with $extra_args $@"
-    fi
-    "$srcdir/configure" $extra_args "$@" || {
-        die "configure failed"
-    }
-fi
-
-echo
-echo "Now type 'make' to compile libvirt."
+    $srcdir/configure $EXTRA_ARGS "$@"
+fi && {
+    echo
+    echo "Now type 'make' to compile libvirt."
+}

build-aux/augeas-gentest.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #
 # augeas-gentest.pl: Generate an augeas test file, from an
 #                    example config file + test file template

build-aux/check-spacing.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #
 # check-spacing.pl: Report any usage of 'function (..args..)'
 # Also check for other syntax issues, such as correct use of ';'

build-aux/mock-noinline.pl

@@ -1,72 +0,0 @@
-#!/usr/bin/env perl
-
-my %noninlined;
-my %mocked;
-
-# Functions in public header don't get the noinline annotation
-# so whitelist them here
-$noninlined{"virEventAddTimeout"} = 1;
-
-foreach my $arg (@ARGV) {
-    if ($arg =~ /\.h$/) {
-        #print "Scan header $arg\n";
-        &scan_annotations($arg);
-    } elsif ($arg =~ /mock\.c$/) {
-        #print "Scan mock $arg\n";
-        &scan_overrides($arg);
-    }
-}
-
-my $warned = 0;
-foreach my $func (keys %mocked) {
-    next if exists $noninlined{$func};
-
-    $warned++;
-    print STDERR "$func is mocked at $mocked{$func} but missing noinline annotation\n";
-}
-
-exit $warned ? 1 : 0;
-
-
-sub scan_annotations {
-    my $file = shift;
-
-    open FH, $file or die "cannot read $file: $!";
-
-    my $func;
-    while (<FH>) {
-        if (/^\s*(\w+)\(/ || /^(?:\w+\*?\s+)+(?:\*\s*)?(\w+)\(/) {
-            my $name = $1;
-            if ($name !~ /ATTRIBUTE/) {
-                $func = $name;
-            }
-        } elsif (/^\s*$/) {
-            $func = undef;
-        }
-        if (/ATTRIBUTE_NOINLINE/) {
-            if (defined $func) {
-                $noninlined{$func} = 1;
-            }
-        }
-    }
-
-    close FH
-}
-
-sub scan_overrides {
-    my $file = shift;
-
-    open FH, $file or die "cannot read $file: $!";
-
-    my $func;
-    while (<FH>) {
-        if (/^(\w+)\(/ || /^\w+\s*(?:\*\s*)?(\w+)\(/) {
-            my $name = $1;
-            if ($name =~ /^vir/) {
-                $mocked{$name} = "$file:$.";
-            }
-        }
-    }
-
-    close FH
-}

build-aux/prohibit-duplicate-header.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 use strict;
 

cfg.mk

@@ -91,7 +91,7 @@ endif
 
 # Files that should never cause syntax check failures.
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-  (^(docs/(news(-[0-9]*)?\.html\.in|.*\.patch))|\.(po|fig|gif|ico|png))$$
+  (^(HACKING|docs/(news(-[0-9]*)?\.html\.in|.*\.patch))|\.(po|fig|gif|ico|png))$$
 
 # Functions like free() that are no-ops on NULL arguments.
 useless_free_options =				\
@@ -284,11 +284,11 @@ sc_avoid_write:
 
 # In debug statements, print flags as bitmask and mode_t as octal.
 sc_flags_debug:
-	@prohibit='\<mode=%[0-9.]*[diuxo]'				\
-	halt='use \"0%o\" to debug mode_t values'			\
+	@prohibit='\<mode=%[0-9.]*[diux]'				\
+	halt='use %o to debug mode_t values'				\
 	  $(_sc_search_regexp)
-	@prohibit='[Ff]lags=%[0-9.]*l*[dioux]'				\
-	halt='use \"0x%x\" to debug flag values'			\
+	@prohibit='[Ff]lags=%[0-9.]*l*[diou]'				\
+	halt='use %x to debug flag values'				\
 	  $(_sc_search_regexp)
 
 # Prefer 'unsigned int flags', along with checks for unknown flags.
@@ -777,7 +777,7 @@ sc_prohibit_cross_inclusion:
 	    locking/) safe="($$dir|util|conf|rpc)";;			\
 	    cpu/| network/| node_device/| rpc/| security/| storage/)	\
 	      safe="($$dir|util|conf|storage)";;			\
-	    xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen|cpu)";;	\
+	    xenapi/ | xenconfig/ ) safe="($$dir|util|conf|xen)";;	\
 	    *) safe="($$dir|$(mid_dirs)|util)";;			\
 	  esac;								\
 	  in_vc_files="^src/$$dir"					\
@@ -910,11 +910,12 @@ sc_curly_braces_style:
 '^\s*(?!([a-zA-Z_]*for_?each[a-zA-Z_]*) ?\()([_a-zA-Z0-9]+( [_a-zA-Z0-9]+)* ?\()?(\*?[_a-zA-Z0-9]+(,? \*?[_a-zA-Z0-9\[\]]+)+|void)\) ?\{'		\
 	$$files; then							\
 	  echo '$(ME): Non-K&R style used for curly braces around'	\
-	    'function body' 1>&2; exit 1;		\
+		'function body, see HACKING' 1>&2; exit 1;		\
 	fi;								\
 	if $(GREP) -A1 -En ' ((if|for|while|switch) \(|(else|do)\b)[^{]*$$'\
 	  $$files | $(GREP) '^[^ ]*- *{'; then				\
-	  echo '$(ME): Use hanging braces for compound statements' 1>&2; exit 1; \
+	  echo '$(ME): Use hanging braces for compound statements,'	\
+		'see HACKING' 1>&2; exit 1;				\
 	fi
 
 sc_prohibit_windows_special_chars_in_filename:
@@ -983,8 +984,8 @@ sc_prohibit_sysconf_pagesize:
 	  $(_sc_search_regexp)
 
 sc_prohibit_virSecurity:
-	@grep -Pn 'virSecurityManager(?!Ptr)' $$($(VC_LIST_EXCEPT) | grep 'src/qemu/' | \
-		grep -v 'src/qemu/qemu_security') && \
+	@grep -Pn 'virSecurityManager(?!Ptr)' $$($(VC_LIST_EXCEPT) | grep '^src/qemu/' | \
+		grep -v '^src/qemu/qemu_security') && \
 		{ echo '$(ME): prefer qemuSecurity wrappers' 1>&2; exit 1; } || :
 
 sc_prohibit_pthread_create:
@@ -1013,42 +1014,38 @@ sc_gettext_init:
 	halt='the above files do not call virGettextInitialize'		\
 	  $(_sc_search_regexp)
 
-sc_prohibit_obj_free_apis_in_virsh:
-	@prohibit='\bvir(Domain|DomainSnapshot)Free\b' \
-	in_vc_files='virsh.*\.[ch]$$'                              \
-	exclude='sc_prohibit_obj_free_apis_in_virsh' \
-	halt='avoid using virDomain(Snapshot)Free in virsh, use virsh-prefixed wrappers instead' \
-	  $(_sc_search_regexp)
-
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null
 
 ifneq ($(_gl-Makefile),)
 ifeq (0,$(MAKELEVEL))
-  _dry_run_result := $(shell \
-      cd '$(srcdir)'; \
-      test -d .git || test -f .git || { echo 0; exit; }; \
-      $(srcdir)/autogen.sh --dry-run >/dev/null 2>&1; \
-      echo $$?; \
-  )
+  _curr_status = .git-module-status
+  # The sed filter accommodates those who check out on a commit from which
+  # no tag is reachable.  In that case, git submodule status prints a "-"
+  # in column 1 and does not print a "git describe"-style string after the
+  # submodule name.  Contrast these:
+  # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
+  #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
+  # $ cat .git-module-status
+  # b653eda3ac4864de205419d9f41eec267cb89eeb
+  #
+  # Keep this logic in sync with autogen.sh.
+  _submodule_hash = $(SED) 's/^[ +-]//;s/ .*//'
+  _update_required := $(shell						\
+      cd '$(srcdir)';							\
+      test -d .git || { echo 0; exit; };				\
+      test -f po/Makevars || { echo 1; exit; };				\
+      test -f AUTHORS || { echo 1; exit; };				\
+      test "no-git" = "$$(cat $(_curr_status))" && { echo 0; exit; };	\
+      actual=$$(git submodule status | $(_submodule_hash);		\
+		git hash-object bootstrap.conf;				\
+		git ls-tree -d HEAD gnulib/local | awk '{print $$3}';	\
+		git diff .gnulib);					\
+      stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";	\
+      test "$$stamp" = "$$actual"; echo $$?)
   _clean_requested = $(filter %clean,$(MAKECMDGOALS))
-
-  # A return value of 0 means no action is required
-
-  # A return value of 1 means a genuine error has occurred while
-  # performing the dry run, and it should be reported so it can
-  # be investigated
-  ifeq (1,$(_dry_run_result))
-    $(info INFO: autogen.sh error, running again to show details)
-maint.mk Makefile: _autogen_error
-  endif
-
-  # A return value of 2 means that autogen.sh needs to be executed
-  # in earnest before building, probably because of gnulib updates.
-  # We don't run autogen.sh if the clean target has been invoked,
-  # though, as it would be quite pointless
-  ifeq (2,$(_dry_run_result)$(_clean_requested))
-    $(info INFO: running autogen.sh is required, running it now...)
+  ifeq (1,$(_update_required)$(_clean_requested))
+    $(info INFO: gnulib update required; running ./autogen.sh first)
     $(shell touch $(srcdir)/AUTHORS $(srcdir)/ChangeLog)
 maint.mk Makefile: _autogen
   endif
@@ -1062,13 +1059,10 @@ _autogen:
 	$(srcdir)/autogen.sh
 	./config.status
 
-.PHONY: _autogen_error
-_autogen_error:
-	$(srcdir)/autogen.sh --dry-run
-
+# regenerate HACKING as part of the syntax-check
 ifneq ($(_gl-Makefile),)
-syntax-check: spacing-check test-wrap-argv \
-	prohibit-duplicate-header mock-noinline
+syntax-check: $(top_srcdir)/HACKING spacing-check test-wrap-argv \
+	prohibit-duplicate-header
 endif
 
 # Don't include duplicate header in the source (either *.c or *.h)
@@ -1079,11 +1073,8 @@ prohibit-duplicate-header:
 spacing-check:
 	$(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
 	$(PERL) $(top_srcdir)/build-aux/check-spacing.pl $$files || \
-	  { echo '$(ME): incorrect formatting' 1>&2; exit 1; }
-
-mock-noinline:
-	$(AM_V_GEN)files=`$(VC_LIST) | grep '\.[ch]$$'`; \
-	$(PERL) $(top_srcdir)/build-aux/mock-noinline.pl $$files
+	  { echo '$(ME): incorrect formatting, see HACKING for rules' 1>&2; \
+	    exit 1; }
 
 test-wrap-argv:
 	$(AM_V_GEN)files=`$(VC_LIST) | grep -E '\.(ldargs|args)'`; \
@@ -1111,7 +1102,7 @@ $(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
 exclude_file_name_regexp--sc_avoid_strcase = ^tools/vsh\.h$$
 
 _src1=libvirt-stream|qemu/qemu_monitor|util/vir(command|file|fdstream)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon
-_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock|commandhelper
+_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock
 exclude_file_name_regexp--sc_avoid_write = \
   ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$
 
@@ -1126,7 +1117,7 @@ exclude_file_name_regexp--sc_copyright_usage = \
   ^COPYING(|\.LESSER)$$
 
 exclude_file_name_regexp--sc_flags_usage = \
-  ^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/((vir(cgroup|pci|test|usb)|nss|qemuxml2argv)mock|virfilewrapper)\.c$$)
+  ^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|test|usb)|nss|qemuxml2argv)mock\.c$$)
 
 exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
   ^(src/rpc/gendispatch\.pl$$|tests/)
@@ -1146,10 +1137,10 @@ exclude_file_name_regexp--sc_prohibit_asprintf = \
   ^(cfg\.mk|bootstrap.conf$$|examples/|src/util/virstring\.[ch]$$|tests/vircgroupmock\.c$$)
 
 exclude_file_name_regexp--sc_prohibit_strdup = \
-  ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c|tests/commandhelper\.c$$)
+  ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c$$)
 
 exclude_file_name_regexp--sc_prohibit_close = \
-  (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c|tests/commandhelper\.c)$$)
+  (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c)$$)
 
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
   (^tests/(qemuhelp|virhostcpu|virpcitest)data/|docs/js/.*\.js|docs/fonts/.*\.woff|\.diff|tests/virconfdata/no-newline\.conf$$)
@@ -1173,7 +1164,7 @@ exclude_file_name_regexp--sc_prohibit_select = \
 	^cfg\.mk$$
 
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-  ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$
+  ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock)\.c|tools/wireshark/src/packet-libvirt\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_readlink = \
   ^src/(util/virutil|lxc/lxc_container)\.c$$
@@ -1255,7 +1246,7 @@ exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
   ^tests/virtestmock.c$$
 
 exclude_file_name_regexp--sc_prohibit_readdir = \
-  ^tests/(.*mock|virfilewrapper)\.c$$
+  ^tests/.*mock\.c$$
 
 exclude_file_name_regexp--sc_prohibit_cross_inclusion = \
   ^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$

config-post.h

@@ -74,22 +74,20 @@
 # undef WITH_CAPNG
 #endif /* LIBVIRT_NSS */
 
-#ifndef __GNUC__
-# error "Libvirt requires GCC >= 4.4, or CLang"
-#endif
-
 /*
- * Define __GNUC_PREREQ to a sane default if it isn't yet defined.
+ * Define __GNUC__ to a sane default if it isn't yet defined.
  * This is done here so that it's included as early as possible; gnulib relies
  * on this to be defined in features.h, which should be included from ctype.h.
  * This doesn't happen on many non-glibc systems.
- * When __GNUC_PREREQ is not defined, gnulib defines it to 0, which breaks things.
+ * When __GNUC__ is not defined, gnulib defines it to 0, which breaks things.
  */
-#ifndef __GNUC_PREREQ
-# define __GNUC_PREREQ(maj, min)                                        \
-    ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#endif
-
-#if !(__GNUC_PREREQ(4, 4) || defined(__clang__))
-# error "Libvirt requires GCC >= 4.4, or CLang"
+#ifdef __GNUC__
+# ifndef __GNUC_PREREQ
+#  if defined __GNUC__ && defined __GNUC_MINOR__
+#   define __GNUC_PREREQ(maj, min)                                        \
+   ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#  else
+#   define __GNUC_PREREQ(maj, min) 0
+#  endif
+# endif
 #endif

configure.ac

@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this library.  If not, see
 dnl <http://www.gnu.org/licenses/>.
 
-AC_INIT([libvirt], [3.8.0], [libvir-list@redhat.com], [], [http://libvirt.org])
+AC_INIT([libvirt], [3.2.1], [libvir-list@redhat.com], [], [http://libvirt.org])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -328,7 +328,7 @@ dnl Availability of various common headers (non-fatal if missing).
 AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \
   sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \
   sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \
-  libtasn1.h sys/ucred.h sys/mount.h stdarg.h])
+  libtasn1.h sys/ucred.h sys/mount.h])
 dnl Check whether endian provides handy macros.
 AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]])
 AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64])
@@ -347,16 +347,10 @@ AC_CHECK_TYPE([struct sockpeercred],
   ]])
 
 AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO,
-                ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES,
-                ETHTOOL_SCOALESCE, ETHTOOL_GCOALESCE],
+                ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES],
   [], [], [[#include <linux/ethtool.h>
   ]])
 
-AC_CHECK_DECLS([SEEK_HOLE], [], [],
-               [#include <sys/types.h>
-                #include <unistd.h>])
-
-
 dnl Our only use of libtasn1.h is in the testsuite, and can be skipped
 dnl if the header is not present.  Assume -ltasn1 is present if the
 dnl header could be found.
@@ -627,28 +621,11 @@ if test "$with_linux" = "yes"; then
     AC_CHECK_HEADERS([linux/btrfs.h])
 fi
 
-dnl
-dnl check for DEVLINK_CMD_ESWITCH_GET
-dnl
-dnl Assume DEVLINK_ESWITCH_MODE_SWITCHDEV is also
-dnl available, as it was introudced in kernel 4.8
-dnl along with the original spelling of this constant
-dnl (DEVLINK_CMD_ESWITCH_MODE_GET, not supported by libvirt)
-dnl
-if test "$with_linux" = "yes"; then
-    AC_CHECK_HEADERS([linux/devlink.h])
-    AC_CHECK_DECLS([DEVLINK_CMD_ESWITCH_GET], [], [],
-                   [[#include <linux/devlink.h>]])
-fi
-
 dnl Allow perl/python overrides
 AC_PATH_PROGS([PYTHON], [python2 python])
-if test -z "$PYTHON"; then
-         AC_MSG_ERROR(['python' or 'python2' binary is required to build libvirt])
-fi
 AC_PATH_PROG([PERL], [perl])
 if test -z "$PERL"; then
-         AC_MSG_ERROR(['perl' binary is required to build libvirt])
+         AC_MSG_ERROR([Failed to find perl.])
 fi
 
 LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check])
@@ -901,8 +878,6 @@ AC_CONFIG_FILES([\
         Makefile src/Makefile include/libvirt/Makefile docs/Makefile \
         gnulib/lib/Makefile \
         gnulib/tests/Makefile \
-        .color_coded \
-        .ycm_extra_conf.py \
         libvirt.pc \
         libvirt-qemu.pc \
         libvirt-lxc.pc \
@@ -1019,8 +994,8 @@ LIBVIRT_WIN_RESULT_WINDRES
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Test suite])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([         Coverage: $enable_test_coverage])
-AC_MSG_NOTICE([        Alloc OOM: $enable_test_oom])
+AC_MSG_NOTICE([         Coverage: $enable_coverage])
+AC_MSG_NOTICE([        Alloc OOM: $enable_oom])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Miscellaneous])
 AC_MSG_NOTICE([])

daemon/Makefile.am

@@ -208,6 +208,63 @@ libvirtd_LDADD += \
 	../src/libvirt_driver_remote.la \
 	$(NULL)
 
+if ! WITH_DRIVER_MODULES
+if WITH_QEMU
+    libvirtd_LDADD += ../src/libvirt_driver_qemu.la
+if WITH_DTRACE_PROBES
+    libvirtd_LDADD += ../src/libvirt_qemu_probes.lo
+endif WITH_DTRACE_PROBES
+endif WITH_QEMU
+
+if WITH_LXC
+    libvirtd_LDADD += ../src/libvirt_driver_lxc.la
+endif WITH_LXC
+
+if WITH_XEN
+    libvirtd_LDADD += ../src/libvirt_driver_xen.la
+endif WITH_XEN
+
+if WITH_LIBXL
+    libvirtd_LDADD += ../src/libvirt_driver_libxl.la
+endif WITH_LIBXL
+
+if WITH_UML
+    libvirtd_LDADD += ../src/libvirt_driver_uml.la
+endif WITH_UML
+
+if WITH_VBOX
+    libvirtd_LDADD += ../src/libvirt_driver_vbox.la
+endif WITH_VBOX
+
+if WITH_VZ
+    libvirtd_LDADD += ../src/libvirt_driver_vz.la
+endif WITH_VZ
+
+if WITH_STORAGE
+    libvirtd_LDADD += ../src/libvirt_driver_storage.la
+endif WITH_STORAGE
+
+if WITH_NETWORK
+    libvirtd_LDADD += ../src/libvirt_driver_network.la
+endif WITH_NETWORK
+
+if WITH_INTERFACE
+    libvirtd_LDADD += ../src/libvirt_driver_interface.la
+endif WITH_INTERFACE
+
+if WITH_NODE_DEVICES
+    libvirtd_LDADD += ../src/libvirt_driver_nodedev.la
+endif WITH_NODE_DEVICES
+
+if WITH_SECRETS
+    libvirtd_LDADD += ../src/libvirt_driver_secret.la
+endif WITH_SECRETS
+
+if WITH_NWFILTER
+    libvirtd_LDADD += ../src/libvirt_driver_nwfilter.la
+endif WITH_NWFILTER
+endif ! WITH_DRIVER_MODULES
+
 libvirtd_LDADD += ../src/libvirt.la
 
 if WITH_POLKIT

daemon/admin.c

@@ -446,7 +446,7 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNUSED,
     char *outputs = NULL;
     int noutputs = 0;
 
-    if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags)) < 0) {
+    if ((noutputs = adminConnectGetLoggingOutputs(&outputs, args->flags) < 0)) {
         virNetMessageSaveError(rerr);
         return -1;
     }

daemon/libvirtd-config.c

@@ -153,6 +153,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
 
     data->prio_workers = 5;
 
+    data->max_requests = 20;
     data->max_client_requests = 5;
 
     data->audit_level = 1;
@@ -347,6 +348,8 @@ daemonConfigLoadOptions(struct daemonConfig *data,
     if (virConfGetValueUInt(conf, "prio_workers", &data->prio_workers) < 0)
         goto error;
 
+    if (virConfGetValueUInt(conf, "max_requests", &data->max_requests) < 0)
+        goto error;
     if (virConfGetValueUInt(conf, "max_client_requests", &data->max_client_requests) < 0)
         goto error;
 
@@ -430,7 +433,7 @@ int daemonConfigLoadData(struct daemonConfig *data,
     virConfPtr conf;
     int ret;
 
-    conf = virConfReadString(filedata, 0);
+    conf = virConfReadMem(filedata, strlen(filedata), 0);
     if (!conf)
         return -1;
 

daemon/libvirtd-config.h

@@ -71,6 +71,7 @@ struct daemonConfig {
 
     unsigned int prio_workers;
 
+    unsigned int max_requests;
     unsigned int max_client_requests;
 
     unsigned int log_level;

daemon/libvirtd.aug

@@ -60,6 +60,7 @@ module Libvirtd =
                         | int_entry "max_clients"
                         | int_entry "max_queued_clients"
                         | int_entry "max_anonymous_clients"
+                        | int_entry "max_requests"
                         | int_entry "max_client_requests"
                         | int_entry "prio_workers"
 

daemon/libvirtd.c

@@ -60,7 +60,52 @@
 #include "virgettext.h"
 #include "util/virnetdevopenvswitch.h"
 
-#include "driver.h"
+#ifdef WITH_DRIVER_MODULES
+# include "driver.h"
+#else
+# ifdef WITH_QEMU
+#  include "qemu/qemu_driver.h"
+# endif
+# ifdef WITH_LXC
+#  include "lxc/lxc_driver.h"
+# endif
+# ifdef WITH_XEN
+#  include "xen/xen_driver.h"
+# endif
+# ifdef WITH_LIBXL
+#  include "libxl/libxl_driver.h"
+# endif
+# ifdef WITH_UML
+#  include "uml/uml_driver.h"
+# endif
+# ifdef WITH_VBOX
+#  include "vbox/vbox_driver.h"
+# endif
+# ifdef WITH_BHYVE
+#  include "bhyve/bhyve_driver.h"
+# endif
+# ifdef WITH_NETWORK
+#  include "network/bridge_driver.h"
+# endif
+# ifdef WITH_INTERFACE
+#  include "interface/interface_driver.h"
+# endif
+# ifdef WITH_STORAGE
+#  include "storage/storage_driver.h"
+# endif
+# ifdef WITH_NODE_DEVICES
+#  include "node_device/node_device_driver.h"
+# endif
+# ifdef WITH_SECRETS
+#  include "secret/secret_driver.h"
+# endif
+# ifdef WITH_NWFILTER
+#  include "nwfilter/nwfilter_driver.h"
+# endif
+#endif
+#ifdef WITH_VZ
+# include "vz/vz_driver.h"
+#endif
 
 #include "configmake.h"
 
@@ -217,47 +262,49 @@ daemonUnixSocketPaths(struct daemonConfig *config,
                       char **rosockfile,
                       char **admsockfile)
 {
-    int ret = -1;
-    char *rundir = NULL;
-
     if (config->unix_sock_dir) {
         if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir) < 0)
-            goto cleanup;
+            goto error;
 
         if (privileged) {
-            if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0)
-                goto cleanup;
+            if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0)
+                goto error;
+            if (virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0)
+                goto error;
         }
     } else {
         if (privileged) {
             if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock") < 0 ||
                 VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro") < 0 ||
                 VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/libvirt-admin-sock") < 0)
-                goto cleanup;
+                goto error;
         } else {
+            char *rundir = NULL;
             mode_t old_umask;
 
             if (!(rundir = virGetUserRuntimeDirectory()))
-                goto cleanup;
+                goto error;
 
             old_umask = umask(077);
             if (virFileMakePath(rundir) < 0) {
                 umask(old_umask);
-                goto cleanup;
+                goto error;
             }
             umask(old_umask);
 
             if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0)
-                goto cleanup;
+                virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) {
+                VIR_FREE(rundir);
+                goto error;
+            }
+
+            VIR_FREE(rundir);
         }
     }
+    return 0;
 
-    ret = 0;
- cleanup:
-    VIR_FREE(rundir);
-    return ret;
+ error:
+    return -1;
 }
 
 
@@ -296,8 +343,13 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority)
 }
 
 
-#define VIR_DAEMON_LOAD_MODULE(func, module) \
+#ifdef WITH_DRIVER_MODULES
+# define VIR_DAEMON_LOAD_MODULE(func, module) \
     virDriverLoadModule(module, #func)
+#else
+# define VIR_DAEMON_LOAD_MODULE(func, module) \
+    func()
+#endif
 static void daemonInitialize(void)
 {
     /*
@@ -561,11 +613,11 @@ daemonSetupNetworking(virNetServerPtr srv,
 
 #if WITH_SASL
     if (config->auth_unix_rw == REMOTE_AUTH_SASL ||
-        (sock_path_ro && config->auth_unix_ro == REMOTE_AUTH_SASL) ||
+        config->auth_unix_ro == REMOTE_AUTH_SASL ||
 # if WITH_GNUTLS
-        (ipsock && config->listen_tls && config->auth_tls == REMOTE_AUTH_SASL) ||
+        config->auth_tls == REMOTE_AUTH_SASL ||
 # endif
-        (ipsock && config->listen_tcp && config->auth_tcp == REMOTE_AUTH_SASL)) {
+        config->auth_tcp == REMOTE_AUTH_SASL) {
         saslCtxt = virNetSASLContextNewServer(
             (const char *const*)config->sasl_allowed_username_list);
         if (!saslCtxt)
@@ -615,15 +667,19 @@ daemonSetupLogging(struct daemonConfig *config,
      * Libvirtd's order of precedence is:
      * cmdline > environment > config
      *
-     * Given the precedence, we must process the variables in the opposite
+     * The default output is applied only if there was no setting from either
+     * the config or the environment. Because we don't have a way to determine
+     * if the log level has been set, we must process variables in the opposite
      * order, each one overriding the previous.
      */
     if (config->log_level != 0)
         virLogSetDefaultPriority(config->log_level);
 
-    /* In case the config is empty, both filters and outputs will become empty,
-     * however we can't start with empty outputs, thus we'll need to define and
-     * setup a default one.
+    if (virLogSetDefaultOutput("libvirtd.log", godaemon, privileged) < 0)
+        return -1;
+
+    /* In case the config is empty, the filters become empty and outputs will
+     * be set to default
      */
     ignore_value(virLogSetFilters(config->log_filters));
     ignore_value(virLogSetOutputs(config->log_outputs));
@@ -637,15 +693,6 @@ daemonSetupLogging(struct daemonConfig *config,
     if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
         virLogSetDefaultPriority(VIR_LOG_INFO);
 
-    /* Define the default output. This is only applied if there was no setting
-     * from either the config or the environment.
-     */
-    if (virLogSetDefaultOutput("libvirtd.log", godaemon, privileged) < 0)
-        return -1;
-
-    if (virLogGetNbOutputs() == 0)
-        virLogSetOutputs(virLogGetDefaultOutput());
-
     return 0;
 }
 
@@ -750,7 +797,7 @@ static void daemonInhibitCallback(bool inhibit, void *opaque)
 }
 
 
-#ifdef WITH_DBUS
+#ifdef HAVE_DBUS
 static DBusConnection *sessionBus;
 static DBusConnection *systemBus;
 
@@ -842,7 +889,7 @@ static void daemonRunStateInit(void *opaque)
 
     driversInitialized = true;
 
-#ifdef WITH_DBUS
+#ifdef HAVE_DBUS
     /* Tie the non-privileged libvirtd to the session/shutdown lifecycle */
     if (!virNetDaemonIsPrivileged(dmn)) {
 

daemon/libvirtd.conf

@@ -301,10 +301,20 @@
 # (notably domainDestroy) can be executed in this pool.
 #prio_workers = 5
 
+# Total global limit on concurrent RPC calls. Should be
+# at least as large as max_workers. Beyond this, RPC requests
+# will be read into memory and queued. This directly impacts
+# memory usage, currently each request requires 256 KB of
+# memory. So by default up to 5 MB of memory is used
+#
+# XXX this isn't actually enforced yet, only the per-client
+# limit is used so far
+#max_requests = 20
+
 # Limit on concurrent requests from a single client
 # connection. To avoid one client monopolizing the server
-# this should be a small fraction of the global max_workers
-# parameter.
+# this should be a small fraction of the global max_requests
+# and max_workers parameter
 #max_client_requests = 5
 
 # Same processing controls, but this time for the admin interface.

daemon/libvirtd.pod

@@ -56,8 +56,10 @@ Use this name for the PID file, overriding the default value.
 
 =item B<-t, --timeout> I<SECONDS>
 
-Exit after timeout period (in seconds), provided there are neither any client
-connections nor any running domains.
+Exit after timeout period (in seconds) elapse with no client connections
+or registered resources.  Be aware that resources such as autostart
+networks will result in never reaching the timeout, even when there are
+no client connections.
 
 =item B<-v, --verbose>
 
@@ -79,7 +81,7 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration.
 
 =over
 
-=item F<SYSCONFDIR/libvirt/libvirtd.conf>
+=item F<SYSCONFDIR/libvirtd.conf>
 
 The default configuration file used by libvirtd, unless overridden on the
 command line using the B<-f>|B<--config> option.
@@ -112,7 +114,7 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
 
 =over
 
-=item F<$XDG_CONFIG_HOME/libvirt/libvirtd.conf>
+=item F<$XDG_CONFIG_HOME/libvirtd.conf>
 
 The default configuration file used by libvirtd, unless overridden on the
 command line using the B<-f>|B<--config> option.

daemon/remote.c

@@ -124,11 +124,7 @@ remoteDispatchObjectEventSend(virNetServerClientPtr client,
 static void
 remoteEventCallbackFree(void *opaque)
 {
-    daemonClientEventCallbackPtr callback = opaque;
-    if (!callback)
-        return;
-    virObjectUnref(callback->client);
-    VIR_FREE(callback);
+    VIR_FREE(opaque);
 }
 
 
@@ -652,7 +648,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn,
     /* build return data */
     memset(&data, 0, sizeof(data));
     if (VIR_STRDUP(data.path, path) < 0)
-        return -1;
+        goto error;
     data.type = type;
     data.status = status;
     make_nonnull_domain(&data.dom, dom);
@@ -671,6 +667,9 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn,
     }
 
     return 0;
+ error:
+    VIR_FREE(data.path);
+    return -1;
 }
 
 
@@ -1026,7 +1025,7 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn,
     memset(&data, 0, sizeof(data));
     data.callbackID = callback->callbackID;
     if (VIR_STRDUP(data.dst, dst) < 0)
-        return -1;
+        goto error;
     data.type = type;
     data.status = status;
     make_nonnull_domain(&data.dom, dom);
@@ -1036,6 +1035,9 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn,
                                   (xdrproc_t)xdr_remote_domain_event_block_job_2_msg, &data);
 
     return 0;
+ error:
+    VIR_FREE(data.dst);
+    return -1;
 }
 
 
@@ -1670,24 +1672,6 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r
                                   &msg);
 }
 
-#define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name)     \
-    do {                                                                    \
-        size_t i;                                                           \
-        for (i = 0; i < neventCallbacks; i++) {                             \
-            int callbackID = eventCallbacks[i]->callbackID;                 \
-            if (callbackID < 0) {                                           \
-                VIR_WARN("unexpected incomplete %s callback %zu", name, i); \
-                continue;                                                   \
-            }                                                               \
-            VIR_DEBUG("Deregistering remote %s event relay %d",             \
-                      name, callbackID);                                    \
-            eventCallbacks[i]->callbackID = -1;                             \
-            if (deregFcn(conn, callbackID) < 0)                             \
-                VIR_WARN("unexpected %s event deregister failure", name);   \
-        }                                                                   \
-        VIR_FREE(eventCallbacks);                                           \
-    } while (0);
-
 /*
  * You must hold lock for at least the client
  * We don't free stuff here, merely disconnect the client's
@@ -1702,27 +1686,98 @@ void remoteClientFreeFunc(void *data)
     /* Deregister event delivery callback */
     if (priv->conn) {
         virIdentityPtr sysident = virIdentityGetSystem();
+        size_t i;
 
         virIdentitySetCurrent(sysident);
 
-        DEREG_CB(priv->conn, priv->domainEventCallbacks,
-                 priv->ndomainEventCallbacks,
-                 virConnectDomainEventDeregisterAny, "domain");
-        DEREG_CB(priv->conn, priv->networkEventCallbacks,
-                 priv->nnetworkEventCallbacks,
-                 virConnectNetworkEventDeregisterAny, "network");
-        DEREG_CB(priv->conn, priv->storageEventCallbacks,
-                 priv->nstorageEventCallbacks,
-                 virConnectStoragePoolEventDeregisterAny, "storage");
-        DEREG_CB(priv->conn, priv->nodeDeviceEventCallbacks,
-                 priv->nnodeDeviceEventCallbacks,
-                 virConnectNodeDeviceEventDeregisterAny, "node device");
-        DEREG_CB(priv->conn, priv->secretEventCallbacks,
-                 priv->nsecretEventCallbacks,
-                 virConnectSecretEventDeregisterAny, "secret");
-        DEREG_CB(priv->conn, priv->qemuEventCallbacks,
-                 priv->nqemuEventCallbacks,
-                 virConnectDomainQemuMonitorEventDeregister, "qemu monitor");
+        for (i = 0; i < priv->ndomainEventCallbacks; i++) {
+            int callbackID = priv->domainEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete domain callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote domain event relay %d",
+                      callbackID);
+            priv->domainEventCallbacks[i]->callbackID = -1;
+            if (virConnectDomainEventDeregisterAny(priv->conn, callbackID) < 0)
+                VIR_WARN("unexpected domain event deregister failure");
+        }
+        VIR_FREE(priv->domainEventCallbacks);
+
+        for (i = 0; i < priv->nnetworkEventCallbacks; i++) {
+            int callbackID = priv->networkEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete network callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote network event relay %d",
+                      callbackID);
+            priv->networkEventCallbacks[i]->callbackID = -1;
+            if (virConnectNetworkEventDeregisterAny(priv->conn,
+                                                    callbackID) < 0)
+                VIR_WARN("unexpected network event deregister failure");
+        }
+        VIR_FREE(priv->networkEventCallbacks);
+
+        for (i = 0; i < priv->nstorageEventCallbacks; i++) {
+            int callbackID = priv->storageEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete storage pool callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote storage pool event relay %d",
+                      callbackID);
+            priv->storageEventCallbacks[i]->callbackID = -1;
+            if (virConnectStoragePoolEventDeregisterAny(priv->conn,
+                                                        callbackID) < 0)
+                VIR_WARN("unexpected storage pool event deregister failure");
+        }
+        VIR_FREE(priv->storageEventCallbacks);
+
+        for (i = 0; i < priv->nnodeDeviceEventCallbacks; i++) {
+            int callbackID = priv->nodeDeviceEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete node device callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote node device event relay %d",
+                      callbackID);
+            priv->nodeDeviceEventCallbacks[i]->callbackID = -1;
+            if (virConnectNodeDeviceEventDeregisterAny(priv->conn,
+                                                       callbackID) < 0)
+                VIR_WARN("unexpected node device event deregister failure");
+        }
+        VIR_FREE(priv->nodeDeviceEventCallbacks);
+
+        for (i = 0; i < priv->nsecretEventCallbacks; i++) {
+            int callbackID = priv->secretEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete secret callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote secret event relay %d",
+                      callbackID);
+            priv->secretEventCallbacks[i]->callbackID = -1;
+            if (virConnectSecretEventDeregisterAny(priv->conn,
+                                                   callbackID) < 0)
+                VIR_WARN("unexpected secret event deregister failure");
+        }
+        VIR_FREE(priv->secretEventCallbacks);
+
+        for (i = 0; i < priv->nqemuEventCallbacks; i++) {
+            int callbackID = priv->qemuEventCallbacks[i]->callbackID;
+            if (callbackID < 0) {
+                VIR_WARN("unexpected incomplete qemu monitor callback %zu", i);
+                continue;
+            }
+            VIR_DEBUG("Deregistering remote qemu monitor event relay %d",
+                      callbackID);
+            priv->qemuEventCallbacks[i]->callbackID = -1;
+            if (virConnectDomainQemuMonitorEventDeregister(priv->conn,
+                                                           callbackID) < 0)
+                VIR_WARN("unexpected qemu monitor event deregister failure");
+        }
+        VIR_FREE(priv->qemuEventCallbacks);
 
         if (priv->closeRegistered) {
             if (virConnectUnregisterCloseCallback(priv->conn,
@@ -1738,7 +1793,6 @@ void remoteClientFreeFunc(void *data)
 
     VIR_FREE(priv);
 }
-#undef DEREG_CB
 
 
 static void remoteClientCloseFunc(virNetServerClientPtr client)
@@ -3898,7 +3952,7 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED
      */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = VIR_DOMAIN_EVENT_ID_LIFECYCLE;
     callback->callbackID = -1;
     callback->legacy = true;
@@ -3925,7 +3979,7 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virMutexUnlock(&priv->lock);
@@ -4133,7 +4187,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     callback->legacy = true;
@@ -4160,7 +4214,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virMutexUnlock(&priv->lock);
@@ -4209,7 +4263,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     ref = callback;
@@ -4236,7 +4290,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(dom);
@@ -5323,7 +5377,7 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATTRIBUTE
 
     if (!(st = virStreamNew(priv->conn, VIR_STREAM_NONBLOCK)) ||
         !(stream = daemonCreateClientStream(client, st, remoteProgram,
-                                            &msg->header, false)))
+                                            &msg->header)))
         goto cleanup;
 
     if (virDomainMigratePrepareTunnel3Params(priv->conn, st, params, nparams,
@@ -5719,7 +5773,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     ref = callback;
@@ -5746,7 +5800,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(net);
@@ -5841,7 +5895,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     ref = callback;
@@ -5868,7 +5922,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(pool);
@@ -5962,7 +6016,7 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     ref = callback;
@@ -5989,7 +6043,7 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(dev);
@@ -6083,7 +6137,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->eventID = args->eventID;
     callback->callbackID = -1;
     ref = callback;
@@ -6110,7 +6164,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(secret);
@@ -6199,7 +6253,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U
      * success, we use 'ref' to save a copy of the pointer.  */
     if (VIR_ALLOC(callback) < 0)
         goto cleanup;
-    callback->client = virObjectRef(client);
+    callback->client = client;
     callback->callbackID = -1;
     ref = callback;
     if (VIR_APPEND_ELEMENT(priv->qemuEventCallbacks,
@@ -6226,7 +6280,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U
     rv = 0;
 
  cleanup:
-    remoteEventCallbackFree(callback);
+    VIR_FREE(callback);
     if (rv < 0)
         virNetMessageSaveError(rerr);
     virObjectUnref(dom);
@@ -6914,10 +6968,13 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server ATTRIBUTE_UNUSED,
 static virDomainPtr
 get_nonnull_domain(virConnectPtr conn, remote_nonnull_domain domain)
 {
+    virDomainPtr dom;
+    dom = virGetDomain(conn, domain.name, BAD_CAST domain.uuid);
     /* Should we believe the domain.id sent by the client?  Maybe
      * this should be a check rather than an assignment? XXX
      */
-    return virGetDomain(conn, domain.name, BAD_CAST domain.uuid, domain.id);
+    if (dom) dom->id = domain.id;
+    return dom;
 }
 
 static virNetworkPtr

daemon/stream.c

@@ -29,7 +29,6 @@
 #include "virlog.h"
 #include "virnetserverclient.h"
 #include "virerror.h"
-#include "libvirt_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_STREAMS
 
@@ -53,9 +52,6 @@ struct daemonClientStream {
     virNetMessagePtr rx;
     bool tx;
 
-    bool allowSkip;
-    size_t dataLen; /* How much data is there remaining until we see a hole */
-
     daemonClientStreamPtr next;
 };
 
@@ -231,23 +227,17 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
         int ret;
         virNetMessagePtr msg;
         virNetMessageError rerr;
-        virErrorPtr origErr = virSaveLastError();
 
         memset(&rerr, 0, sizeof(rerr));
         stream->closed = true;
         virStreamEventRemoveCallback(stream->st);
         virStreamAbort(stream->st);
-        if (origErr && origErr->code != VIR_ERR_OK) {
-            virSetError(origErr);
-        } else {
-            if (events & VIR_STREAM_EVENT_HANGUP)
-                virReportError(VIR_ERR_RPC,
-                               "%s", _("stream had unexpected termination"));
-            else
-                virReportError(VIR_ERR_RPC,
-                               "%s", _("stream had I/O failure"));
-        }
-        virFreeError(origErr);
+        if (events & VIR_STREAM_EVENT_HANGUP)
+            virReportError(VIR_ERR_RPC,
+                           "%s", _("stream had unexpected termination"));
+        else
+            virReportError(VIR_ERR_RPC,
+                           "%s", _("stream had I/O failure"));
 
         msg = virNetMessageNew(false);
         if (!msg) {
@@ -295,8 +285,7 @@ daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED,
 
     virMutexLock(&stream->priv->lock);
 
-    if (msg->header.type != VIR_NET_STREAM &&
-        msg->header.type != VIR_NET_STREAM_HOLE)
+    if (msg->header.type != VIR_NET_STREAM)
         goto cleanup;
 
     if (!virNetServerProgramMatches(stream->prog, msg))
@@ -332,8 +321,7 @@ daemonClientStream *
 daemonCreateClientStream(virNetServerClientPtr client,
                          virStreamPtr st,
                          virNetServerProgramPtr prog,
-                         virNetMessageHeaderPtr header,
-                         bool allowSkip)
+                         virNetMessageHeaderPtr header)
 {
     daemonClientStream *stream;
     daemonClientPrivatePtr priv = virNetServerClientGetPrivateData(client);
@@ -351,7 +339,6 @@ daemonCreateClientStream(virNetServerClientPtr client,
     stream->serial = header->serial;
     stream->filterID = -1;
     stream->st = st;
-    stream->allowSkip = allowSkip;
 
     return stream;
 }
@@ -661,52 +648,6 @@ daemonStreamHandleAbort(virNetServerClientPtr client,
 }
 
 
-static int
-daemonStreamHandleHole(virNetServerClientPtr client,
-                       daemonClientStream *stream,
-                       virNetMessagePtr msg)
-{
-    int ret;
-    virNetStreamHole data;
-
-    VIR_DEBUG("client=%p, stream=%p, proc=%d, serial=%u",
-              client, stream, msg->header.proc, msg->header.serial);
-
-    /* Let's check if client plays nicely and advertised usage of
-     * sparse stream upfront. */
-    if (!stream->allowSkip) {
-        virReportError(VIR_ERR_RPC, "%s",
-                       _("Unexpected stream hole"));
-        return -1;
-    }
-
-    if (virNetMessageDecodePayload(msg,
-                                   (xdrproc_t) xdr_virNetStreamHole,
-                                   &data) < 0)
-        return -1;
-
-    ret = virStreamSendHole(stream->st, data.length, data.flags);
-
-    if (ret < 0) {
-        virNetMessageError rerr;
-
-        memset(&rerr, 0, sizeof(rerr));
-
-        VIR_INFO("Stream send hole failed");
-        stream->closed = true;
-        virStreamEventRemoveCallback(stream->st);
-        virStreamAbort(stream->st);
-
-        return virNetServerProgramSendReplyError(stream->prog,
-                                                 client,
-                                                 msg,
-                                                 &rerr,
-                                                 &msg->header);
-    }
-
-    return 0;
-}
-
 
 /*
  * Called when the stream is signalled has being able to accept
@@ -725,31 +666,19 @@ daemonStreamHandleWrite(virNetServerClientPtr client,
         virNetMessagePtr msg = stream->rx;
         int ret;
 
-        if (msg->header.type == VIR_NET_STREAM_HOLE) {
-            /* Handle special case when the client sent us a hole.
-             * Otherwise just carry on with processing stream
-             * data. */
-            ret = daemonStreamHandleHole(client, stream, msg);
-        } else if (msg->header.type == VIR_NET_STREAM) {
-            switch (msg->header.status) {
-            case VIR_NET_OK:
-                ret = daemonStreamHandleFinish(client, stream, msg);
-                break;
+        switch (msg->header.status) {
+        case VIR_NET_OK:
+            ret = daemonStreamHandleFinish(client, stream, msg);
+            break;
 
-            case VIR_NET_CONTINUE:
-                ret = daemonStreamHandleWriteData(client, stream, msg);
-                break;
+        case VIR_NET_CONTINUE:
+            ret = daemonStreamHandleWriteData(client, stream, msg);
+            break;
 
-            case VIR_NET_ERROR:
-            default:
-                ret = daemonStreamHandleAbort(client, stream, msg);
-                break;
-            }
-        } else {
-            virReportError(VIR_ERR_RPC,
-                           _("Unexpected message type: %d"),
-                           msg->header.type);
-            ret = -1;
+        case VIR_NET_ERROR:
+        default:
+            ret = daemonStreamHandleAbort(client, stream, msg);
+            break;
         }
 
         if (ret > 0)
@@ -804,8 +733,6 @@ daemonStreamHandleRead(virNetServerClientPtr client,
     size_t bufferLen = VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX;
     int ret = -1;
     int rv;
-    int inData = 0;
-    long long length = 0;
 
     VIR_DEBUG("client=%p, stream=%p tx=%d closed=%d",
               client, stream, stream->tx, stream->closed);
@@ -830,58 +757,6 @@ daemonStreamHandleRead(virNetServerClientPtr client,
     if (!(msg = virNetMessageNew(false)))
         goto cleanup;
 
-    if (stream->allowSkip && stream->dataLen == 0) {
-        /* Handle skip. We want to send some data to the client. But we might
-         * be in a hole. Seek to next data. But if we are in data already, just
-         * carry on. */
-
-        rv = virStreamInData(stream->st, &inData, &length);
-        VIR_DEBUG("rv=%d inData=%d length=%lld", rv, inData, length);
-
-        if (rv < 0) {
-            if (virNetServerProgramSendStreamError(remoteProgram,
-                                                   client,
-                                                   msg,
-                                                   &rerr,
-                                                   stream->procedure,
-                                                   stream->serial) < 0)
-                goto cleanup;
-            msg = NULL;
-
-            /* We're done with this call */
-            goto done;
-        } else {
-            if (!inData && length) {
-                stream->tx = false;
-                msg->cb = daemonStreamMessageFinished;
-                msg->opaque = stream;
-                stream->refs++;
-                if (virNetServerProgramSendStreamHole(remoteProgram,
-                                                      client,
-                                                      msg,
-                                                      stream->procedure,
-                                                      stream->serial,
-                                                      length,
-                                                      0) < 0)
-                    goto cleanup;
-
-                msg = NULL;
-
-                /* We have successfully sent stream skip to the other side.
-                 * To keep streams in sync seek locally too. */
-                virStreamSendHole(stream->st, length, 0);
-                /* We're done with this call */
-                goto done;
-            }
-        }
-
-        stream->dataLen = length;
-    }
-
-    if (stream->allowSkip &&
-        bufferLen > stream->dataLen)
-        bufferLen = stream->dataLen;
-
     rv = virStreamRecv(stream->st, buffer, bufferLen);
     if (rv == -2) {
         /* Should never get this, since we're only called when we know
@@ -896,9 +771,6 @@ daemonStreamHandleRead(virNetServerClientPtr client,
             goto cleanup;
         msg = NULL;
     } else {
-        if (stream->allowSkip)
-            stream->dataLen -= rv;
-
         stream->tx = false;
         if (rv == 0)
             stream->recvEOF = true;
@@ -916,7 +788,6 @@ daemonStreamHandleRead(virNetServerClientPtr client,
         msg = NULL;
     }
 
- done:
     ret = 0;
  cleanup:
     VIR_FREE(buffer);

daemon/stream.h

@@ -30,8 +30,7 @@ daemonClientStream *
 daemonCreateClientStream(virNetServerClientPtr client,
                          virStreamPtr st,
                          virNetServerProgramPtr prog,
-                         virNetMessageHeaderPtr hdr,
-                         bool allowSkip);
+                         virNetMessageHeaderPtr hdr);
 
 int daemonFreeClientStream(virNetServerClientPtr client,
                            daemonClientStream *stream);

daemon/test_libvirtd.aug.in

@@ -42,6 +42,7 @@ module Test_libvirtd =
         { "min_workers" = "5" }
         { "max_workers" = "20" }
         { "prio_workers" = "5" }
+        { "max_requests" = "20" }
         { "max_client_requests" = "5" }
         { "admin_min_workers" = "1" }
         { "admin_max_workers" = "5" }

docs/404.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>404 page not found</h1>

docs/Makefile.am

@@ -52,23 +52,8 @@ devhelphtml =			\
 css =         \
   generic.css \
   libvirt.css \
-  mobile.css \
   main.css
 
-fonts = \
-  fonts/LICENSE.md \
-  fonts/stylesheet.css \
-  fonts/overpass-bold-italic.woff \
-  fonts/overpass-bold.woff \
-  fonts/overpass-italic.woff \
-  fonts/overpass-light-italic.woff \
-  fonts/overpass-light.woff \
-  fonts/overpass-mono-bold.woff \
-  fonts/overpass-mono-light.woff \
-  fonts/overpass-mono-regular.woff \
-  fonts/overpass-mono-semibold.woff \
-  fonts/overpass-regular.woff
-
 devhelppng =		\
   devhelp/home.png	\
   devhelp/left.png	\
@@ -173,12 +158,12 @@ schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
 EXTRA_DIST=					\
   apibuild.py genaclperms.pl \
   site.xsl subsite.xsl newapi.xsl page.xsl \
-  wrapstring.xsl \
+  hacking1.xsl hacking2.xsl wrapstring.xsl \
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
   $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \
   $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \
   $(logofiles) $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\
-  $(internals_html_in) $(internals_html) $(fonts) \
+  $(internals_html_in) $(internals_html) \
   aclperms.htmlinc \
   hvsupport.pl \
   $(schema_DATA)
@@ -197,13 +182,6 @@ MAINTAINERCLEANFILES = \
   $(addprefix $(srcdir)/,$(dot_php)) \
   $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc
 
-timestamp="$(shell if test -n "$$SOURCE_DATE_EPOCH"; \
-		   then \
-		     date -u --date="@$$SOURCE_DATE_EPOCH"; \
-		   else \
-		     date -u; \
-		   fi)"
-
 all-am: web
 
 api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml
@@ -229,17 +207,19 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
 news.html.in: \
 	  $(srcdir)/news.xml \
 	  $(srcdir)/news-html.xsl
-	$(AM_V_GEN)$(XSLTPROC) --nonet \
+	$(AM_V_GEN) \
+	if [ -x $(XSLTPROC) ]; then \
+	  $(XSLTPROC) --nonet \
 	    $(srcdir)/news-html.xsl \
 	    $(srcdir)/news.xml \
 	  >$@-tmp \
 	    || { rm -f $@-tmp; exit 1; }; \
 	  sed 's/ xmlns=""//g' $@-tmp >$@ \
 	    || { rm -f $@-tmp; exit 1; }; \
-	  rm -f $@-tmp
+	  rm -f $@-tmp; \
+	fi
 EXTRA_DIST += \
 	$(srcdir)/news.xml \
-	$(srcdir)/news.rng \
 	$(srcdir)/news-html.xsl
 MAINTAINERCLEANFILES += \
 	$(srcdir)/news.html.in
@@ -249,7 +229,9 @@ MAINTAINERCLEANFILES += \
 
 %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
 		$(acl_generated)
-	$(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
+	@if [ -x $(XSLTPROC) ] ; then \
+	  echo "Generating $@"; \
+	  name=`echo $@ | sed -e 's/.tmp//'`; \
 	  dir=`dirname $@` ; \
 	  if test "$$dir" = "."; \
 	  then \
@@ -258,40 +240,52 @@ MAINTAINERCLEANFILES += \
 	    $(MKDIR_P) $$dir; \
 	    style=subsite.xsl; \
 	  fi; \
-	  $(XSLTPROC) --stringparam pagename $$name \
-	    --stringparam timestamp $(timestamp) --nonet \
+	  $(XSLTPROC) --stringparam pagename $$name --nonet \
 	    $(top_srcdir)/docs/$$style $< > $@ \
-	    || { rm $@ && exit 1; }
+	    || { rm $@ && exit 1; }; fi
 
 %.html: %.html.tmp
-	$(AM_V_GEN)$(XMLLINT) --nonet --format $< > $(srcdir)/$@ \
-	  || { rm $(srcdir)/$@ && exit 1; }
+	@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
+	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' \
+	    "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \
+	  echo "Validating $@" ; \
+	  SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
+	  $(XMLLINT) --catalogs --nonet --format --valid $< > $(srcdir)/$@ \
+	  || { rm $(srcdir)/$@ && exit 1; }; \
+	  else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi
 
 %.php.tmp: %.php.in site.xsl page.xsl
-	$(AM_V_GEN)$(XSLTPROC) --stringparam pagename $(@:.tmp=) \
-	    --stringparam timestamp $(timestamp) --nonet \
+	@if [ -x $(XSLTPROC) ] ; then \
+	  echo "Generating $@"; \
+	  $(XSLTPROC) --stringparam pagename $(@:.tmp=) --nonet \
 	    $(top_srcdir)/docs/site.xsl $< > $@ \
-	    || { rm $@ && exit 1; }
+	    || { rm $@ && exit 1; }; fi
 
 %.php: %.php.tmp %.php.code.in
-	$(AM_V_GEN)sed \
-	    -e '/<span id="php_placeholder"><\/span>/r '"$(srcdir)/$@.code.in" \
+	@if [ -x $(XSLTPROC) ] ; then \
+	  echo "Scripting $@"; \
+	    sed -e '/<span id="php_placeholder"><\/span>/r '"$(srcdir)/$@.code.in" \
 	    -e /php_placeholder/d < $@.tmp > $(srcdir)/$@ \
-	    || { rm $(srcdir)/$@ && exit 1; }
+	    || { rm $(srcdir)/$@ && exit 1; }; fi
 
 $(apihtml_generated): html/index.html
 
 html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP)
-	$(AM_V_GEN)$(XSLTPROC) --nonet -o $(srcdir)/ \
+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
+	  $(XSLTPROC) --nonet -o $(srcdir)/ \
 	  --stringparam builddir '$(abs_top_builddir)' \
-	  --stringparam timestamp $(timestamp) \
-	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml && \
-	  $(XMLLINT) --nonet --noout $(srcdir)/html/*.html
+	  $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi && \
+	if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \
+	  if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \
+	    > /dev/null ; then \
+	  SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \
+	  $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \
+	  else echo "missing XHTML1 DTD"; cat $< > $(srcdir)/$@ ; fi ; fi
 
 $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
-	$(AM_V_GEN)$(XSLTPROC) --stringparam timestamp $(timestamp) \
-	  --nonet -o $(srcdir)/devhelp/ \
-	  $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml
+	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
+	  $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \
+	  $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi
 
 
 python_generated_files = \
@@ -388,13 +382,9 @@ install-data-local:
 	for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
 	    $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \
 	done
-	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/fonts
-	for f in $(fonts); do \
-	  $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/fonts; \
-	done
 
 uninstall-local:
-	for f in $(css) $(dot_html) $(gif) $(png) $(fonts); do \
+	for f in $(css) $(dot_html) $(gif) $(png); do \
 	  rm -f $(DESTDIR)$(HTML_DIR)/$$f; \
 	done
 	for f in $(logofiles); do \

docs/acl.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Client access control</h1>
@@ -12,7 +12,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="intro">Access control introduction</a></h2>
+    <h2><a name="intro">Access control introduction</a></h2>
 
     <p>
       In a default configuration, the libvirtd daemon has three levels
@@ -42,7 +42,7 @@
       <code>getattr</code> permission.
     </p>
 
-    <h2><a id="drivers">Access control drivers</a></h2>
+    <h2><a name="drivers">Access control drivers</a></h2>
 
     <p>
       The access control framework is designed as a pluggable
@@ -83,7 +83,7 @@
       the libvirtd daemon be restarted.
     </p>
 
-    <h2><a id="perms">Objects and permissions</a></h2>
+    <h2><a name="perms">Objects and permissions</a></h2>
 
     <p>
       Libvirt applies access control to all the main object

docs/aclpolkit.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Polkit access control</h1>
@@ -14,7 +14,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="intro">Introduction</a></h2>
+    <h2><a name="intro">Introduction</a></h2>
 
     <p>
       A default install of libvirt will typically use
@@ -27,7 +27,7 @@
       object.
     </p>
 
-    <h2><a id="perms">Permission names</a></h2>
+    <h2><a name="perms">Permission names</a></h2>
 
     <p>
       The libvirt <a href="acl.html#perms">object names and permission names</a>
@@ -53,7 +53,7 @@
       permissions default to deny access.
     </p>
 
-    <h2><a id="attrs">Object identity attributes</a></h2>
+    <h2><a name="attrs">Object identity attributes</a></h2>
 
     <p>
       To allow polkit authorization rules to be written to match
@@ -63,7 +63,7 @@
       of object being checked
     </p>
 
-    <h3><a id="object_connect">virConnectPtr</a></h3>
+    <h3><a name="object_connect">virConnectPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -79,7 +79,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_domain">virDomainPtr</a></h3>
+    <h3><a name="object_domain">virDomainPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -103,7 +103,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_interface">virInterfacePtr</a></h3>
+    <h3><a name="object_interface">virInterfacePtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -127,7 +127,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_network">virNetworkPtr</a></h3>
+    <h3><a name="object_network">virNetworkPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -151,7 +151,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_node_device">virNodeDevicePtr</a></h3>
+    <h3><a name="object_node_device">virNodeDevicePtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -171,7 +171,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_nwfilter">virNWFilterPtr</a></h3>
+    <h3><a name="object_nwfilter">virNWFilterPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -195,7 +195,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_secret">virSecretPtr</a></h3>
+    <h3><a name="object_secret">virSecretPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -231,7 +231,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_storage_pool">virStoragePoolPtr</a></h3>
+    <h3><a name="object_storage_pool">virStoragePoolPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -255,7 +255,7 @@
       </tbody>
     </table>
 
-    <h3><a id="object_storage_vol">virStorageVolPtr</a></h3>
+    <h3><a name="object_storage_vol">virStorageVolPtr</a></h3>
     <table class="acl">
       <thead>
         <tr>
@@ -288,7 +288,7 @@
     </table>
 
 
-    <h2><a id="user">User identity attributes</a></h2>
+    <h2><a name="user">User identity attributes</a></h2>
 
     <p>
       At this point in time, the only attribute provided by
@@ -307,7 +307,7 @@
     </p>
 
 
-    <h2><a id="checks">Writing access control policies</a></h2>
+    <h2><a name="checks">Writing access control policies</a></h2>
 
     <p>
       If using versions of polkit prior to 0.106 then it is only
@@ -358,7 +358,7 @@ polkit.addRule(function(action, subject) {
     for a more complex example.
     </p>
 
-    <h3><a id="exconnect">Example: restricting ability to connect to drivers</a></h3>
+    <h3><a name="exconnect">Example: restricting ability to connect to drivers</a></h3>
 
     <p>
       Consider a local user <code>berrange</code>
@@ -386,7 +386,7 @@ polkit.addRule(function(action, subject) {
 });
     </pre>
 
-    <h3><a id="exdomain">Example: restricting access to a single domain</a></h3>
+    <h3><a name="exdomain">Example: restricting access to a single domain</a></h3>
 
     <p>
       Consider a local user <code>berrange</code>

docs/api.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>The libvirt API concepts</h1>
@@ -9,7 +9,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="Objects">Objects Exposed</a></h2>
+    <h2><a name="Objects">Objects Exposed</a></h2>
     <p> As defined in the <a href="goals.html">goals section</a>, the libvirt
     API is designed to expose all the resources needed to manage the
     virtualization support of recent operating systems. The first object
@@ -121,7 +121,7 @@
       set of nodes.</p></li>
     </ul>
 
-    <h2><a id="Functions">Functions and Naming Conventions</a></h2>
+    <h2><a name="Functions">Functions and Naming Conventions</a></h2>
     <p> The naming of the functions present in the library is usually
       composed by a prefix describing the object associated to the function
       and a verb describing the action on that object.</p>
@@ -297,7 +297,7 @@
     <p> For more in-depth details of the storage related APIs see
       <a href="storage.html">the storage management page</a>.
     </p>
-    <h2><a id="Drivers">The libvirt Drivers</a></h2>
+    <h2><a name="Drivers">The libvirt Drivers</a></h2>
     <p>Drivers are the basic building block for libvirt functionality
     to support the capability to handle specific hypervisor driver calls.
     Drivers are discovered and registered during connection processing as
@@ -325,7 +325,7 @@
     the various functions and support found in each driver by the version
     support was added into libvirt.
     </p>
-    <h2><a id="Remote">Daemon and Remote Access</a></h2>
+    <h2><a name="Remote">Daemon and Remote Access</a></h2>
     <p>Access to libvirt drivers is primarily handled by the libvirtd
     daemon through the <a href="remote.html">remote</a> driver via an
     <a href="internals/rpc.html">RPC</a>. Some hypervisors do support

docs/api_extension.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Implementing a new API in Libvirt</h1>
@@ -273,7 +273,7 @@
       <li>unlocks the remote driver.</li>
     </ol>
 
-    <h3><a id="serverdispatch">Implement the server side dispatcher</a></h3>
+    <h3><a name="serverdispatch">Implement the server side dispatcher</a></h3>
 
     <p>
       Implementing the server side of the remote function call is simply a
@@ -300,7 +300,7 @@
 
     <p class="example">See <a href="api_extension/0005-implement-the-remote-protocol.patch">0005-implement-the-remote-protocol.patch</a></p>
 
-    <h2><a id="internaluseapi">Use the new API internally</a></h2>
+    <h2><a name="internaluseapi">Use the new API internally</a></h2>
 
     <p>
       Sometimes, a new API serves as a superset of existing API, by
@@ -314,7 +314,7 @@
 
     <p class="example">See <a href="api_extension/0006-make-old-API-trivially-wrap-to-new-API.patch">0006-make-old-API-trivially-wrap-to-new-API.patch</a></p>
 
-    <h2><a id="virshuseapi">Expose the new API in virsh</a></h2>
+    <h2><a name="virshuseapi">Expose the new API in virsh</a></h2>
 
     <p>
       All new API should be manageable from the virsh command line
@@ -345,7 +345,7 @@
 
     <p class="example">See <a href="api_extension/0007-add-virsh-support.patch">0007-add-virsh-support.patch</a></p>
 
-    <h2><a id="driverimpl">Implement the driver methods</a></h2>
+    <h2><a name="driverimpl">Implement the driver methods</a></h2>
 
     <p>
       So, after all that, we get to the fun part.  All functionality in
@@ -356,7 +356,7 @@
       adding.
     </p>
 
-    <h3><a id="commonimpl">Implement common handling</a></h3>
+    <h3><a name="commonimpl">Implement common handling</a></h3>
 
     <p>
       If the new API is applicable to more than one driver, it may
@@ -373,7 +373,7 @@
 
     <p class="example">See <a href="api_extension/0008-support-new-xml.patch">0008-support-new-xml.patch</a></p>
 
-    <h3><a id="drivercode">Implement driver handling</a></h3>
+    <h3><a name="drivercode">Implement driver handling</a></h3>
 
     <p>
       The remaining patches should only touch one driver at a time.

docs/apibuild.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python -u
 #
 # This is the API builder, it parses the C sources and build the
 # API formal description in XML.
@@ -1365,9 +1365,9 @@ class CParser:
     def parseEnumBlock(self, token):
         self.enums = []
         name = None
+        self.comment = None
         comment = ""
         value = "-1"
-        commentsBeforeVal = self.comment is not None
         while token is not None:
             if token[0] == "sep" and token[1] == "{":
                 token = self.token()
@@ -1408,10 +1408,6 @@ class CParser:
                         self.warning("Failed to compute value of enum %s" % (name))
                         value=""
                 if token[0] == "sep" and token[1] == ",":
-                    if commentsBeforeVal:
-                        self.cleanupComment()
-                        self.enums.append((name, value, self.comment))
-                        name = comment = self.comment = None
                     token = self.token()
             else:
                 token = self.token()
@@ -1656,8 +1652,6 @@ class CParser:
             self.enums = []
             token = self.token()
             if token is not None and token[0] == "sep" and token[1] == "{":
-                # drop comments before the enum block
-                self.comment = None
                 token = self.token()
                 token = self.parseEnumBlock(token)
             else:

docs/apps.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Applications using libvirt</h1>
@@ -11,7 +11,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="add">Add an application</a></h2>
+    <h2><a name="add">Add an application</a></h2>
 
     <p>
       To add an application not listed on this page, send a message
@@ -30,7 +30,7 @@
       <img src="logos/logo-square-powered-256.png" alt="libvirt powered"/>
     </p>
 
-    <h2><a id="clientserver">Client/Server applications</a></h2>
+    <h2><a name="clientserver">Client/Server applications</a></h2>
 
     <dl>
       <dt><a href="http://archipelproject.org">Archipel</a></dt>
@@ -50,7 +50,7 @@
       </dd>
     </dl>
 
-    <h2><a id="command">Command line tools</a></h2>
+    <h2><a name="command">Command line tools</a></h2>
 
     <dl>
       <dt><a href="http://libguestfs.org">guestfish</a></dt>
@@ -121,7 +121,7 @@
       </dd>
     </dl>
 
-    <h2><a id="configmgmt">Configuration Management</a></h2>
+    <h2><a name="configmgmt">Configuration Management</a></h2>
 
     <dl>
       <dt><a href="https://wiki.lcfg.org/bin/view/LCFG/LcfgLibvirt">LCFG</a></dt>
@@ -139,7 +139,7 @@
       </dd>
     </dl>
 
-    <h2><a id="continuousintegration">Continuous Integration</a></h2>
+    <h2><a name="continuousintegration">Continuous Integration</a></h2>
 
     <dl>
       <dt><a href="http://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt>
@@ -163,7 +163,7 @@
       </dd>
     </dl>
 
-    <h2><a id="conversion">Conversion</a></h2>
+    <h2><a name="conversion">Conversion</a></h2>
 
     <dl>
       <dt><a href="http://libguestfs.org/virt-p2v.1.html">virt-p2v</a></dt>
@@ -194,7 +194,7 @@
       </dd>
     </dl>
 
-    <h2><a id="desktop">Desktop applications</a></h2>
+    <h2><a name="desktop">Desktop applications</a></h2>
 
     <dl>
       <dt><a href="http://virt-manager.org/">virt-manager</a></dt>
@@ -224,7 +224,7 @@
       </dd>
     </dl>
 
-    <h2><a id="iaas">Infrastructure as a Service (IaaS)</a></h2>
+    <h2><a name="iaas">Infrastructure as a Service (IaaS)</a></h2>
 
     <dl>
       <dt><a href="http://cc1.ifj.edu.pl">Cracow Cloud One</a></dt>
@@ -286,19 +286,9 @@
         perfect for setting up low-end servers in a cloud or a
         cloud where you want the most bang for the bucks.
       </dd>
-
-      <dt><a href="http://en.zstack.io/">ZStack</a></dt>
-      <dd>
-        ZStack is an open source IaaS software that aims to automate the
-        management of all resources (compute, storage, networking, etc.) in a
-        datacenter by using APIs, thus conforming to the principles of a
-        software-defined datacenter. The key strengths of ZStack in terms of
-        management are scalability, performance, and a fast, user-friendly
-        deployment.
-      </dd>
     </dl>
 
-    <h2><a id="libraries">Libraries</a></h2>
+    <h2><a name="libraries">Libraries</a></h2>
 
     <dl>
       <dt><a href="http://libguestfs.org">libguestfs</a></dt>
@@ -331,7 +321,7 @@
       </dd>
     </dl>
 
-    <h2><a id="livecd">LiveCD / Appliances</a></h2>
+    <h2><a name="livecd">LiveCD / Appliances</a></h2>
 
     <dl>
       <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt>
@@ -344,7 +334,7 @@
       </dd>
     </dl>
 
-    <h2><a id="monitoring">Monitoring</a></h2>
+    <h2><a name="monitoring">Monitoring</a></h2>
     <dl>
       <dt><a href="http://collectd.org/plugins/libvirt.shtml">collectd</a></dt>
       <dd>
@@ -363,7 +353,7 @@
       </dd>
       <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt>
       <dd>
-        The plugins provided by Guido Günther allow to monitor various things
+        The plugins provided by Guido G&uuml;nther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd>
@@ -375,10 +365,10 @@
         your Xen or QEMU/KVM guests, or to integrate with your existing Nagios
         installation.
       </dd>
-      <dt><a href="http://www.pcp.io/man/man1/pmdalibvirt.1.html">PCP</a></dt>
+      <dt><a href="http://www.pcp.io/man/man1/pmdalibvirt.1.html" shape="rect">PCP</a></dt>
       <dd>
         The PCP libvirt PMDA (plugin) is part of the
-        <a href="http://pcp.io/">PCP</a> toolkit and provides
+        <a href="http://pcp.io/" shape="rect">PCP</a> toolkit and provides
         hypervisor and guest information and complete set of guest performance
         metrics. It supports pCPU, vCPU, memory, block device, network interface,
         and performance event metrics for each virtual guest.
@@ -391,7 +381,7 @@
       </dd>
     </dl>
 
-    <h2><a id="provisioning">Provisioning</a></h2>
+    <h2><a name="provisioning">Provisioning</a></h2>
 
     <dl>
       <dt><a href="http://www.ibm.com/software/tivoli/products/prov-mgr/">Tivoli Provisioning Manager</a></dt>
@@ -425,7 +415,7 @@
     </dl>
 
 
-    <h2><a id="web">Web applications</a></h2>
+    <h2><a name="web">Web applications</a></h2>
 
     <dl>
       <dt><a href="http://community.abiquo.com/display/AbiCloud">AbiCloud</a></dt>
@@ -468,17 +458,9 @@
         providers, OpenStack based public/private clouds, Docker servers, bare
         metal servers and now KVM hypervisors).
       </dd>
-      <dt><a href="http://ravada.upc.edu/">Ravada</a></dt>
-      <dd>
-        Ravada is an open source tool for managing Virtual Desktop
-        Infrastructure (VDI). It is very easy to install and use. Following
-        the documentation, you'll be ready to deploy virtual machines in
-        minutes. The only requirements for the users are a Web browser and
-        a lightweight remote viewer.
-      </dd>
     </dl>
 
-    <h2><a id="mobile">Mobile applications</a></h2>
+    <h2><a name="mobile">Mobile applications</a></h2>
 
     <dl>
       <dt><a href="https://market.android.com/details?id=vm.manager">VM Manager</a></dt>
@@ -489,7 +471,7 @@
       </dd>
     </dl>
 
-    <h2><a id="other">Other</a></h2>
+    <h2><a name="other">Other</a></h2>
 
     <dl>
       <dt><a href="http://cuckoosandbox.org/">Cuckoo Sandbox</a></dt>

docs/architecture.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1 >libvirt architecture</h1>
@@ -13,7 +13,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="Xen">Xen support</a></h2>
+    <h2><a name="Xen">Xen support</a></h2>
 
     <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
@@ -46,7 +46,7 @@ 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>
 
-    <h2><a id="QEmu">QEmu and KVM support</a></h2>
+    <h2><a name="QEmu">QEmu and KVM support</a></h2>
 
     <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
@@ -60,7 +60,7 @@ 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>
 
-    <h2><a id="drivers">Driver based architecture</a></h2>
+    <h2><a name="drivers">Driver based architecture</a></h2>
 
     <p>As the previous section explains, libvirt can communicate using different
 channels with the current hypervisor, and should also be able to use

docs/auditlog.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Audit log</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="intro">Introduction</a></h2>
+    <h2><a name="intro">Introduction</a></h2>
 
     <p>
       A number of the libvirt virtualization drivers (QEMU/KVM and LXC) include
@@ -17,7 +17,7 @@
       the logs will usually end up in <code>/var/log/audit/audit.log</code>
     </p>
 
-    <h2><a id="config">Configuration</a></h2>
+    <h2><a name="config">Configuration</a></h2>
 
     <p>
       The libvirt audit integration is enabled by default on any host which has
@@ -48,7 +48,7 @@
       mentioned above.
     </p>
 
-    <h2><a id="types">Message types</a></h2>
+    <h2><a name="types">Message types</a></h2>
 
     <p>
       Libvirt defines three core audit message types each of which will
@@ -90,7 +90,7 @@
       <dd>Result of the action, either <code>success</code> or <code>failed</code></dd>
     </dl>
 
-    <h3><a id="typecontrol">VIRT_CONTROL</a></h3>
+    <h3><a name="typecontrol">VIRT_CONTROL</a></h3>
 
     <p>
       Reports change in the lifecycle state of a virtual machine. The <code>msg</code>
@@ -110,7 +110,7 @@
       <dd>Namespace ID of the <code>init</code> process in a container. Only if <code>op=init</code> and <code>virt=lxc</code></dd>
     </dl>
 
-    <h3><a id="typemachine">VIRT_MACHINE_ID</a></h3>
+    <h3><a name="typemachine">VIRT_MACHINE_ID</a></h3>
 
     <p>
       Reports the association of a security context with a guest. The <code>msg</code>
@@ -126,7 +126,7 @@
       <dd>Security context for the guest disk images and other assigned host resources</dd>
     </dl>
 
-    <h3><a id="typeresource">VIRT_RESOURCE</a></h3>
+    <h3><a name="typeresource">VIRT_RESOURCE</a></h3>
 
     <p>
       Reports the usage of a host resource by a guest. The fields include will
@@ -137,7 +137,7 @@
       be generated.
     </p>
 
-    <h4><a id="typeresourcevcpu">Virtual CPU</a></h4>
+    <h4><a name="typeresourcevcpu">Virtual CPU</a></h4>
 
     <p>
       The <code>msg</code> field will include the following sub-fields
@@ -155,7 +155,7 @@
     </dl>
 
 
-    <h4><a id="typeresourcemem">Memory</a></h4>
+    <h4><a name="typeresourcemem">Memory</a></h4>
 
     <p>
       The <code>msg</code> field will include the following sub-fields
@@ -172,7 +172,7 @@
       <dd>Updated memory size in bytes</dd>
     </dl>
 
-    <h4><a id="typeresourcedisk">Disk</a></h4>
+    <h4><a name="typeresourcedisk">Disk</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -188,7 +188,7 @@
       <dd>Updated host file or device path acting as the disk backing file</dd>
     </dl>
 
-    <h4><a id="typeresourcenic">Network interface</a></h4>
+    <h4><a name="typeresourcenic">Network interface</a></h4>
 
     <p>
       The <code>msg</code> field will include the following sub-fields
@@ -221,7 +221,7 @@
       <dd>Name of the host network interface</dd>
     </dl>
 
-    <h4><a id="typeresourcefs">Filesystem</a></h4>
+    <h4><a name="typeresourcefs">Filesystem</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -237,7 +237,7 @@
       <dd>Updated host directory, file or device path backing the filesystem</dd>
     </dl>
 
-    <h4><a id="typeresourcehost">Host device</a></h4>
+    <h4><a name="typeresourcehost">Host device</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -255,7 +255,7 @@
       <dd>The path of the character device assigned to the guest, if <code>resrc=hostdev</code></dd>
     </dl>
 
-    <h4><a id="typeresourcetpm">TPM</a></h4>
+    <h4><a name="typeresourcetpm">TPM</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -269,7 +269,7 @@
       <dd>The path of the host TPM device assigned to the guest</dd>
     </dl>
 
-    <h4><a id="typeresourcerng">RNG</a></h4>
+    <h4><a name="typeresourcerng">RNG</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -285,7 +285,7 @@
       <dd>Updated path of the host entropy source for the RNG</dd>
     </dl>
 
-    <h4><a id="typeresourcechardev">console/serial/parallel/channel</a></h4>
+    <h4><a name="typeresourcechardev">console/serial/parallel/channel</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -301,7 +301,7 @@
       <dd>Updated path of the backing character device for given emulated device</dd>
     </dl>
 
-    <h4><a id="typeresourcesmartcard">smartcard</a></h4>
+    <h4><a name="typeresourcesmartcard">smartcard</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -321,7 +321,7 @@
       </dd>
     </dl>
 
-    <h4><a id="typeresourceredir">Redirected device</a></h4>
+    <h4><a name="typeresourceredir">Redirected device</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>
@@ -337,7 +337,7 @@
       <dd>The device type, only <code>USB redir</code> allowed</dd>
     </dl>
 
-    <h4><a id="typeresourcecgroup">Control group</a></h4>
+    <h4><a name="typeresourcecgroup">Control group</a></h4>
 
     <p>
       The <code>msg</code> field will include the following sub-fields
@@ -353,7 +353,7 @@
     </dl>
 
 
-    <h4><a id="typeresourceshmem">Shared memory</a></h4>
+    <h4><a name="typeresourceshmem">Shared memory</a></h4>
     <p>
       The <code>msg</code> field will include the following sub-fields
     </p>

docs/auth.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Connection authentication</h1>
@@ -14,7 +14,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="Auth_client_config">Client configuration</a></h2>
+    <h2><a name="Auth_client_config">Client configuration</a></h2>
 
     <p>
       When connecting to a remote hypervisor which requires authentication,
@@ -142,7 +142,7 @@ credentials=defgrp</pre>
       to storage VNC or SPICE login credentials
     </p>
 
-    <h2><a id="ACL_server_config">Server configuration</a></h2>
+    <h2><a name="ACL_server_config">Server configuration</a></h2>
     <p>
 The libvirt daemon allows the administrator to choose the authentication
 mechanisms used for client connections on each network socket independently.
@@ -153,7 +153,7 @@ currently a choice of <code>none</code>, <code>polkit</code>, and <code>sasl</co
 The SASL scheme can be further configured to choose between a large
 number of different mechanisms.
 </p>
-    <h2><a id="ACL_server_unix_perms">UNIX socket permissions/group</a></h2>
+    <h2><a name="ACL_server_unix_perms">UNIX socket permissions/group</a></h2>
     <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
@@ -170,7 +170,7 @@ 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>
-    <h2><a id="ACL_server_polkit">UNIX socket PolicyKit auth</a></h2>
+    <h2><a name="ACL_server_polkit">UNIX socket PolicyKit auth</a></h2>
     <p>
 If libvirt contains support for PolicyKit, then access control options are
 more advanced. The <code>auth_unix_rw</code> parameter will default to
@@ -204,7 +204,7 @@ ResultActive=yes</pre>
 Further examples of PolicyKit setup can be found on the
 <a href="http://wiki.libvirt.org/page/SSHPolicyKitSetup">wiki page</a>.
     </p>
-    <h2><a id="ACL_server_sasl">SASL pluggable authentication</a></h2>
+    <h2><a name="ACL_server_sasl">SASL pluggable authentication</a></h2>
 
     <p>
 Libvirt integrates with the cyrus-sasl library to provide a pluggable authentication
@@ -255,7 +255,7 @@ GSSAPI plugin is considered acceptably secure by modern standards:
       TLS or UNIX socket listeners.
     </p>
 
-    <h3><a id="ACL_server_username">Username/password auth</a></h3>
+    <h3><a name="ACL_server_username">Username/password auth</a></h3>
     <p>
 As noted above, the DIGEST-MD5 mechanism is considered obsolete and should
 not be used anymore. To provide a simple username/password auth scheme on
@@ -297,7 +297,7 @@ again:
     <pre>
 # saslpasswd2 -a libvirt -d fred
 </pre>
-    <h3><a id="ACL_server_kerberos">GSSAPI/Kerberos auth</a></h3>
+    <h3><a name="ACL_server_kerberos">GSSAPI/Kerberos auth</a></h3>
     <p>
 The plain TCP listener of the libvirt daemon defaults to using SASL for authentication.
 The libvirt SASL config also defaults to GSSAPI, so there is no need to edit the

docs/bindings.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1 >Bindings for other languages</h1>

docs/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#b91d47</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

docs/bugs.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
 
@@ -7,7 +7,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="security">Security Issues</a></h2>
+    <h2><a name="security">Security Issues</a></h2>
 
     <p>
       If you think that an issue with libvirt may have security
@@ -19,7 +19,7 @@
       <a href="securityprocess.html">security process</a> instead.
     </p>
 
-    <h2><a id="bugzilla">Bug Tracking</a></h2>
+    <h2><a name="bugzilla">Bug Tracking</a></h2>
 
     <p>
       If you are using libvirt binaries from a Linux distribution
@@ -27,7 +27,7 @@
       first.
     </p>
 
-    <h2><a id="general">General libvirt bug reports</a></h2>
+    <h2><a name="general">General libvirt bug reports</a></h2>
 
     <p>
       The <a href="http://bugzilla.redhat.com">Red Hat Bugzilla Server</a>
@@ -69,7 +69,7 @@
       <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20Tools&amp;component=libvirt">New libvirt ticket</a></li>
     </ul>
 
-    <h2><a id="distribution">Linux Distribution specific bug reports</a></h2>
+    <h2><a name="distribution">Linux Distribution specific bug reports</a></h2>
     <ul>
       <li>
         If you are using binaries from <strong>Fedora</strong>, enter
@@ -107,7 +107,7 @@
     </ul>
 
 
-    <h2><a id="quality">How to file high quality bug reports</a></h2>
+    <h2><a name="quality">How to file high quality bug reports</a></h2>
 
     <p>
       To increase the likelihood of your bug report being addressed it is

docs/cgroups.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Control Groups Resource Management</h1>
@@ -11,7 +11,7 @@
       for applying resource management to their virtual machines and containers.
     </p>
 
-    <h2><a id="requiredControllers">Required controllers</a></h2>
+    <h2><a name="requiredControllers">Required controllers</a></h2>
 
     <p>
       The control groups filesystem supports multiple "controllers". By default
@@ -42,7 +42,7 @@
       which use them will cease to operate.
     </p>
 
-    <h2><a id="currentLayout">Current cgroups layout</a></h2>
+    <h2><a name="currentLayout">Current cgroups layout</a></h2>
 
     <p>
       As of libvirt 1.0.5 or later, the cgroups layout created by libvirt has been
@@ -63,14 +63,14 @@
       in two, one describing systemd hosts and the other non-systemd hosts.
     </p>
 
-    <h3><a id="currentLayoutSystemd">Systemd cgroups integration</a></h3>
+    <h3><a name="currentLayoutSystemd">Systemd cgroups integration</a></h3>
 
     <p>
       On hosts which use systemd, each consumer maps to a systemd scope unit,
       while partitions map to a system slice unit.
     </p>
 
-    <h4><a id="systemdScope">Systemd scope naming</a></h4>
+    <h4><a name="systemdScope">Systemd scope naming</a></h4>
 
     <p>
       The systemd convention is for the scope name of virtual machines / containers
@@ -83,7 +83,7 @@
       The scope names map directly to the cgroup directory names.
     </p>
 
-    <h4><a id="systemdSlice">Systemd slice naming</a></h4>
+    <h4><a name="systemdSlice">Systemd slice naming</a></h4>
 
     <p>
       The systemd convention for slice naming is that a slice should include the
@@ -96,7 +96,7 @@
       by libvirt will be associated with <code>machine.slice</code> by default.
     </p>
 
-    <h4><a id="systemdLayout">Systemd cgroup layout</a></h4>
+    <h4><a name="systemdLayout">Systemd cgroup layout</a></h4>
 
     <p>
       Given this, a possible systemd cgroups layout involving 3 qemu guests,
@@ -145,7 +145,7 @@ $ROOT
           +- machine-lxc\x2dcontainer3.scope
     </pre>
 
-    <h3><a id="currentLayoutGeneric">Non-systemd cgroups layout</a></h3>
+    <h3><a name="currentLayoutGeneric">Non-systemd cgroups layout</a></h3>
 
     <p>
       On hosts which do not use systemd, each consumer has a corresponding cgroup
@@ -206,7 +206,7 @@ $ROOT
           +- container3.libvirt-lxc
     </pre>
 
-    <h2><a id="customPartiton">Using custom partitions</a></h2>
+    <h2><a name="customPartiton">Using custom partitions</a></h2>
 
     <p>
       If there is a need to apply resource constraints to groups of
@@ -255,7 +255,7 @@ $ROOT
       later in this document did not support customization per guest.
     </p>
 
-    <h3><a id="createSystemd">Creating custom partitions (systemd)</a></h3>
+    <h3><a name="createSystemd">Creating custom partitions (systemd)</a></h3>
 
     <p>
       Given the XML config above, the admin on a systemd based host would
@@ -272,7 +272,7 @@ EOF
 # systemctl start machine-testing.slice
     </pre>
 
-    <h3><a id="createNonSystemd">Creating custom partitions (non-systemd)</a></h3>
+    <h3><a name="createNonSystemd">Creating custom partitions (non-systemd)</a></h3>
 
     <p>
       Given the XML config above, the admin on a non-systemd based host
@@ -291,7 +291,7 @@ EOF
   done
 </pre>
 
-    <h2><a id="resourceAPIs">Resource management APIs/commands</a></h2>
+    <h2><a name="resourceAPIs">Resource management APIs/commands</a></h2>
 
     <p>
       Since libvirt aims to provide an API which is portable across
@@ -354,7 +354,7 @@ swap_hard_limit: unlimited
       network interfaces.
     </p>
 
-    <h2><a id="legacyLayout">Legacy cgroups layout</a></h2>
+    <h2><a name="legacyLayout">Legacy cgroups layout</a></h2>
 
     <p>
       Prior to libvirt 1.0.5, the cgroups layout created by libvirt was different

docs/compiling.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
-    <h1><a id="installation">libvirt Installation</a></h1>
+    <h1><a name="installation">libvirt Installation</a></h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="compiling">Compiling a release tarball</a></h2>
+    <h2><a name="compiling">Compiling a release tarball</a></h2>
 
     <p>
       libvirt uses the standard configure/make/install steps:
@@ -58,7 +58,7 @@ $ <b>sudo</b> <i>make install</i></pre>
       to update your list of installed shared libs.
     </p>
 
-    <h2><a id="building">Building from a GIT checkout</a></h2>
+    <h2><a name="building">Building from a GIT checkout</a></h2>
 
     <p>
       The libvirt build process uses GNU autotools, so after obtaining a

docs/contact.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Contacting the project contributors</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="security">Security Issues</a></h2>
+    <h2><a name="security">Security Issues</a></h2>
 
     <p>
       If you think that an issue with libvirt may have security
@@ -18,7 +18,7 @@
       <a href="securityprocess.html">security process</a> instead.
     </p>
 
-    <h2><a id="email">Mailing lists</a></h2>
+    <h2><a name="email">Mailing lists</a></h2>
 
     <p>
       There are three mailing-lists:
@@ -95,7 +95,7 @@
       page.
     </p>
 
-    <h2><a id="irc">IRC discussion</a></h2>
+    <h2><a name="irc">IRC discussion</a></h2>
 
     <p>
       Some of the libvirt developers may be found on IRC on the <a href="http://oftc.net">OFTC IRC</a>

docs/contribute.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Contributing to libvirt</h1>
@@ -11,7 +11,7 @@
 
     <ul id="toc"></ul>
 
-    <h2><a id="skills">Contributions required</a></h2>
+    <h2><a name="skills">Contributions required</a></h2>
 
     <p>
       The libvirt project is always looking for new contributors to
@@ -36,9 +36,7 @@
         language bindings written in Python, Perl, Java, Ruby,
         Php, OCaml and Go. There are also higher level wrappers
         mapping libvirt into other object frameworks, such GLib,
-        CIM and SNMP. For those interested in working on the core parts of
-        libvirt, the <a href="hacking.html">contributor guidelines</a> are
-        mandatory reading</li>
+        CIM and SNMP</li>
       <li><strong>Translation</strong>. All the libvirt modules aim to support
         translations where appropriate. All translation is
         handling outside of the normal libvirt review process,
@@ -97,7 +95,7 @@
         these help forums.</li>
     </ul>
 
-    <h2><a id="comms">Communication</a></h2>
+    <h2><a name="comms">Communication</a></h2>
 
     <p>
       For full details on contacting other project contributors
@@ -106,7 +104,7 @@
       between contributors:
     </p>
 
-    <h3><a id="email">Mailing lists</a></h3>
+    <h3><a name="email">Mailing lists</a></h3>
 
     <p>
       The project has a number of
@@ -118,7 +116,7 @@
       to follow the traffic.
     </p>
 
-    <h3><a id="irc">Instant messaging / chat</a></h3>
+    <h3><a name="irc">Instant messaging / chat</a></h3>
 
     <p>
       Contributors to libvirt are encouraged to join the
@@ -127,7 +125,7 @@
       with others members.
     </p>
 
-    <h2><a id="outreach">Student / outreach coding programs</a></h2>
+    <h2><a name="outreach">Student / outreach coding programs</a></h2>
 
     <p>
       Since 2016, the libvirt project directly participates as an

docs/csharp.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>C# API bindings</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="description">Description</a></h2>
+    <h2><a name="description">Description</a></h2>
 
     <p>
       The C# libvirt bindings are a class library.  They use a Microsoft
@@ -19,7 +19,9 @@
       to libvirt.
     </p>
 
-    <h2><a id="requirements">Requirements</a></h2>
+    <p>&nbsp;</p>
+
+    <h2><a name="requirements">Requirements</a></h2>
 
     <p>
       These bindings depend upon the libvirt libraries being installed.
@@ -29,8 +31,10 @@
       compiling libvirt for windows.
     </p>
 
+    <p>&nbsp;</p>
+
 <!-- 2010-10-19 JC: Commented out until we have C# tarballs to download
-    <h2><a id="getting">Getting them</a></h2>
+    <h2><a name="getting">Getting them</a></h2>
 
     <p>
       The latest versions of the libvirt C# bindings can be downloaded from:
@@ -42,7 +46,7 @@
     </ul>
 -->
 
-    <h2><a id="git">GIT source repository</a></h2>
+    <h2><a name="git">GIT source repository</a></h2>
     <p>
       The C# bindings source code is maintained in a <a
       href="http://git-scm.com/">git</a> repository available on
@@ -61,7 +65,9 @@ git clone git://libvirt.org/libvirt-csharp.git
 <a href="http://libvirt.org/git/?p=libvirt-csharp.git;a=summary">http://libvirt.org/git/?p=libvirt-csharp.git;a=summary</a>
 </pre>
 
-    <h2><a id="usage">Usage</a></h2>
+    <p>&nbsp;</p>
+
+    <h2><a name="usage">Usage</a></h2>
 
     <p>
       The libvirt C# bindings class library exposes the <b>Libvirt</b>
@@ -110,15 +116,19 @@ git clone git://libvirt.org/libvirt-csharp.git
       </li>
     </ul>
 
-    <h2><a id="authors">Authors</a></h2>
+    <p>&nbsp;</p>
+
+    <h2><a name="authors">Authors</a></h2>
 
     <p>
       The C# bindings are the work of Arnaud Champion
       &lt;<a href="mailto:arnaud.champion AT devatom.fr">arnaud.champion AT devatom.fr</a>&gt;,
-      based upon the previous work of Jaromír Červenka.
+      based upon the previous work of Jarom&iacute;r &#x010C;ervenka.
     </p>
 
-    <h2><a id="notes">Test Configuration</a></h2>
+    <p>&nbsp;</p>
+
+    <h2><a name="notes">Test Configuration</a></h2>
 
     <p>
       Testing is performed using the following configurations:
@@ -129,85 +139,87 @@ git clone git://libvirt.org/libvirt-csharp.git
       <li>Ubuntu 10.10 amd64 / Mono 2.6.7 (compiled in 64 bits)</li>
     </ul>
 
-    <h2><a id="type">Type Coverage</a></h2>
+    <p>&nbsp;</p>
+
+    <h2><a name="type">Type Coverage</a></h2>
 
     <p>
       Coverage of the libvirt types is:
     </p>
     <table class="top_table">
       <tr><th>Type</th><th>Name</th><th>Binding?</th><th>Tested?</th><th>Sample Code?</th><th>Works?</th><th>Tested .Net/Windows Works?</th><th>Tested Mono (32-bit)/Windows Works?</th><th>Tested Mono (64-bit)/Linux Works?</th></tr>
-      <tr><td>enum</td><td>virCPUCompareResult</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virConnect</td><td>Yes, an IntPtr as the struct is not public</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>enum</td><td>virCPUCompareResult</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virConnect</td><td>Yes, an IntPtr as the struct is not public</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>struct</td><td>virConnectAuth</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>struct</td><td>virConnectCredential</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virConnectCredentialType</td><td>Yes</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>enum</td><td>virConnectFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomain</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomainBlockInfo</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>enum</td><td>virConnectFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomain</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomainBlockInfo</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>struct</td><td>virDomainBlockStatsInfo</td><td>Yes</td><td>Yes</td><td>virDomainStats</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>enum</td><td>virDomainCoreDumpFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainCreateFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainDeviceModifyFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>enum</td><td>virDomainCoreDumpFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainCreateFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainDeviceModifyFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>enum</td><td>virDomainEventDefinedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>struct</td><td>virDomainEventGraphicsAddress</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainEventGraphicsAddressType</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainEventGraphicsPhase</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomainEventGraphicsSubject</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomainEventGraphicsSubjectIdentity</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainEventID</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainEventIOErrorAction</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>struct</td><td>virDomainEventGraphicsAddress</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainEventGraphicsAddressType</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainEventGraphicsPhase</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomainEventGraphicsSubject</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomainEventGraphicsSubjectIdentity</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainEventID</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainEventIOErrorAction</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>enum</td><td>virDomainEventResumedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virDomainEventStartedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virDomainEventStoppedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virDomainEventSuspendedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virDomainEventType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>enum</td><td>virDomainEventUndefinedDetailType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>enum</td><td>virDomainEventWatchdogAction</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>enum</td><td>virDomainEventWatchdogAction</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>struct</td><td>virDomainInfo</td><td>Yes</td><td>Yes</td><td>virConnectSetErrorFunc, virDomainStats</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>struct</td><td>virDomainInterfaceStatsStruct</td><td>Yes</td><td>Yes</td><td>virDomainStats</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>struct</td><td>virDomainJobInfo</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainJobType</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainMemoryFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomainMemoryStatStruct</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainMemoryStatTags</td><td>Yes</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainMigrateFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virDomainSnapshot</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainSnapshotDeleteFlags</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainState</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virDomainXMLFlags</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>struct</td><td>virDomainJobInfo</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainJobType</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainMemoryFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomainMemoryStatStruct</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainMemoryStatTags</td><td>Yes</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainMigrateFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virDomainSnapshot</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainSnapshotDeleteFlags</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainState</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virDomainXMLFlags</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>enum</td><td>virEventHandleType</td><td>Yes</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>struct</td><td>virInterface</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virInterfaceXMLFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virNWFilter</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virNetwork</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virNodeDevice</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virNodeInfo</td><td>Yes</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virSchedParameter</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virSchedParameterType</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virSecret</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virSecretUsageType</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virSecurityLabel</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virSecurityModel</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStoragePoolBuildFlags</td><td>Yes</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStoragePoolDeleteFlags</td><td>Yes</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virStoragePoolInfo</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virStoragePool</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStoragePoolState</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virStorageVol</td><td>Yes, an IntPtr as the struct is not public</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStorageVolDeleteFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virStorageVolInfo</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStorageVolType</td><td>Yes</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virStream</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStreamEventType</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virStreamFlags</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>struct</td><td>virVcpuInfo</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>enum</td><td>virVcpuState</td><td>No</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>struct</td><td>virInterface</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virInterfaceXMLFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virNWFilter</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virNetwork</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virNodeDevice</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virNodeInfo</td><td>Yes</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virSchedParameter</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virSchedParameterType</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virSecret</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virSecretUsageType</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virSecurityLabel</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virSecurityModel</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStoragePoolBuildFlags</td><td>Yes</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStoragePoolDeleteFlags</td><td>Yes</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virStoragePoolInfo</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virStoragePool</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStoragePoolState</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virStorageVol</td><td>Yes, an IntPtr as the struct is not public</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStorageVolDeleteFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virStorageVolInfo</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStorageVolType</td><td>Yes</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virStream</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStreamEventType</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virStreamFlags</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>struct</td><td>virVcpuInfo</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>enum</td><td>virVcpuState</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>struct</td><td>virError</td><td>Yes</td><td>Yes</td><td>virConnectSetErrorFunc, virDomainStats</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
     </table>
 
-    <p></p>
+    <p>&nbsp;</p>
 
-    <h2><a id="funccover">Function Coverage</a></h2>
+    <h2><a name="funccover">Function Coverage</a></h2>
 
     <p>
       Coverage of the libvirt functions is:
@@ -215,274 +227,274 @@ git clone git://libvirt.org/libvirt-csharp.git
     <table class="top_table">
       <tr><th>Name</th><th>Binding?</th><th>Type?</th><th>Tested?</th><th>Sample Code?</th><th>Working?</th><th>Tested .Net/Windows Works?</th><th>Tested Mono (32-bit)/Windows Works?</th><th>Tested Mono (64-bit)/Linux Works?</th></tr>
       <tr><td>virConnectAuthCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectBaselineCPU</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectBaselineCPU</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectClose</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectCompareCPU</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventDeregister</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventDeregisterAny</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventGenericCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventGraphicsCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventIOErrorCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventIOErrorReasonCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventRTCChangeCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectCompareCPU</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventDeregister</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventDeregisterAny</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventGenericCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventGraphicsCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventIOErrorCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventIOErrorReasonCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventRTCChangeCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectDomainEventRegister</td><td>Yes</td><td>function</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectDomainEventRegisterAny</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainEventWatchdogCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainXMLFromNative</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectDomainXMLToNative</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectFindStoragePoolSources</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetCapabilities</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetHostname</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetLibVersion</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetType</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetURI</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectGetVersion</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectIsEncrypted</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectIsSecure</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectDomainEventRegisterAny</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainEventWatchdogCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainXMLFromNative</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectDomainXMLToNative</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectFindStoragePoolSources</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetCapabilities</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetHostname</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetLibVersion</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetType</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetURI</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectGetVersion</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectIsEncrypted</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectIsSecure</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectListDefinedDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectListDefinedInterfaces </td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectListDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectListDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectListDefinedInterfaces </td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectListDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectListDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectListDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectListInterfaces</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes, if the host handle the method</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectListNWFilters </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectListNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectListSecrets</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectListInterfaces</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes, if the host handle the method</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectListNWFilters </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectListNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectListSecrets</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectListStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpen</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virConnectNumOfDefinedDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectNumOfDefinedInterfaces</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectNumOfDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectNumOfDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectNumOfDefinedInterfaces</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectNumOfDefinedNetworks</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectNumOfDefinedStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectNumOfDomains</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectNumOfInterfaces</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectNumOfNWFilters</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectNumOfNetworks </td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectNumOfSecrets</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectNumOfInterfaces</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectNumOfNWFilters</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectNumOfNetworks </td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectNumOfSecrets</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virConnectNumOfStoragePools</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpen</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virConnectOpen</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpen, virEventRegisterImpl, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virConnectOpenAuth</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virConnectOpenReadOnly</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virConnectRef</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainAbortJob</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainAttachDevice</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainAttachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainBlockPeek</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virConnectOpenReadOnly</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virConnectRef</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainAbortJob</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainAttachDevice</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainAttachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainBlockPeek</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainBlockStats</td><td>Yes</td><td>function</td><td>Yes</td><td>virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainCoreDump</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainCreate</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainCreateLinux</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainCreateWithFlags</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainCreateXML</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainDetachDevice</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainDetachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainFree</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetBlockInfo</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetConnect</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainCoreDump</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainCreate</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainCreateLinux</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainCreateWithFlags</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainCreateXML</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainDetachDevice</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainDetachDeviceFlags</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainFree</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetBlockInfo</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetConnect</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td>virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainGetJobInfo</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetMaxMemory</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainGetJobInfo</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetMaxMemory</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetMaxVcpus</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainGetName</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainGetOSType</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetSchedulerParameters</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetSchedulerType</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetSecurityLabel</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetUUID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetUUIDString</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainGetVcpus</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainGetOSType</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetSchedulerParameters</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetSchedulerType</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetSecurityLabel</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetUUID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetUUIDString</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainGetVcpus</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td>virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainHasCurrentSnapshot</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainHasManagedSaveImage</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainHasCurrentSnapshot</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainHasManagedSaveImage</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainInterfaceStats </td><td>No</td><td>function</td><td>Yes</td><td>virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainIsPersistent</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainIsPersistent</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virDomainLookupByID</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectOpenAuth, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virDomainLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td>virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virDomainLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainManagedSave    </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainManagedSaveRemove</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainMemoryPeek</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainMemoryStats</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainMigrate</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainMigrateSetMaxDowntime</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainMigrateToURI   </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainPinVcpu</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainReboot</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainRef    </td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainRestore</td><td>Yes </td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainResume </td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainRevertToSnapshot</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSave</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSetAutostart</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSetMaxMemory   </td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSetMemory</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSetSchedulerParameters</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSetVcpus</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainShutdown</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotCreateXML</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotCurrent</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotDelete</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotFree</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotGetXMLDesc</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotListNames</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotLookupByName</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSnapshotNum</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainSuspend</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virDomainUpdateDeviceFlags</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virEventAddHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virEventAddTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>virDomainLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainManagedSave    </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainManagedSaveRemove</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainMemoryPeek</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainMemoryStats</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainMigrate</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainMigrateSetMaxDowntime</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainMigrateToURI   </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainPinVcpu</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainReboot</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainRef    </td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainRestore</td><td>Yes </td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainResume </td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainRevertToSnapshot</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSave</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSetAutostart</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSetMaxMemory   </td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSetMemory</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSetSchedulerParameters</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSetVcpus</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainShutdown</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotCreateXML</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotCurrent</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotDelete</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotFree</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotGetXMLDesc</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotListNames</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotLookupByName</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSnapshotNum</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainSuspend</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virDomainUpdateDeviceFlags</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virEventAddHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virEventAddTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virEventHandleCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virEventRegisterImpl</td><td>Yes</td><td>function</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virEventRemoveHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virEventRemoveTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>virEventRemoveHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virEventRemoveTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virEventTimeoutCallback</td><td>Yes</td><td>delegate</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virEventUpdateHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virEventUpdateTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
+      <tr><td>virEventUpdateHandleFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virEventUpdateTimeoutFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virFreeCallback</td><td>Yes</td><td>function</td><td>Yes</td><td>virEventRegisterImpl</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
-      <tr><td>virGetVersion</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virInitialize</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceCreate</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceDefineXML</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceDestroy</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceFree</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceGetConnect</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceGetMACString</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceGetName</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceGetXMLDesc</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceIsActive</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceLookupByMACString</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceLookupByName</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceRef </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virInterfaceUndefine</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterDefineXML</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterFree</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterGetName</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterGetUUID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterGetUUIDString</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterGetXMLDesc</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterLookupByName </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterLookupByUUID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterLookupByUUIDString</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterRef  </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNWFilterUndefine</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkCreate</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkCreateXML</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkFree</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetBridgeName</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetConnect</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetName</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetUUID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetUUIDString </td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkRef</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNetworkUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceCreateXML</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceDestroy</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceDettach</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceFree</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceGetName</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceGetParent</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceListCaps</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceNumOfCaps</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceReAttach</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceRef</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeDeviceReset</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeGetCellsFreeMemory</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeGetFreeMemory</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeGetInfo</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeGetSecurityModel </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeListDevices</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virNodeNumOfDevices</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretDefineXML</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretFree   </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetConnect</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetUUID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetUUIDString  </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetUsageID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetUsageType</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetValue</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretGetXMLDesc</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretLookupByUUID</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretLookupByUUIDString</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretLookupByUsage</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretRef</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretSetValue</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virSecretUndefine</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolBuild</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolCreate</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolCreateXML </td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolDelete</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolFree</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetConnect</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetUUID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetUUIDString</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolListVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolLookupByVolume</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolNumOfVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolRef</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolRefresh</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStoragePoolUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolCreateXML</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolCreateXMLFrom</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolDelete</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolFree</td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetConnect  </td><td>Yes</td><td>function</td><td>No</td><td></td><td>Maybe</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetKey</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetPath</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolGetXMLDesc </td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolLookupByKey</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolLookupByPath</td><td>Yes</td><td>function</td><td>Yes</td><td></td><td>Yes</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolRef</td><td>Yes</td><td>function</td><td>No</td><td></td><td>No</td><td></td><td></td><td></td></tr>
-      <tr><td>virStorageVolWipe</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamAbort  </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamEventAddCallback</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamEventCallback</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamEventRemoveCallback</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamEventUpdateCallback</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamFinish </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamFree   </td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamNew</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamRecv</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamRecvAll</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamRef</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamSend</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamSendAll</td><td>No</td><td>function</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamSinkFunc</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-      <tr><td>virStreamSourceFunc</td><td>No</td><td>delegate</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+      <tr><td>virGetVersion</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInitialize</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceCreate</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceDefineXML</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceDestroy</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceFree</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceGetConnect</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceGetMACString</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceGetName</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceGetXMLDesc</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceIsActive</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceLookupByMACString</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceLookupByName</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceRef </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virInterfaceUndefine</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterDefineXML</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterFree</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterGetName</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterGetUUID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterGetUUIDString</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterGetXMLDesc</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterLookupByName </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterLookupByUUID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterLookupByUUIDString</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterRef  </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNWFilterUndefine</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkCreate</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkCreateXML</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkFree</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetBridgeName</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetConnect</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetName</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetUUID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetUUIDString </td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkRef</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNetworkUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceCreateXML</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceDestroy</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceDettach</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceFree</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceGetName</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceGetParent</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceListCaps</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceNumOfCaps</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceReAttach</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceRef</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeDeviceReset</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeGetCellsFreeMemory</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeGetFreeMemory</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeGetInfo</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeGetSecurityModel </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeListDevices</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virNodeNumOfDevices</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretDefineXML</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretFree   </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetConnect</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetUUID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetUUIDString  </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetUsageID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetUsageType</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetValue</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretGetXMLDesc</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretLookupByUUID</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretLookupByUUIDString</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretLookupByUsage</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretRef</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretSetValue</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virSecretUndefine</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolBuild</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolCreate</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolCreateXML </td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolDefineXML</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolDelete</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolDestroy</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolFree</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetAutostart</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetConnect</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetUUID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetUUIDString</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolGetXMLDesc</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolIsActive</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolIsPersistent</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolListVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolLookupByUUID</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolLookupByUUIDString</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolLookupByVolume</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolNumOfVolumes</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolRef</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolRefresh</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolSetAutostart</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStoragePoolUndefine</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolCreateXML</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolCreateXMLFrom</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolDelete</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolFree</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetConnect  </td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>Maybe</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetInfo</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetKey</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetPath</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolGetXMLDesc </td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolLookupByKey</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolLookupByName</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolLookupByPath</td><td>Yes</td><td>function</td><td>Yes</td><td>&nbsp;</td><td>Yes</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolRef</td><td>Yes</td><td>function</td><td>No</td><td>&nbsp;</td><td>No</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStorageVolWipe</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamAbort  </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamEventAddCallback</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamEventCallback</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamEventRemoveCallback</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamEventUpdateCallback</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamFinish </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamFree   </td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamNew</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamRecv</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamRecvAll</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamRef</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamSend</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamSendAll</td><td>No</td><td>function</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamSinkFunc</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
+      <tr><td>virStreamSourceFunc</td><td>No</td><td>delegate</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
       <tr><td>virGetLastError</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectSetErrorFunc</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virConnSetErrorFunc</td><td>Yes</td><td>function</td><td>Yes</td><td>virConnectSetErrorFunc</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>
       <tr><td>virErrorFunc</td><td>Yes</td><td>delegate</td><td>Yes</td><td>virConnectSetErrorFunc, virDomainInfos</td><td>Yes</td><td>Yes</td><td>Yes</td><td>Yes</td></tr>

docs/devguide.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>libvirt Application Development Guides</h1>

docs/docs.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body class="docs">
     <div class="panel">

docs/downloads.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Downloads</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="releases">Project modules</a></h2>
+    <h2><a name="releases">Project modules</a></h2>
 
     <p>
       The libvirt project maintains a number of inter-related modules beyond
@@ -178,22 +178,6 @@
           </td>
           <td></td>
         </tr>
-        <tr>
-          <td>Rust</td>
-          <td>
-            <a href="ftp://libvirt.org/libvirt/rust/">ftp</a>
-            <a href="http://libvirt.org/sources/rust/">http</a>
-            <a href="https://libvirt.org/sources/rust/">https</a>
-          </td>
-          <td>
-            <a href="http://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a>
-          </td>
-          <td>
-            <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a>
-            <a href="https://github.com/libvirt/libvirt-rust">github</a>
-          </td>
-          <td></td>
-        </tr>
         <tr>
           <th colspan="7">Integration modules</th>
         </tr>
@@ -435,7 +419,7 @@
       <li><a href="https://libvirt.org/sources/">libvirt.org HTTPS server</a></li>
     </ul>
 
-    <h2><a id="hourly">Hourly development snapshots</a></h2>
+    <h2><a name="hourly">Hourly development snapshots</a></h2>
 
     <p>
       Once an hour, an automated snapshot is made from the git server
@@ -450,7 +434,7 @@
       <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.xz">libvirt.org HTTP server</a></li>
     </ul>
 
-    <h2><a id="schedule">Primary release schedule</a></h2>
+    <h2><a name="schedule">Primary release schedule</a></h2>
 
     <p>
       The core libvirt module follows a time based plan, with releases made
@@ -462,7 +446,7 @@
       independant ad-hoc releases with no fixed time schedle.
     </p>
 
-    <h2><a id="numbering">Release numbering</a></h2>
+    <h2><a name="numbering">Release numbering</a></h2>
 
     <p>
       Since libvirt 2.0.0, a time based version numbering rule
@@ -497,7 +481,7 @@
       digits.
     </p>
 
-    <h2><a id="maintenance">Maintenance releases</a></h2>
+    <h2><a name="maintenance">Maintenance releases</a></h2>
     <p>
       In the git repository are several stable maintenance branches
       for the core library, matching the
@@ -525,7 +509,7 @@
       wiki page</a>.
     </p>
 
-    <h2><a id="git">GIT source repository</a></h2>
+    <h2><a name="git">GIT source repository</a></h2>
 
     <p>
       All modules maintained by the libvirt project have their primary

docs/drivers.html.in

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Internal drivers</h1>
 
-    <ul>
-      <li><a href="#hypervisor">Hypervisor drivers</a></li>
-      <li><a href="#storage">Storage drivers</a></li>
-      <li><a href="drvnodedev.html">Node device driver</a></li>
-    </ul>
+    <ul id="toc"></ul>
 
     <p>
       The libvirt public API delegates its implementation to one or
@@ -18,7 +14,7 @@
       network and storage driver active.
     </p>
 
-    <h2><a id="hypervisor">Hypervisor drivers</a></h2>
+    <h2><a name="hypervisor">Hypervisor drivers</a></h2>
 
     <p>
       The hypervisor drivers currently supported by libvirt are:
@@ -40,7 +36,7 @@
       <li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li>
     </ul>
 
-    <h2><a id="storage">Storage drivers</a></h2>
+    <h2><a name="storage">Storage drivers</a></h2>
 
     <ul>
       <li><strong><a href="storage.html#StorageBackendDir">Directory backend</a></strong></li>

docs/drvbhyve.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Bhyve driver</h1>
@@ -31,7 +31,7 @@ $
 Additional information on bhyve could be obtained on <a href="http://bhyve.org/">bhyve.org</a>.
 </p>
 
-<h2><a id="uri">Connections to the Bhyve driver</a></h2>
+<h2><a name="uri">Connections to the Bhyve driver</a></h2>
 <p>
 The libvirt bhyve driver is a single-instance privileged driver. Some sample
 connection URIs are:
@@ -43,7 +43,7 @@ bhyve+unix:///system                (local access)
 bhyve+ssh://root@example.com/system (remote access, SSH tunnelled)
 </pre>
 
-<h2><a id="exconfig">Example guest domain XML configurations</a></h2>
+<h2><a name="exconfig">Example guest domain XML configurations</a></h2>
 
 <h3>Example config</h3>
 <p>
@@ -206,9 +206,9 @@ Note the addition of &lt;bootloader&gt;.
 
 <p>Please refer to the <a href="#uefi">UEFI</a> section for a more detailed explanation.</p>
 
-<h2><a id="usage">Guest usage / management</a></h2>
+<h2><a name="usage">Guest usage / management</a></h2>
 
-<h3><a id="console">Connecting to a guest console</a></h3>
+<h3><a name="console">Connecting to a guest console</a></h3>
 
 <p>
 Guest console connection is supported through the <code>nmdm</code> device. It could be enabled by adding
@@ -253,7 +253,7 @@ device) is:</p>
 
 <pre>cu -l /dev/nmdm0B</pre>
 
-<h3><a id="xmltonative">Converting from domain XML to Bhyve args</a></h3>
+<h3><a name="xmltonative">Converting from domain XML to Bhyve args</a></h3>
 
 <p>
 The <code>virsh domxml-to-native</code> command can preview the actual
@@ -275,7 +275,7 @@ tweak them.</p>
 /usr/sbin/bhyve -c 2 -m 214 -A -I -H -P -s 0:0,hostbridge -s 3:0,virtio-net,tap0,mac=52:54:00:5d:74:e3 -s 2:0,virtio-blk,/home/user/vm1.img -s 1,lpc -l com1,/dev/nmdm0A vm1
 </pre>
 
-<h3><a id="zfsvolume">Using ZFS volumes</a></h3>
+<h3><a name="zfsvolume">Using ZFS volumes</a></h3>
 
 <p>It's possible to use ZFS volumes as disk devices <span class="since">since 1.2.8</span>.
 An example of domain XML device entry for that will look like:</p>
@@ -291,7 +291,7 @@ An example of domain XML device entry for that will look like:</p>
 <p>Please refer to the <a href="storage.html">Storage documentation</a> for more details on storage
 management.</p>
 
-<h3><a id="grubbhyve">Using grub2-bhyve or Alternative Bootloaders</a></h3>
+<h3><a name="grubbhyve">Using grub2-bhyve or Alternative Bootloaders</a></h3>
 
 <p>It's possible to boot non-FreeBSD guests by specifying an explicit
 bootloader, e.g. <code>grub-bhyve(1)</code>. Arguments to the bootloader may be
@@ -312,7 +312,7 @@ attempt to boot from the first partition in the disk image.</p>
 <p>Caveat: <code>bootloader_args</code> does not support any quoting.
 Filenames, etc, must not have spaces or they will be tokenized incorrectly.</p>
 
-<h3><a id="uefi">Using UEFI bootrom, VNC, and USB tablet</a></h3>
+<h3><a name="uefi">Using UEFI bootrom, VNC, and USB tablet</a></h3>
 
 <p><span class="since">Since 3.2.0</span>, in addition to <a href="#grubbhyve">grub-bhyve</a>,
 non-FreeBSD guests could be also booted using an UEFI boot ROM, provided both guest OS and
@@ -351,45 +351,11 @@ FreeBSD port.</p>
 
 <p>This way, VNC will be accessible on <code>127.0.0.1:5904</code>.</p>
 
-<p>Please note that the tablet device requires to have a USB controller
+<p>Please note that the tablet device requires to have an USB controller
 of the <code>nec-xhci</code> model. Currently, only a single controller of this
 type and a single tablet are supported per domain.</p>
 
-<p><span class="since">Since 3.5.0</span>, it's possible to configure how the video device is exposed
-to the guest using the <code>vgaconf</code> attribute:</p>
-
-<pre>
-&lt;domain type='bhyve'&gt;
-    &lt;devices&gt;
-    ...
-      &lt;graphics type='vnc' port='5904'&gt;
-        &lt;listen type='address' address='127.0.0.1'/&gt;
-      &lt;/graphics&gt;
-      &lt;video&gt;
-        &lt;driver vgaconf='on'/&gt;
-        &lt;model type='gop' heads='1' primary='yes'/&gt;
-      &lt;/video&gt;
-      ...
-    &lt;/devices&gt;
-    ...
-&lt;/domain&gt;
-</pre>
-
-<p>If not specified, bhyve's default mode for <code>vgaconf</code>
-will be used. Please refer to the
-<a href="https://www.freebsd.org/cgi/man.cgi?query=bhyve&amp;sektion=8&amp;manpath=FreeBSD+12-current">bhyve(8)</a>
-manual page and the <a href="https://wiki.freebsd.org/bhyve">bhyve wiki</a> for more details on using
-the <code>vgaconf</code> option.</p>
-
-<p><span class="since">Since 3.7.0</span>, it's possible to use <code>autoport</code>
-to let libvirt allocate VNC port automatically (instead of explicitly specifying
-it with the <code>port</code> attribute):</p>
-
-<pre>
-    &lt;graphics type='vnc' autoport='yes'&gt;
-</pre>
-
-<h3><a id="clockconfig">Clock configuration</a></h3>
+<h3><a name="clockconfig">Clock configuration</a></h3>
 
 <p>Originally bhyve supported only localtime for RTC. Support for UTC time was introduced in
 <a href="http://svnweb.freebsd.org/changeset/base/284894">r284894</a> for <i>10-STABLE</i> and
@@ -417,7 +383,7 @@ you'll need to explicitly specify 'localtime' in this case:</p>
 &lt;/domain&gt;
 </pre>
 
-<h3><a id="e1000">e1000 NIC</a></h3>
+<h3><a name="e1000">e1000 NIC</a></h3>
 
 <p>As of <a href="https://svnweb.freebsd.org/changeset/base/302504">r302504</a> bhyve
 supports Intel e1000 network adapter emulation. It's supported in libvirt

docs/drvesx.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>VMware ESX hypervisor driver</h1>
@@ -11,7 +11,7 @@
         connect to a VMware vCenter 2.5/4.x/5.x (VPX).
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -20,7 +20,7 @@
       </li>
     </ul>
 
-    <h2><a id="prereq">Deployment pre-requisites</a></h2>
+    <h2><a name="prereq">Deployment pre-requisites</a></h2>
     <p>
         None. Any out-of-the-box installation of VPX/ESX(i)/GSX should work. No
         preparations are required on the server side, no libvirtd must be
@@ -34,7 +34,7 @@
         VMware vSphere API</a>.
     </p>
 
-    <h2><a id="uri">Connections to the VMware ESX driver</a></h2>
+    <h2><a name="uri">Connections to the VMware ESX driver</a></h2>
     <p>
         Some example remote connection URIs for the driver are:
     </p>
@@ -54,7 +54,7 @@ esx://example-esx.com/?no_verify=1     (ESX over HTTPS, but doesn't verify the s
     </p>
 
 
-    <h3><a id="uriformat">URI Format</a></h3>
+    <h3><a name="uriformat">URI Format</a></h3>
     <p>
         URIs have this general form (<code>[...]</code> marks an optional part).
     </p>
@@ -93,7 +93,7 @@ vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com
 </pre>
 
 
-    <h4><a id="extraparams">Extra parameters</a></h4>
+    <h4><a name="extraparams">Extra parameters</a></h4>
     <p>
         Extra parameters can be added to a URI as part of the query string
         (the part following <code>?</code>). A single parameter is formed by a
@@ -188,7 +188,7 @@ vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com
     </table>
 
 
-    <h3><a id="auth">Authentication</a></h3>
+    <h3><a name="auth">Authentication</a></h3>
     <p>
         In order to perform any useful operation the driver needs to log into
         the ESX server. Therefore, only <code>virConnectOpenAuth</code> can be
@@ -208,7 +208,7 @@ vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com
     </p>
 
 
-    <h3><a id="certificates">Certificates for HTTPS</a></h3>
+    <h3><a name="certificates">Certificates for HTTPS</a></h3>
     <p>
         By default the ESX driver uses HTTPS to communicate with an ESX server.
         Proper HTTPS communication requires correctly configured SSL
@@ -244,7 +244,7 @@ error: internal error curl_easy_perform() returned an error: Peer certificate ca
     </ul>
 
 
-    <h3><a id="connproblems">Connection problems</a></h3>
+    <h3><a name="connproblems">Connection problems</a></h3>
     <p>
         There are also other causes for connection problems than the
         <a href="#certificates">HTTPS certificate</a> related ones.
@@ -303,7 +303,7 @@ error: invalid argument in libvirt was built without the 'esx' driver
     </ul>
 
 
-    <h2><a id="questions">Questions blocking tasks</a></h2>
+    <h2><a name="questions">Questions blocking tasks</a></h2>
     <p>
         Some methods of the VI API start tasks, for example
         <code>PowerOnVM_Task()</code>. Such tasks may be blocked by questions
@@ -322,12 +322,12 @@ error: invalid argument in libvirt was built without the 'esx' driver
     </p>
 
 
-    <h2><a id="xmlspecial">Specialties in the domain XML config</a></h2>
+    <h2><a name="xmlspecial">Specialties in the domain XML config</a></h2>
     <p>
         There are several specialties in the domain XML config for ESX domains.
     </p>
 
-    <h3><a id="restrictions">Restrictions</a></h3>
+    <h3><a name="restrictions">Restrictions</a></h3>
     <p>
         There are some restrictions for some values of the domain XML config.
         The driver will complain if this restrictions are violated.
@@ -347,7 +347,7 @@ error: invalid argument in libvirt was built without the 'esx' driver
     </ul>
 
 
-    <h3><a id="datastore">Datastore references</a></h3>
+    <h3><a name="datastore">Datastore references</a></h3>
     <p>
         Storage is managed in datastores. VMware uses a special path format to
         reference files in a datastore. Basically, the datastore name is put
@@ -366,7 +366,7 @@ error: invalid argument in libvirt was built without the 'esx' driver
     </p>
 
 
-    <h3><a id="macaddresses">MAC addresses</a></h3>
+    <h3><a name="macaddresses">MAC addresses</a></h3>
     <p>
         VMware has registered two MAC address prefixes for domains:
         <code>00:0c:29</code> and <code>00:50:56</code>. These prefixes are
@@ -427,7 +427,7 @@ ethernet0.checkMACAddress = "false"
 </pre>
 
 
-    <h3><a id="hardware">Available hardware</a></h3>
+    <h3><a name="hardware">Available hardware</a></h3>
     <p>
         VMware ESX supports different models of SCSI controllers and network
         cards.
@@ -523,14 +523,14 @@ ethernet0.checkMACAddress = "false"
 </pre>
 
 
-    <h2><a id="importexport">Import and export of domain XML configs</a></h2>
+    <h2><a name="importexport">Import and export of domain XML configs</a></h2>
     <p>
         The ESX driver currently supports a native config format known as
         <code>vmware-vmx</code> to handle VMware VMX configs.
     </p>
 
 
-    <h3><a id="xmlimport">Converting from VMware VMX config to domain XML config</a></h3>
+    <h3><a name="xmlimport">Converting from VMware VMX config to domain XML config</a></h3>
     <p>
         The <code>virsh domxml-from-native</code> provides a way to convert an
         existing VMware VMX config into a domain XML config that can then be
@@ -621,7 +621,7 @@ Enter root password for example.com:
 </pre>
 
 
-    <h3><a id="xmlexport">Converting from domain XML config to VMware VMX config</a></h3>
+    <h3><a name="xmlexport">Converting from domain XML config to VMware VMX config</a></h3>
     <p>
       The <code>virsh domxml-to-native</code> provides a way to convert a
       domain XML config into a VMware VMX config.
@@ -675,7 +675,7 @@ ethernet0.address = "00:50:56:25:48:C7"
 </pre>
 
 
-    <h2><a id="xmlconfig">Example domain XML configs</a></h2>
+    <h2><a name="xmlconfig">Example domain XML configs</a></h2>
 
     <h3>Fedora11 on x86_64</h3>
 <pre>
@@ -704,7 +704,7 @@ ethernet0.address = "00:50:56:25:48:C7"
 </pre>
 
 
-    <h2><a id="migration">Migration</a></h2>
+    <h2><a name="migration">Migration</a></h2>
     <p>
         A migration cannot be initiated on an ESX server directly, a VMware
         vCenter is necessary for this. The <code>vcenter</code> query
@@ -749,7 +749,7 @@ Enter administrator password for example-vcenter.com:
 </pre>
 
 
-    <h2><a id="scheduler">Scheduler configuration</a></h2>
+    <h2><a name="scheduler">Scheduler configuration</a></h2>
     <p>
         The driver exposes the ESX CPU scheduler. The parameters listed below
         are available to control the scheduler.
@@ -780,7 +780,7 @@ Enter administrator password for example-vcenter.com:
     </dl>
 
 
-    <h2><a id="tools">VMware tools</a></h2>
+    <h2><a name="tools">VMware tools</a></h2>
     <p>
         Some actions require installed VMware tools. If the VMware tools are
         not installed in the guest and one of the actions below is to be
@@ -796,7 +796,7 @@ Enter administrator password for example-vcenter.com:
     </ul>
 
 
-    <h2><a id="links">Links</a></h2>
+    <h2><a name="links">Links</a></h2>
     <ul>
         <li>
             <a href="http://www.vmware.com/support/developer/vc-sdk/">

docs/drvhyperv.html.in

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Microsoft Hyper-V hypervisor driver</h1>
     <ul id="toc"></ul>
     <p>
-        The libvirt Microsoft Hyper-V driver can manage Hyper-V 2008 R2 and newer.
+        The libvirt Microsoft Hyper-V driver can manage Hyper-V 2008 R2.
     </p>
 
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
     <ul>
       <li>
         The <a href="http://www.microsoft.com/hyper-v-server/">Microsoft Hyper-V</a>
@@ -18,7 +18,7 @@
     </ul>
 
 
-    <h2><a id="uri">Connections to the Microsoft Hyper-V driver</a></h2>
+    <h2><a name="uri">Connections to the Microsoft Hyper-V driver</a></h2>
     <p>
         Some example remote connection URIs for the driver are:
     </p>
@@ -36,7 +36,7 @@ hyperv://example-hyperv.com/?transport=http  (over HTTP)
     </p>
 
 
-    <h3><a id="uriformat">URI Format</a></h3>
+    <h3><a name="uriformat">URI Format</a></h3>
     <p>
         URIs have this general form (<code>[...]</code> marks an optional part).
     </p>
@@ -49,7 +49,7 @@ hyperv://[username@]hostname[:port]/[?extraparameters]
     </p>
 
 
-    <h4><a id="extraparams">Extra parameters</a></h4>
+    <h4><a name="extraparams">Extra parameters</a></h4>
     <p>
         Extra parameters can be added to a URI as part of the query string
         (the part following <code>?</code>). A single parameter is formed by a
@@ -83,7 +83,7 @@ hyperv://[username@]hostname[:port]/[?extraparameters]
     </table>
 
 
-    <h3><a id="auth">Authentication</a></h3>
+    <h3><a name="auth">Authentication</a></h3>
     <p>
         In order to perform any useful operation the driver needs to log into
         the Hyper-V server. Therefore, only <code>virConnectOpenAuth</code> can

docs/drvlxc.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>LXC container driver</h1>
@@ -18,7 +18,7 @@ particular sVirt for mandatory access control, auditing of operations,
 integration with control groups and many other features.
 </p>
 
-<h2><a id="cgroups">Control groups Requirements</a></h2>
+<h2><a name="cgroups">Control groups Requirements</a></h2>
 
 <p>
 In order to control the resource usage of processes inside containers, the
@@ -32,7 +32,7 @@ init service will be required. For further information, consult the general
 libvirt <a href="cgroups.html">cgroups documentation</a>.
 </p>
 
-<h2><a id="namespaces">Namespace requirements</a></h2>
+<h2><a name="namespaces">Namespace requirements</a></h2>
 
 <p>
 In order to separate processes inside a container from those in the
@@ -47,9 +47,9 @@ configured UID/GID mapping is a pre-requisite to making containers
 secure, in the absence of sVirt confinement.</strong>
 </p>
 
-<h2><a id="init">Default container setup</a></h2>
+<h2><a name="init">Default container setup</a></h2>
 
-<h3><a id="cliargs">Command line arguments</a></h3>
+<h3><a name="cliargs">Command line arguments</a></h3>
 
 <p>
 When the container "init" process is started, it will typically
@@ -70,7 +70,7 @@ would use the following XML
 &lt;/os&gt;
 </pre>
 
-<h3><a id="envvars">Environment variables</a></h3>
+<h3><a name="envvars">Environment variables</a></h3>
 
 <p>
 When the container "init" process is started, it will be given several useful
@@ -108,7 +108,7 @@ Use of this is discouraged, in favour of passing arguments directly to the
 container init process via the <code>initarg</code> config element.</dd>
 </dl>
 
-<h3><a id="fsmounts">Filesystem mounts</a></h3>
+<h3><a name="fsmounts">Filesystem mounts</a></h3>
 
 <p>
 In the absence of any explicit configuration, the container will
@@ -131,7 +131,7 @@ only expose the sub-tree associated with the container</li>
 </ul>
 
 
-<h3><a id="devnodes">Device nodes</a></h3>
+<h3><a name="devnodes">Device nodes</a></h3>
 
 <p>
 The container init process will be started with <code>CAP_MKNOD</code>
@@ -178,7 +178,7 @@ Further block or character devices will be made available to containers
 depending on their configuration.
 </p>
 
-<h2><a id="security">Security considerations</a></h2>
+<h2><a name="security">Security considerations</a></h2>
 
 <p>
 The libvirt LXC driver is fairly flexible in how it can be configured,
@@ -190,7 +190,7 @@ isolation between a container and the host must ensure that they are
 writing a suitable configuration.
 </p>
 
-<h3><a id="securenetworking">Network isolation</a></h3>
+<h3><a name="securenetworking">Network isolation</a></h3>
 
 <p>
 If the guest configuration does not list any network interfaces,
@@ -205,7 +205,7 @@ namespace is not wanted, then applications should set the
 <code>&lt;features&gt;....&lt;/features&gt;</code> element.
 </p>
 
-<h3><a id="securefs">Filesystem isolation</a></h3>
+<h3><a name="securefs">Filesystem isolation</a></h3>
 
 <p>
 If the guest configuration does not list any filesystems, then
@@ -250,7 +250,7 @@ a bind mount to hide them. This is particularly important for the
 </p>
 
 
-<h3><a id="secureusers">User and group isolation</a></h3>
+<h3><a name="secureusers">User and group isolation</a></h3>
 
 <p>
 If the guest configuration does not list any ID mapping, then the
@@ -281,7 +281,7 @@ causes libvirt to activate the user namespace feature.
 </p>
 
 
-<h2><a id="activation">Systemd Socket Activation Integration</a></h2>
+<h2><a name="activation">Systemd Socket Activation Integration</a></h2>
 
 <p>
 The libvirt LXC driver provides the ability to pass across pre-opened file
@@ -477,7 +477,7 @@ configured to block read/write/mknod from all devices except those
 that a container is authorized to use.
 </p>
 
-<h2><a id="exconfig">Example configurations</a></h2>
+<h2><a name="exconfig">Example configurations</a></h2>
 
 <h3>Example config version 1</h3>
 <p></p>
@@ -542,7 +542,7 @@ debootstrap, whatever) under /opt/vm-1-root:
 &lt;/domain&gt;
 </pre>
 
-<h2><a id="capabilities">Altering the available capabilities</a></h2>
+<h2><a name="capabilities">Altering the available capabilities</a></h2>
 
 <p>
 By default the libvirt LXC driver drops some capabilities among which CAP_MKNOD.
@@ -590,7 +590,7 @@ Note that allowing capabilities that are normally dropped by default can serious
 affect the security of the container and the host.
 </p>
 
-<h2><a id="share">Inherit namespaces</a></h2>
+<h2><a name="share">Inherit namespaces</a></h2>
 
 <p>
 Libvirt allows you to inherit the namespace from container/process just like lxc tools
@@ -615,7 +615,7 @@ ignored.
 The use of namespace passthrough requires libvirt >= 1.2.19
 </p>
 
-<h2><a id="usage">Container usage / management</a></h2>
+<h2><a name="usage">Container usage / management</a></h2>
 
 <p>
 As with any libvirt virtualization driver, LXC containers can be
@@ -629,7 +629,7 @@ and LXC. For further details about usage of virsh consult its
 manual page.
 </p>
 
-<h3><a id="usageSave">Defining (saving) container configuration</a></h3>
+<h3><a name="usageSave">Defining (saving) container configuration</a></h3>
 
 <p>
 The <code>virsh define</code> command takes an XML configuration
@@ -640,7 +640,7 @@ document and loads it into libvirt, saving the configuration on disk
 # virsh -c lxc:/// define myguest.xml
 </pre>
 
-<h3><a id="usageView">Viewing container configuration</a></h3>
+<h3><a name="usageView">Viewing container configuration</a></h3>
 
 <p>
 The <code>virsh dumpxml</code> command can be used to view the
@@ -655,7 +655,7 @@ using the <code>--inactive</code> flag
 # virsh -c lxc:/// dumpxml myguest
 </pre>
 
-<h3><a id="usageStart">Starting containers</a></h3>
+<h3><a name="usageStart">Starting containers</a></h3>
 
 <p>
 The <code>virsh start</code> command can be used to start a
@@ -677,7 +677,7 @@ by libvirt, using the <code>virsh create</code> command.
 </pre>
 
 
-<h3><a id="usageStop">Stopping containers</a></h3>
+<h3><a name="usageStop">Stopping containers</a></h3>
 
 <p>
 The <code>virsh shutdown</code> command can be used
@@ -702,7 +702,7 @@ request, it can be forcibly stopped using the <code>virsh destroy</code>
 </pre>
 
 
-<h3><a id="usageReboot">Rebooting a container</a></h3>
+<h3><a name="usageReboot">Rebooting a container</a></h3>
 
 <p>
 The <code>virsh reboot</code> command can be used
@@ -717,7 +717,7 @@ to PID 1 inside the container.
 # virsh -c lxc:/// reboot myguest
 </pre>
 
-<h3><a id="usageDelete">Undefining (deleting) a container configuration</a></h3>
+<h3><a name="usageDelete">Undefining (deleting) a container configuration</a></h3>
 
 <p>
 The <code>virsh undefine</code> command can be used to delete the
@@ -729,7 +729,7 @@ running, this will turn it into a "transient" guest.
 # virsh -c lxc:/// undefine myguest
 </pre>
 
-<h3><a id="usageConnect">Connecting to a container console</a></h3>
+<h3><a name="usageConnect">Connecting to a container console</a></h3>
 
 <p>
 The <code>virsh console</code> command can be used to connect
@@ -752,7 +752,7 @@ as 'console0', 'console1', 'console2', etc.
 # virsh -c lxc:/// console myguest --devname console1
 </pre>
 
-<h3><a id="usageEnter">Running commands in a container</a></h3>
+<h3><a name="usageEnter">Running commands in a container</a></h3>
 
 <p>
 The <code>virsh lxc-enter-namespace</code> command can be used
@@ -764,7 +764,7 @@ and then execute an arbitrary command.
 # virsh -c lxc:/// lxc-enter-namespace myguest -- /bin/ls -al /dev
 </pre>
 
-<h3><a id="usageTop">Monitoring container utilization</a></h3>
+<h3><a name="usageTop">Monitoring container utilization</a></h3>
 
 <p>
 The <code>virt-top</code> command can be used to monitor the
@@ -776,7 +776,7 @@ host
 # virt-top -c lxc:///
 </pre>
 
-<h3><a id="usageConvert">Converting LXC container configuration</a></h3>
+<h3><a name="usageConvert">Converting LXC container configuration</a></h3>
 
 <p>
 The <code>virsh domxml-from-native</code> command can be used to convert

docs/drvnodedev.html.in

@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <body>
-    <h1>Host device management</h1>
-
-    <p>
-      Libvirt provides management of both physical and virtual host devices
-      (historically also referred to as node devices) like USB, PCI, SCSI, and
-      network devices. This also includes various virtualization capabilities
-      which the aforementioned devices provide for utilization, for example
-      SR-IOV, NPIV, MDEV, DRM, etc.
-    </p>
-
-    <p>
-      The node device driver provides means to list and show details about host
-      devices (<code>virsh nodedev-list</code>,
-      <code>virsh nodedev-dumpxml</code>), which are generic and can be used
-      with all devices. It also provides means to create and destroy devices
-      (<code>virsh nodedev-create</code>, <code>virsh nodedev-destroy</code>)
-      which are meant to be used to create virtual devices, currently only
-      supported by NPIV
-      (<a href="http://wiki.libvirt.org/page/NPIV_in_libvirt">more info about NPIV)</a>).
-      Devices on the host system are arranged in a tree-like hierarchy, with
-      the root node being called <code>computer</code>. The node device driver
-      supports two backends to manage the devices, HAL and udev, with the former
-      being deprecated in favour of the latter.
-    </p>
-
-    <p>
-      The generic format of a host device XML can be seen below.
-      To identify a device both within the host and the device tree hierarchy,
-      the following elements are used:
-    </p>
-      <dl>
-        <dt><code>name</code></dt>
-        <dd>
-          The device's name will be generated by libvirt using the subsystem,
-          like pci and the device's sysfs basename.
-        </dd>
-        <dt><code>path</code></dt>
-        <dd>
-          Fully qualified sysfs path to the device.
-        </dd>
-        <dt><code>parent</code></dt>
-        <dd>
-          This element identifies the parent node in the device hierarchy. The
-          value of the element will correspond with the device parent's
-          <code>name</code> element or <code>computer</code> if the device does
-          not have any parent.
-        </dd>
-        <dt><code>driver</code></dt>
-        <dd>
-          This elements reports the driver in use for this device. The presence
-          of this element in the output XML depends on whether the underlying
-          device manager (most likely udev) exposes information about the
-          driver.
-        </dd>
-        <dt><code>capability</code></dt>
-        <dd>
-          Describes the device in terms of feature support. The element has one
-          mandatory attribute <code>type</code> the value of which determines
-          the type of the device. Currently recognized values for the attribute
-          are:
-          <code>system</code>,
-          <code>pci</code>,
-          <code>usb</code>,
-          <code>usb_device</code>,
-          <code>net</code>,
-          <code>scsi</code>,
-          <code>scsi_host</code> (<span class="since">Since 0.4.7</span>),
-          <code>fc_host</code>,
-          <code>vports</code>,
-          <code>scsi_target</code> (<span class="since">Since 0.7.3</span>),
-          <code>storage</code> (<span class="since">Since 1.0.4</span>),
-          <code>scsi_generic</code> (<span class="since">Since 1.0.7</span>),
-          <code>drm</code> (<span class="since">Since 3.1.0</span>), and
-          <code>mdev</code> (<span class="since">Since 3.4.0</span>).
-          This element can be nested in which case it further specifies a
-          device's capability. Refer to specific device types to see more values
-          for the <code>type</code> attribute which are exclusive.
-        </dd>
-      </dl>
-
-    <h2>Basic structure of a node device</h2>
-    <pre>
-&lt;device&gt;
-  &lt;name&gt;pci_0000_00_17_0&lt;/name&gt;
-  &lt;path&gt;/sys/devices/pci0000:00/0000:00:17.0&lt;/path&gt;
-  &lt;parent&gt;computer&lt;/parent&gt;
-  &lt;driver&gt;
-    &lt;name&gt;ahci&lt;/name&gt;
-  &lt;/driver&gt;
-  &lt;capability type='pci'&gt;
-...
-  &lt;/capability&gt;
-&lt;/device&gt;</pre>
-
-    <ul id="toc"/>
-
-    <h2><a id="PCI">PCI host devices</a></h2>
-    <dl>
-      <dt><code>capability</code></dt>
-      <dd>
-        When used as top level element, the supported values for the
-        <code>type</code> attribute are <code>pci</code> and
-        <code>phys_function</code> (see <a href="#SRIOVCap">SR-IOV below</a>).
-      </dd>
-    </dl>
-    <pre>
-&lt;device&gt;
-  &lt;name&gt;pci_0000_04_00_1&lt;/name&gt;
-  &lt;path&gt;/sys/devices/pci0000:00/0000:00:06.0/0000:04:00.1&lt;/path&gt;
-  &lt;parent&gt;pci_0000_00_06_0&lt;/parent&gt;
-  &lt;driver&gt;
-    &lt;name&gt;igb&lt;/name&gt;
-  &lt;/driver&gt;
-  &lt;capability type='pci'&gt;
-    &lt;domain&gt;0&lt;/domain&gt;
-    &lt;bus&gt;4&lt;/bus&gt;
-    &lt;slot&gt;0&lt;/slot&gt;
-    &lt;function&gt;1&lt;/function&gt;
-    &lt;product id='0x10c9'&gt;82576 Gigabit Network Connection&lt;/product&gt;
-    &lt;vendor id='0x8086'&gt;Intel Corporation&lt;/vendor&gt;
-    &lt;iommuGroup number='15'&gt;
-      &lt;address domain='0x0000' bus='0x04' slot='0x00' function='0x1'/&gt;
-    &lt;/iommuGroup&gt;
-    &lt;numa node='0'/&gt;
-    &lt;pci-express&gt;
-      &lt;link validity='cap' port='1' speed='2.5' width='2'/&gt;
-      &lt;link validity='sta' speed='2.5' width='2'/&gt;
-    &lt;/pci-express&gt;
-  &lt;/capability&gt;
-&lt;/device&gt;</pre>
-
-    <p>
-      The XML format for a PCI device stays the same for any further
-      capabilities it supports, a single nested <code>&lt;capability&gt;</code>
-      element will be included for each capability the device supports.
-    </p>
-
-    <h3><a id="SRIOVCap">SR-IOV capability</a></h3>
-    <p>
-      Single root input/output virtualization (SR-IOV) allows sharing of the
-      PCIe resources by multiple virtual environments. That is achieved by
-      slicing up a single full-featured physical resource called physical
-      function (PF) into multiple devices called virtual functions (VFs) sharing
-      their configuration with the underlying PF. Despite the SR-IOV
-      specification, the amount of VFs that can be created on a PF varies among
-      manufacturers.
-    </p>
-
-    <p>
-      Suppose the NIC <a href="#PCI">above</a> was also SR-IOV capable, it would
-      also include a nested
-      <code>&lt;capability&gt;</code> element enumerating all virtual
-      functions available on the physical device (physical port) like in the
-      example below.
-    </p>
-
-    <pre>
-&lt;capability type='pci'&gt;
-...
-  &lt;capability type='virt_functions' maxCount='7'&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x10' function='0x1'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x10' function='0x3'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x10' function='0x5'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x10' function='0x7'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x11' function='0x1'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x11' function='0x3'/&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x11' function='0x5'/&gt;
-  &lt;/capability&gt;
-...
-&lt;/capability&gt;</pre>
-    <p>
-      A SR-IOV child device on the other hand, would then report its top level
-      capability type as a <code>phys_function</code> instead:
-    </p>
-
-    <pre>
-&lt;device&gt;
-...
-  &lt;capability type='phys_function'&gt;
-    &lt;address domain='0x0000' bus='0x04' slot='0x00' function='0x0'/&gt;
-  &lt;/capability&gt;
-...
-&lt;device&gt;</pre>
-
-    <h3><a id="MDEVCap">MDEV capability</a></h3>
-    <p>
-      A PCI device capable of creating mediated devices will include a nested
-      capability <code>mdev_types</code> which enumerates all supported mdev
-      types on the physical device, along with the type attributes available
-      through sysfs:
-    </p>
-
-    <dl>
-      <dt><code>type</code></dt>
-      <dd>
-        This element describes a mediated device type which acts as an
-        abstract template defining a resource allocation for instances of this
-        device type. The element has one attribute <code>id</code> which holds
-        an official vendor-supplied identifier for the type.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-
-      <dt><code>name</code></dt>
-      <dd>
-        The <code>name</code> element holds a vendor-supplied code name for
-        the given mediated device type. This is an optional element.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-
-      <dt><code>deviceAPI</code></dt>
-      <dd>
-        The value of this element describes how an instance of the given type
-        will be presented to the guest by the VFIO framework.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-
-      <dt><code>availableInstances</code></dt>
-      <dd>
-        This element reports the current state of resource allocation. In other
-        words, how many instances of the given type can still be successfully
-        created on the physical device.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-    </dl>
-
-    <p>
-      For a more info about mediated devices, refer to the
-      <a href="#MDEV">paragraph below</a>.
-    </p>
-
-<pre>
-&lt;device&gt;
-...
-  &lt;driver&gt;
-    &lt;name&gt;nvidia&lt;/name&gt;
-  &lt;/driver&gt;
-  &lt;capability type='pci'&gt;
-...
-    &lt;capability type='mdev_types'&gt;
-      &lt;type id='nvidia-11'&gt;
-        &lt;name&gt;GRID M60-0B&lt;/name&gt;
-        &lt;deviceAPI&gt;vfio-pci&lt;/deviceAPI&gt;
-        &lt;availableInstances&gt;16&lt;/availableInstances&gt;
-      &lt;/type&gt;
-      &lt;!-- Here would come the rest of the available mdev types --&gt;
-    &lt;/capability&gt;
-...
-  &lt;/capability&gt;
-&lt;/device&gt;</pre>
-
-    <h2><a id="MDEV">Mediated devices (MDEVs)</a></h2>
-    <p>
-      Mediated devices (<span class="since">Since 3.2.0</span>) are software
-      devices defining resource allocation on the backing physical device which
-      in turn allows the parent physical device's resources to be divided into
-      several mediated devices, thus sharing the physical device's performance
-      among multiple guests. Unlike SR-IOV however, where a PCIe device appears
-      as multiple separate PCIe devices on the host's PCI bus, mediated devices
-      only appear on the mdev virtual bus. Therefore, no detach/reattach
-      procedure from/to the host driver procedure is involved even though
-      mediated devices are used in a direct device assignment manner.
-    </p>
-
-    <p>
-      The following sub-elements and attributes are exposed within the
-      <code>capability</code> element:
-    </p>
-
-    <dl>
-      <dt><code>type</code></dt>
-      <dd>
-        This element describes a mediated device type which acts as an
-        abstract template defining a resource allocation for instances of this
-        device type. The element has one attribute <code>id</code> which holds
-        an official vendor-supplied identifier for the type.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-
-      <dt><code>iommuGroup</code></dt>
-      <dd>
-        This element supports a single attribute <code>number</code> which holds
-        the IOMMU group number the mediated device belongs to.
-        <span class="since">Since 3.4.0</span>
-      </dd>
-    </dl>
-
-    <h3>Example of a mediated device</h3>
-    <pre>
-&lt;device&gt;
-  &lt;name&gt;mdev_4b20d080_1b54_4048_85b3_a6a62d165c01&lt;/name&gt;
-  &lt;path&gt;/sys/devices/pci0000:00/0000:00:02.0/4b20d080-1b54-4048-85b3-a6a62d165c01&lt;/path&gt;
-  &lt;parent&gt;pci_0000_06_00_0&lt;/parent&gt;
-  &lt;driver&gt;
-    &lt;name&gt;vfio_mdev&lt;/name&gt;
-  &lt;/driver&gt;
-  &lt;capability type='mdev'&gt;
-    &lt;type id='nvidia-11'/&gt;
-    &lt;iommuGroup number='12'/&gt;
-  &lt;capability/&gt;
-&lt;device/&gt;</pre>
-
-    <p>
-      The support of mediated device's framework in libvirt's node device driver
-      covers the following features:
-    </p>
-
-    <ul>
-      <li>
-        list available mediated devices on the host
-        (<span class="since">Since 3.4.0</span>)
-      </li>
-      <li>
-        display device details
-        (<span class="since">Since 3.4.0</span>)
-      </li>
-    </ul>
-
-    <p>
-      Because mediated devices are instantiated from vendor specific templates,
-      simply called 'types', information describing these types is contained
-      within the parent device's capabilities
-      (see the example in <a href="#PCI">PCI host devices</a>).
-    </p>
-
-    <p>
-      To see the supported mediated device types on a specific physical device
-      use the following:
-    </p>
-
-    <pre>
-$ ls /sys/class/mdev_bus/&lt;device&gt;/mdev_supported_types</pre>
-
-    <p>
-      To manually instantiate a mediated device, use one of the following as a
-      reference:
-    </p>
-
-    <pre>
-$ uuidgen &gt; /sys/class/mdev_bus/&lt;device&gt;/mdev_supported_types/&lt;type&gt;/create
-...
-$ echo &lt;UUID&gt; &gt; /sys/class/mdev_bus/&lt;device&gt;/mdev_supported_types/&lt;type&gt;/create</pre>
-
-    <p>
-      Manual removal of a mediated device is then performed as follows:
-    </p>
-
-    <pre>
-$ echo 1 &gt; /sys/bus/mdev/devices/&lt;uuid&gt;/remove</pre>
-
-  </body>
-</html>

docs/drvopenvz.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>OpenVZ container driver</h1>
@@ -15,7 +15,7 @@
     undue trouble.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -24,7 +24,7 @@
       </li>
     </ul>
 
-    <h2><a id="connections">Connections to OpenVZ driver</a></h2>
+    <h2><a name="connections">Connections to OpenVZ driver</a></h2>
 
     <p>
     The libvirt OpenVZ driver is a single-instance privileged driver,
@@ -40,7 +40,7 @@ openvz+tcp://example.com/system      (remote access, SASl/Kerberos)
 openvz+ssh://root@example.com/system (remote access, SSH tunnelled)
 </pre>
 
-    <h2><a id="notes">Notes on bridged networking</a></h2>
+    <h2><a name="notes">Notes on bridged networking</a></h2>
 
     <p>
     Bridged networking enables a guest domain (ie container) to have its
@@ -49,7 +49,7 @@ openvz+ssh://root@example.com/system (remote access, SSH tunnelled)
     the host OS.
     </p>
 
-    <h3><a id="host">Host network devices</a></h3>
+    <h3><a name="host">Host network devices</a></h3>
 
     <p>
     One or more of the physical devices must be attached to a bridge. The
@@ -60,7 +60,7 @@ openvz+ssh://root@example.com/system (remote access, SSH tunnelled)
     physical device "eth0", or a bonding device "bond0".
     </p>
 
-    <h3><a id="tools">OpenVZ tools configuration</a></h3>
+    <h3><a name="tools">OpenVZ tools configuration</a></h3>
 
     <p>
     OpenVZ releases later than 3.0.23 ship with a standard network device
@@ -85,7 +85,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr"
     </p>
 
 
-    <h2><a id="example">Example guest domain XML configuration</a></h2>
+    <h2><a name="example">Example guest domain XML configuration</a></h2>
 
     <p>
     The current libvirt OpenVZ driver has a restriction that the

docs/drvphyp.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>IBM PowerVM hypervisor driver (phyp)</h1>
@@ -10,7 +10,7 @@
     </p>
 
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
     <ul>
       <li>
         The <a href="http://www-03.ibm.com/systems/power/software/virtualization/index.html">IBM
@@ -19,7 +19,7 @@
     </ul>
 
 
-    <h2><a id="uri">Connections to the PowerVM driver</a></h2>
+    <h2><a name="uri">Connections to the PowerVM driver</a></h2>
     <p>
         Some example remote connection URIs for the driver are:
     </p>
@@ -38,7 +38,7 @@ phyp://user@ivm/system (IVM connection)
     </p>
 
 
-    <h3><a id="uriformat">URI Format</a></h3>
+    <h3><a name="uriformat">URI Format</a></h3>
     <p>
         URIs have this general form (<code>[...]</code> marks an
         optional part, <code>{...|...}</code> marks a mandatory choice).

docs/drvqemu.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>KVM/QEMU hypervisor driver</h1>
@@ -11,7 +11,7 @@
       version 0.12.0 or later.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -23,7 +23,7 @@
       </li>
     </ul>
 
-    <h2><a id="prereq">Deployment pre-requisites</a></h2>
+    <h2><a name="prereq">Deployment pre-requisites</a></h2>
 
     <ul>
       <li>
@@ -43,7 +43,7 @@
       </li>
     </ul>
 
-    <h2><a id="uris">Connections to QEMU driver</a></h2>
+    <h2><a name="uris">Connections to QEMU driver</a></h2>
 
     <p>
     The libvirt QEMU driver is a multi-instance driver, providing a single
@@ -63,14 +63,14 @@ qemu+tcp://example.com/system        (remote access, SASl/Kerberos)
 qemu+ssh://root@example.com/system   (remote access, SSH tunnelled)
 </pre>
 
-    <h2><a id="security">Driver security architecture</a></h2>
+    <h2><a name="security">Driver security architecture</a></h2>
 
     <p>
       There are multiple layers to security in the QEMU driver, allowing for
       flexibility in the use of QEMU based virtual machines.
     </p>
 
-    <h3><a id="securitydriver">Driver instances</a></h3>
+    <h3><a name="securitydriver">Driver instances</a></h3>
 
     <p>
       As explained above there are two ways to access the QEMU driver
@@ -94,7 +94,7 @@ qemu+ssh://root@example.com/system   (remote access, SSH tunnelled)
       elevated privileges.
     </p>
 
-    <h3><a id="securitydac">POSIX users/groups</a></h3>
+    <h3><a name="securitydac">POSIX users/groups</a></h3>
 
     <p>
       In the "session" instance, the POSIX users/groups model restricts QEMU
@@ -187,7 +187,7 @@ chmod o+x /path/to/directory
       </li>
     </ul>
 
-    <h3><a id="securitycap">Linux process capabilities</a></h3>
+    <h3><a name="securitycap">Linux process capabilities</a></h3>
 
     <p>
       The libvirt QEMU driver has a build time option allowing it to use
@@ -224,7 +224,7 @@ chmod o+x /path/to/directory
       to changing the <code>/etc/libvirt/qemu.conf</code> settings.
     </p>
 
-    <h3><a id="securityselinux">SELinux basic confinement</a></h3>
+    <h3><a name="securityselinux">SELinux basic confinement</a></h3>
 
     <p>
       The basic SELinux protection for QEMU virtual machines is intended to
@@ -255,7 +255,7 @@ chmod o+x /path/to/directory
       SELinux boolean.
     </p>
 
-    <h3><a id="securitysvirt">SELinux sVirt confinement</a></h3>
+    <h3><a name="securitysvirt">SELinux sVirt confinement</a></h3>
 
     <p>
       The SELinux sVirt protection for QEMU virtual machines builds to the
@@ -305,7 +305,7 @@ chmod o+x /path/to/directory
       file can be used to change the setting to <code>security_driver="none"</code>
     </p>
 
-    <h3><a id="securitysvirtaa">AppArmor sVirt confinement</a></h3>
+    <h3><a name="securitysvirtaa">AppArmor sVirt confinement</a></h3>
 
     <p>
       When using basic AppArmor protection for the libvirtd daemon and
@@ -373,7 +373,7 @@ chmod o+x /path/to/directory
     </p>
 
 
-    <h3><a id="securityacl">Cgroups device ACLs</a></h3>
+    <h3><a name="securityacl">Cgroups device ACLs</a></h3>
 
     <p>
       Recent Linux kernels have a capability known as "cgroups" which is used
@@ -416,7 +416,7 @@ mount -t cgroup none /dev/cgroup -o devices
       <code>/dev/cgroup/libvirt/qemu/$VMNAME/</code>
     </p>
 
-    <h2><a id="imex">Import and export of libvirt domain XML configs</a></h2>
+    <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2>
 
     <p>The QEMU driver currently supports a single native
       config format known as <code>qemu-argv</code>. The data for this format
@@ -424,7 +424,7 @@ mount -t cgroup none /dev/cgroup -o devices
       then the QEMu binary name, finally followed by the QEMU command line
       arguments</p>
 
-    <h3><a id="xmlimport">Converting from QEMU args to domain XML</a></h3>
+    <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3>
 
     <p>
       The <code>virsh domxml-from-native</code> provides a way to
@@ -473,7 +473,7 @@ $ virsh domxml-from-native qemu-argv demo.args
 
     <p>NB, don't include the literal \ in the args, put everything on one line</p>
 
-    <h3><a id="xmlexport">Converting from domain XML to QEMU args</a></h3>
+    <h3><a name="xmlexport">Converting from domain XML to QEMU args</a></h3>
 
     <p>
       The <code>virsh domxml-to-native</code> provides a way to convert a
@@ -515,7 +515,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
   -serial none -parallel none -usb
 </pre>
 
-    <h2><a id="qemucommand">Pass-through of arbitrary qemu
+    <h2><a name="qemucommand">Pass-through of arbitrary qemu
     commands</a></h2>
 
     <p>Libvirt provides an XML namespace and an optional
@@ -582,7 +582,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
 &lt;/domain&gt;
 </pre>
 
-    <h2><a id="xmlconfig">Example domain XML config</a></h2>
+    <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
     <h3>QEMU emulated guest on x86_64</h3>
 

docs/drvremote.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Remote management driver</h1>

docs/drvtest.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Test "mock" driver</h1>

docs/drvuml.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>User Mode Linux driver</h1>
@@ -13,7 +13,7 @@
     has pre-created TAP devices.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>

docs/drvvbox.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <body>
         <h1>VirtualBox hypervisor driver</h1>
@@ -8,7 +8,7 @@
         from version 2.2 onwards.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -43,7 +43,7 @@ vbox+ssh://user@example.com/session  (remote access, SSH tunnelled)
         work is completed to get the libvirtd daemon working there.</strong>
     </p>
 
-    <h2><a id="xmlconfig">Example domain XML config</a></h2>
+    <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
 <pre>
 &lt;domain type='vbox'&gt;

docs/drvvirtuozzo.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Virtuozzo driver</h1>
@@ -9,7 +9,7 @@
     </p>
 
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
     <ul>
       <li>
         The <a href="http://www.odin.com/products/virtuozzo/">Virtuozzo</a> Solution.
@@ -17,7 +17,7 @@
     </ul>
 
 
-    <h2><a id="uri">Connections to the Virtuozzo driver</a></h2>
+    <h2><a name="uri">Connections to the Virtuozzo driver</a></h2>
     <p>
         The libvirt Virtuozzo driver is a single-instance privileged driver, with a driver name of 'virtuozzo'. Some example connection URIs for the libvirt driver are:
     </p>
@@ -29,7 +29,7 @@ vz+tcp://example.com/system      (remote access, SASl/Kerberos)
 vz+ssh://root@example.com/system (remote access, SSH tunnelled)
 </pre>
 
-    <h2><a id="example">Example guest domain XML configuration</a></h2>
+    <h2><a name="example">Example guest domain XML configuration</a></h2>
 
     <p>
     Virtuozzo driver require at least one hard disk for new domains

docs/drvvmware.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <body>
         <h1>VMware Workstation / Player / Fusion hypervisors driver</h1>
@@ -15,7 +15,7 @@
     from <a href="http://www.vmware.com/support/developer/vix-api/">here</a>.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -51,7 +51,7 @@ vmwarews+tcp://user@example.com/session  (remote access to VMware Workstation, S
 vmwarews+ssh://user@example.com/session  (remote access to VMware Workstation, SSH tunnelled)
 </pre>
 
-    <h2><a id="xmlconfig">Example domain XML config</a></h2>
+    <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
 <pre>
 &lt;domain type='vmware'&gt;

docs/drvxen.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Xen hypervisor driver</h1>
@@ -11,7 +11,7 @@
       on any Xen release from 3.0.1 onwards.
     </p>
 
-    <h2><a id="project">Project Links</a></h2>
+    <h2><a name="project">Project Links</a></h2>
 
     <ul>
       <li>
@@ -20,7 +20,7 @@
       </li>
     </ul>
 
-    <h2><a id="prereq">Deployment pre-requisites</a></h2>
+    <h2><a name="prereq">Deployment pre-requisites</a></h2>
 
     <p>
       The libvirt Xen driver uses a combination of channels to manage Xen
@@ -65,7 +65,7 @@
       </li>
     </ul>
 
-    <h2><a id="uri">Connections to Xen driver</a></h2>
+    <h2><a name="uri">Connections to Xen driver</a></h2>
 
     <p>
     The libvirt Xen driver is a single-instance privileged driver,
@@ -81,7 +81,7 @@ xen+tcp://example.com/         (remote access, SASl/Kerberos)
 xen+ssh://root@example.com/    (remote access, SSH tunnelled)
 </pre>
 
-    <h2><a id="imex">Import and export of libvirt domain XML configs</a></h2>
+    <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2>
 
     <p>The Xen driver currently supports two native
       config formats. The first known as <code>xen-xm</code> is the format
@@ -89,7 +89,7 @@ xen+ssh://root@example.com/    (remote access, SSH tunnelled)
       known as <code>xen-sxpr</code>, is the format used for interacting
       with the XenD's legacy HTTP RPC service.</p>
 
-    <h3><a id="xmlimport">Converting from XM config files to domain XML</a></h3>
+    <h3><a name="xmlimport">Converting from XM config files to domain XML</a></h3>
 
     <p>
       The <code>virsh domxml-from-native</code> provides a way to convert an
@@ -135,7 +135,7 @@ xen+ssh://root@example.com/    (remote access, SSH tunnelled)
   &lt;/devices&gt;
 &lt;/domain&gt;</pre>
 
-    <h3><a id="xmlexport">Converting from domain XML to XM config files</a></h3>
+    <h3><a name="xmlexport">Converting from domain XML to XM config files</a></h3>
 
     <p>
       The <code>virsh domxml-to-native</code> provides a way to convert a
@@ -163,7 +163,7 @@ vnclisten = "0.0.0.0"
 disk = [ "tap:aio:/var/lib/xen/images/rhel5pv.img,xvda,w", "tap:qcow:/root/qcow1-xen.img,xvdd,w" ]
 vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]</pre>
 
-    <h2><a id="xmlconfig">Example domain XML config</a></h2>
+    <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
     <p>
       Below are some example XML configurations for Xen guest domains.

docs/errors.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1 >Handling of errors</h1>

docs/firewall.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1 >Firewall and network filtering in libvirt</h1>
@@ -35,7 +35,8 @@
       </li>
     </ul>
 
-    <h3><a id="fw-virtual-network-driver">The virtual network driver</a>
+    <h3><a name="name-fw-virtual-network-driver"
+           id="id-fw-virtual-network-driver">The virtual network driver</a>
     </h3>
     <p>The typical configuration for guests is to use bridging of the
        physical NIC on the host to connect the guest directly to the LAN.
@@ -129,7 +130,8 @@ MASQUERADE all  --  *      *       192.168.122.0/24    !192.168.122.0/24</pre>
       </li>
     </ul>
 
-    <h3><a id="fw-network-filter-driver">The network filter driver</a>
+    <h3><a name="name-fw-network-filter-driver"
+           id="id-fw-network-filter-driver">The network filter driver</a>
     </h3>
     <p>This driver provides a fully configurable network filtering capability
        that leverages ebtables, iptables and ip6tables. This was written by

docs/format.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>XML Format</h1>
@@ -14,16 +14,16 @@
 
 
     <ul>
-      <li><a href="formatdomain.html">Domains</a></li>
-      <li><a href="formatnetwork.html">Networks</a></li>
-      <li><a href="formatnwfilter.html">Network filtering</a></li>
-      <li><a href="formatstorage.html">Storage</a></li>
-      <li><a href="formatstorageencryption.html">Storage encryption</a></li>
-      <li><a href="formatcaps.html">Capabilities</a></li>
-      <li><a href="formatdomaincaps.html">Domain capabilities</a></li>
-      <li><a href="formatnode.html">Node devices</a></li>
-      <li><a href="formatsecret.html">Secrets</a></li>
-      <li><a href="formatsnapshot.html">Snapshots</a></li>
+      <li><a href="formatdomain.html" shape="rect">Domains</a></li>
+      <li><a href="formatnetwork.html" shape="rect">Networks</a></li>
+      <li><a href="formatnwfilter.html" shape="rect">Network filtering</a></li>
+      <li><a href="formatstorage.html" shape="rect">Storage</a></li>
+      <li><a href="formatstorageencryption.html" shape="rect">Storage encryption</a></li>
+      <li><a href="formatcaps.html" shape="rect">Capabilities</a></li>
+      <li><a href="formatdomaincaps.html" shape="rect">Domain capabilities</a></li>
+      <li><a href="formatnode.html" shape="rect">Node devices</a></li>
+      <li><a href="formatsecret.html" shape="rect">Secrets</a></li>
+      <li><a href="formatsnapshot.html" shape="rect">Snapshots</a></li>
     </ul>
 
     <h2>Command line validation</h2>

docs/formatcaps.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Driver capabilities XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="elements">Element and attribute overview</a></h2>
+    <h2><a name="elements">Element and attribute overview</a></h2>
 
     <p>As new virtualization engine support gets added to libvirt, and to
     handle cases like QEMU supporting a variety of emulations, a query
@@ -21,14 +21,14 @@
     command line tool command '<code>capabilities</code>', it dumps the XML
     associated to the current connection. </p>
 
-    <p>As can be seen in the <a href="#elementExamples">example</a>, the
+    <p>As can be seen seen in the <a href="#elementExamples">example</a>, the
     capabilities XML consists of the <code>capabilities</code> element which
     have exactly one <code>host</code> child element to report information on
     host capabilities, and zero or more <code>guest</code> element to express
     the set of architectures the host can run at the moment.</p>
 
 
-    <h3><a id="elementHost">Host capabilities</a></h3>
+    <h3><a name="elementHost">Host capabilities</a></h3>
 
     <p>The <code>&lt;host/&gt;</code> element consists of the following child
     elements:</p>
@@ -61,7 +61,7 @@
     </dl>
 
 
-    <h3><a id="elementGuest">Guest capabilities</a></h3>
+    <h3><a name="elementGuest">Guest capabilities</a></h3>
 
     <p>While the <a href="#elementHost">previous section</a> aims at host
     capabilities, this one focuses on capabilities available to a guest
@@ -138,7 +138,7 @@
         </dd>
     </dl>
 
-    <h3><a id="elementExamples">Examples</a></h3>
+    <h3><a name="elementExamples">Examples</a></h3>
 
     <p>For example, in the case of a 64-bit machine with hardware
     virtualization capabilities enabled in the chip and

docs/formatdomaincaps.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Domain capabilities XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="Overview">Overview</a></h2>
+    <h2><a name="Overview">Overview</a></h2>
 
     <p>Sometimes, when a new domain is to be created it may come handy to know
     the capabilities of the hypervisor so the correct combination of devices and
@@ -37,7 +37,7 @@
     management application to choose an appropriate mode for a pass-through
     host device as well as which adapter to utilize.</p>
 
-    <h2><a id="elements">Element and attribute overview</a></h2>
+    <h2><a name="elements">Element and attribute overview</a></h2>
 
     <p> A new query interface was added to the virConnect API's to retrieve the
     XML listing of the set of domain capabilities (<span class="since">Since
@@ -79,7 +79,7 @@
 
     </dl>
 
-    <h3><a id="elementsCPUAllocation">CPU Allocation</a></h3>
+    <h3><a name="elementsCPUAllocation">CPU Allocation</a></h3>
 
     <p>Before any devices capability occurs, there might be a info on domain
     wide capabilities, e.g. virtual CPUs:</p>
@@ -97,7 +97,7 @@
       <dd>The maximum number of supported virtual CPUs</dd>
     </dl>
 
-    <h3><a id="elementsOSBIOS">BIOS bootloader</a></h3>
+    <h3><a name="elementsOSBIOS">BIOS bootloader</a></h3>
 
     <p>Sometimes users might want to tweak some BIOS knobs or use
     UEFI. For cases like that, <a
@@ -143,7 +143,7 @@
       &lt;loader/&gt; element.</dd>
     </dl>
 
-    <h3><a id="elementsCPU">CPU configuration</a></h3>
+    <h3><a name="elementsCPU">CPU configuration</a></h3>
 
     <p>
       The <code>cpu</code> element exposes options usable for configuring
@@ -208,7 +208,7 @@
       </dd>
     </dl>
 
-    <h3><a id="elementsDevices">Devices</a></h3>
+    <h3><a name="elementsDevices">Devices</a></h3>
 
     <p>
       Another set of XML elements describe the supported devices and their
@@ -240,7 +240,7 @@
     support the values <code>disk</code>, <code>cdrom</code>,
     <code>floppy</code>, or <code>lun</code>.</p>
 
-    <h4><a id="elementsDisks">Hard drives, floppy disks, CDROMs</a></h4>
+    <h4><a name="elementsDisks">Hard drives, floppy disks, CDROMs</a></h4>
     <p>Disk capabilities are exposed under the <code>disk</code> element. For
     instance:</p>
 
@@ -283,7 +283,7 @@
     </dl>
 
 
-    <h4><a id="elementsGraphics">Graphical framebuffers</a></h4>
+    <h4><a name="elementsGraphics">Graphical framebuffers</a></h4>
     <p>Graphics device capabilities are exposed under the
     <code>graphics</code> element. For instance:</p>
 
@@ -310,7 +310,7 @@
     </dl>
 
 
-    <h4><a id="elementsVideo">Video device</a></h4>
+    <h4><a name="elementsVideo">Video device</a></h4>
     <p>Video device capabilities are exposed under the
     <code>video</code> element. For instance:</p>
 
@@ -339,7 +339,7 @@
     </dl>
 
 
-    <h4><a id="elementsHostDev">Host device assignment</a></h4>
+    <h4><a name="elementsHostDev">Host device assignment</a></h4>
     <p>Some host devices can be passed through to a guest (e.g. USB, PCI and
     SCSI). Well, only if the following is enabled:</p>
 
@@ -401,7 +401,7 @@
       element.</dd>
     </dl>
 
-    <h3><a id="elementsFeatures">Features</a></h3>
+    <h3><a name="elementsFeatures">Features</a></h3>
 
     <p>One more set of XML elements describe the supported features and
     their capabilities. All features occur as children of the main
@@ -431,7 +431,7 @@
     the domain XML documentation.
     </p>
 
-    <h4><a id="elementsGIC">GIC capabilities</a></h4>
+    <h4><a name="elementsGIC">GIC capabilities</a></h4>
 
     <p>GIC capabilities are exposed under the <code>gic</code> element.</p>
 

docs/formatnetwork.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Network XML format</h1>
@@ -8,12 +8,12 @@
     </ul>
 
     <p>
-      This page provides an introduction to the network XML format. For
-      background information on the concepts referred to here, consult the
-      <a href="https://wiki.libvirt.org/page/Networking">relevant wiki page</a>.
+      This page provides an introduction to the network XML format. For background
+      information on the concepts referred to here, consult the <a href="archnetwork.html">network driver architecture</a>
+      page.
     </p>
 
-    <h2><a id="elements">Element and attribute overview</a></h2>
+    <h2><a name="elements">Element and attribute overview</a></h2>
 
     <p>
       The root element required for all virtual networks is
@@ -27,7 +27,7 @@
       available <span class="since">since 0.3.0</span>
     </p>
 
-    <h3><a id="elementsMetadata">General metadata</a></h3>
+    <h3><a name="elementsMetadata">General metadata</a></h3>
 
     <p>
       The first elements provide basic metadata about the virtual
@@ -83,7 +83,7 @@
         override the setting in the network.</dd>
     </dl>
 
-    <h3><a id="elementsConnect">Connectivity</a></h3>
+    <h3><a name="elementsConnect">Connectivity</a></h3>
 
     <p>
       The next set of elements control how a virtual network is
@@ -514,7 +514,7 @@
 
       </dd>
     </dl>
-    <h5><a id="elementQoS">Quality of service</a></h5>
+    <h5><a name="elementQoS">Quality of service</a></h5>
 
 <pre>
 ...
@@ -634,7 +634,7 @@
         <span class="since">since 1.0.1</span>.
       </p>
 
-    <h5><a id="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5>
+    <h5><a name="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5>
 
 <pre>
 &lt;network&gt;
@@ -712,7 +712,7 @@
       or <code>&lt;interface&gt;</code>.
     </p>
 
-    <h5><a id="elementsPortgroup">Portgroups</a></h5>
+    <h5><a name="elementsPortgroup">Portgroups</a></h5>
 
 <pre>
 ...
@@ -790,7 +790,7 @@
       setting in the portgroup.
     </p>
 
-    <h5><a id="elementsStaticroute">Static Routes</a></h5>
+    <h5><a name="elementsStaticroute">Static Routes</a></h5>
     <p>
       Static route definitions are used to provide routing information
       to the virtualization host for networks which are not directly
@@ -845,7 +845,7 @@
 ...
     </pre>
 
-    <h3><a id="elementsAddress">Addressing</a></h3>
+    <h3><a name="elementsAddress">Addressing</a></h3>
 
     <p>
       The final set of elements define the addresses (IPv4 and/or
@@ -997,7 +997,7 @@
         <code>prefix</code> attribute, which is an integer (for example,
         <code>netmask='255.255.255.0'</code> could also be given as
         <code>prefix='24'</code>). The <code>family</code> attribute is used
-        to specify the type of address - <code>ipv4</code> or
+        to specify the type of address &mdash; <code>ipv4</code> or
         <code>ipv6</code>; if no <code>family</code> is given,
         <code>ipv4</code> is assumed. More than one address of each family can
         be defined for a network. The optional <code>localPtr</code> attribute
@@ -1079,9 +1079,9 @@
       </dd>
     </dl>
 
-    <h2><a id="examples">Example configuration</a></h2>
+    <h2><a name="examples">Example configuration</a></h2>
 
-    <h3><a id="examplesNAT">NAT based network</a></h3>
+    <h3><a name="examplesNAT">NAT based network</a></h3>
 
     <p>
       This example is the so called "default" virtual network. It is
@@ -1129,7 +1129,7 @@
   &lt;/ip&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesRoute">Routed network config</a></h3>
+    <h3><a name="examplesRoute">Routed network config</a></h3>
 
     <p>
       This is a variant on the default network which routes traffic
@@ -1211,7 +1211,7 @@
   &lt;route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4"/&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesPrivate">Isolated network config</a></h3>
+    <h3><a name="examplesPrivate">Isolated network config</a></h3>
 
     <p>
       This variant provides a completely isolated private network
@@ -1233,7 +1233,7 @@
   &lt;ip family="ipv6" address="2001:db8:ca2:3::1" prefix="64"/&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesPrivate6">Isolated IPv6 network config</a></h3>
+    <h3><a name="examplesPrivate6">Isolated IPv6 network config</a></h3>
 
     <p>
       This variation of an isolated network defines only IPv6.
@@ -1259,7 +1259,7 @@
   &lt;/ip&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesBridge">Using an existing host bridge</a></h3>
+    <h3><a name="examplesBridge">Using an existing host bridge</a></h3>
 
     <p>
       <span class="since">Since 0.9.4</span>
@@ -1277,7 +1277,7 @@
   &lt;bridge name="br0"/&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesDirect">Using a macvtap "direct" connection</a></h3>
+    <h3><a name="examplesDirect">Using a macvtap "direct" connection</a></h3>
 
     <p>
       <span class="since">Since 0.9.4, QEMU and KVM only, requires
@@ -1312,7 +1312,7 @@
   &lt;/forward&gt;
 &lt;/network&gt;</pre>
 
-    <h3><a id="examplesNoGateway">Network config with no gateway addresses</a></h3>
+    <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3>
 
     <p>
     A valid network definition can contain no IPv4 or IPv6 addresses.  Such a definition

docs/formatnode.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Node devices XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="NodedevAttributes">Node Device XML</a></h2>
+    <h2><a name="NodedevAttributes">Node Device XML</a></h2>
 
     <p>
       There are several libvirt functions, all with the
@@ -227,7 +227,6 @@
                     <dt><code>rxhash</code></dt><dd>receive-hashing</dd>
                     <dt><code>rdma</code></dt><dd>remote-direct-memory-access</dd>
                     <dt><code>txudptnl</code></dt><dd>tx-udp-tunnel-segmentation</dd>
-                    <dt><code>switchdev</code></dt><dd>kernel-forward-plane-offload</dd>
                 </dl>
               </dd>
               <dt><code>capability</code></dt>
@@ -325,23 +324,11 @@
               <code>render</code>.</dd>
             </dl>
           </dd>
-          <dt><code>ccw</code></dt>
-          <dd>Describes a Command Channel Word (CCW) device commonly found on
-          the S390 architecture. Sub-elements include:
-            <dl>
-              <dt><code>cssid</code></dt>
-              <dd>The channel subsystem identifier.</dd>
-              <dt><code>ssid</code></dt>
-              <dd>The subchannel-set identifier.</dd>
-              <dt><code>devno</code></dt>
-              <dd>The device number.</dd>
-            </dl>
-          </dd>
         </dl>
       </dd>
     </dl>
 
-    <h2><a id="nodeExample">Examples</a></h2>
+    <h2><a name="nodeExample">Examples</a></h2>
 
     <p>The following are some example node device XML outputs:</p>
     <pre>

docs/formatnwfilter.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Network Filters</h1>
@@ -12,7 +12,7 @@
       their goals, concepts and XML format.
     </p>
 
-    <h2><a id="goals">Goals and background</a></h2>
+    <h2><a name="goals">Goals and background</a></h2>
 
     <p>
       The goal of the network filtering XML is to enable administrators
@@ -43,7 +43,7 @@
       (QEMU, KVM)</span>
     </p>
 
-    <h2><a id="nwfconcepts">Concepts</a></h2>
+    <h2><a name="nwfconcepts">Concepts</a></h2>
     <p>
       The network traffic filtering subsystem enables configuration
       of network traffic filtering rules on individual network
@@ -111,7 +111,7 @@
       <br/><br/>
     </p>
 
-    <h3><a id="nwfconceptschains">Filtering chains</a></h3>
+    <h3><a name="nwfconceptschains">Filtering chains</a></h3>
     <p>
       Filtering rules are organized in filter chains. These chains can be
       thought of as having a tree structure with packet
@@ -192,7 +192,7 @@
       traverse the ARP chain.
       <br/><br/>
     </p>
-    <h3><a id="nwfconceptschainpriorities">Filtering chain priorities</a></h3>
+    <h3><a name="nwfconceptschainpriorities">Filtering chain priorities</a></h3>
     <p>
       All chains are connected to the <code>root</code> chain. The order in
       which those chains are accessed is influenced by the priority of the
@@ -236,7 +236,7 @@
       node. The above example filter shows the default priority of -500
       for <code>arp</code> chains.
     </p>
-    <h3><a id="nwfconceptsvars">Usage of variables in filters</a></h3>
+    <h3><a name="nwfconceptsvars">Usage of variables in filters</a></h3>
     <p>
 
       Two variables names have so far been reserved for usage by the
@@ -374,7 +374,7 @@ DSTPORTS = [ 80, 8080 ]
       former notation always assumes the iterator with Id '0'.
     </p>
 
-    <h3><a id="nwfelemsRulesAdvIPAddrDetection">Automatic IP address detection</a></h3>
+    <h3><a name="nwfelemsRulesAdvIPAddrDetection">Automatic IP address detection</a></h3>
     <p>
        The detection of IP addresses used on a virtual machine's interface
        is automatically activated if the variable <code>IP</code> is referenced
@@ -448,7 +448,7 @@ DSTPORTS = [ 80, 8080 ]
 &lt;/interface&gt;
 </pre>
 
-    <h3><a id="nwfelemsReservedVars">Reserved Variables</a></h3>
+    <h3><a name="nwfelemsReservedVars">Reserved Variables</a></h3>
     <p>
       The following table lists reserved variables in use by libvirt.
     </p>
@@ -485,7 +485,7 @@ DSTPORTS = [ 80, 8080 ]
        </tr>
       </table>
 
-    <h2><a id="nwfelems">Element and attribute overview</a></h2>
+    <h2><a name="nwfelems">Element and attribute overview</a></h2>
 
     <p>
       The root element required for all network filters is
@@ -498,7 +498,7 @@ DSTPORTS = [ 80, 8080 ]
       ipv4, ipv6, arp and rarp</code>.
     </p>
 
-    <h3><a id="nwfelemsRefs">References to other filters</a></h3>
+    <h3><a name="nwfelemsRefs">References to other filters</a></h3>
     <p>
      Any filter may hold references to other filters. Individual
      filters may be referenced multiple times in a filter tree but
@@ -536,7 +536,7 @@ DSTPORTS = [ 80, 8080 ]
     attached.
     </p>
 
-    <h3><a id="nwfelemsRules">Filter rules</a></h3>
+    <h3><a name="nwfelemsRules">Filter rules</a></h3>
     <p>
     The following XML shows a simple example of a network
     traffic filter implementing a rule to drop traffic if
@@ -618,7 +618,7 @@ DSTPORTS = [ 80, 8080 ]
      filtered.
     </p>
 
-    <h4><a id="nwfelemsRulesProto">Supported protocols</a></h4>
+    <h4><a name="nwfelemsRulesProto">Supported protocols</a></h4>
     <p>
      The following sections enumerate the list of protocols that
      are supported by the network filtering subsystem. The
@@ -677,7 +677,7 @@ DSTPORTS = [ 80, 8080 ]
     </p>
 
 
-    <h5><a id="nwfelemsRulesProtoMAC">MAC (Ethernet)</a></h5>
+    <h5><a name="nwfelemsRulesProtoMAC">MAC (Ethernet)</a></h5>
     <p>
       Protocol ID: <code>mac</code>
       <br/>
@@ -729,7 +729,7 @@ DSTPORTS = [ 80, 8080 ]
 [...]
 </pre>
 
-    <h5><a id="nwfelemsRulesProtoVLAN">VLAN (802.1Q)</a>
+    <h5><a name="nwfelemsRulesProtoVLAN">VLAN (802.1Q)</a>
       <span class="since">(Since 0.9.8)</span>
     </h5>
     <p>
@@ -784,7 +784,7 @@ DSTPORTS = [ 80, 8080 ]
       Valid Strings for <code>encap-protocol</code> are: arp, ipv4, ipv6
     </p>
 
-    <h5><a id="nwfelemsRulesProtoSTP">STP (Spanning Tree Protocol)</a>
+    <h5><a name="nwfelemsRulesProtoSTP">STP (Spanning Tree Protocol)</a>
       <span class="since">(Since 0.9.8)</span>
     </h5>
     <p>
@@ -926,7 +926,7 @@ DSTPORTS = [ 80, 8080 ]
        </tr>
       </table>
 
-    <h5><a id="nwfelemsRulesProtoARP">ARP/RARP</a></h5>
+    <h5><a name="nwfelemsRulesProtoARP">ARP/RARP</a></h5>
     <p>
       Protocol ID: <code>arp</code> or <code>rarp</code>
       <br/>
@@ -1022,7 +1022,7 @@ DSTPORTS = [ 80, 8080 ]
       <br/><br/>
     </p>
 
-    <h5><a id="nwfelemsRulesProtoIP">IPv4</a></h5>
+    <h5><a name="nwfelemsRulesProtoIP">IPv4</a></h5>
     <p>
       Protocol ID: <code>ip</code>
       <br/>
@@ -1118,7 +1118,7 @@ DSTPORTS = [ 80, 8080 ]
     </p>
 
 
-    <h5><a id="nwfelemsRulesProtoIPv6">IPv6</a></h5>
+    <h5><a name="nwfelemsRulesProtoIPv6">IPv6</a></h5>
     <p>
       Protocol ID: <code>ipv6</code>
       <br/>
@@ -1228,7 +1228,7 @@ DSTPORTS = [ 80, 8080 ]
       <br/><br/>
     </p>
 
-    <h5><a id="nwfelemsRulesProtoTCP-ipv4">TCP/UDP/SCTP</a></h5>
+    <h5><a name="nwfelemsRulesProtoTCP-ipv4">TCP/UDP/SCTP</a></h5>
     <p>
       Protocol ID: <code>tcp</code>, <code>udp</code>, <code>sctp</code>
       <br/>
@@ -1344,7 +1344,7 @@ DSTPORTS = [ 80, 8080 ]
     </p>
 
 
-    <h5><a id="nwfelemsRulesProtoICMP">ICMP</a></h5>
+    <h5><a name="nwfelemsRulesProtoICMP">ICMP</a></h5>
     <p>
       Protocol ID: <code>icmp</code>
       <br/>
@@ -1458,7 +1458,7 @@ DSTPORTS = [ 80, 8080 ]
       <br/><br/>
     </p>
 
-    <h5><a id="nwfelemsRulesProtoMisc">IGMP, ESP, AH, UDPLITE, 'ALL'</a></h5>
+    <h5><a name="nwfelemsRulesProtoMisc">IGMP, ESP, AH, UDPLITE, 'ALL'</a></h5>
     <p>
       Protocol ID: <code>igmp</code>, <code>esp</code>, <code>ah</code>, <code>udplite</code>, <code>all</code>
       <br/>
@@ -1563,7 +1563,7 @@ DSTPORTS = [ 80, 8080 ]
     </p>
 
 
-    <h5><a id="nwfelemsRulesProtoTCP-ipv6">TCP/UDP/SCTP over IPV6</a></h5>
+    <h5><a name="nwfelemsRulesProtoTCP-ipv6">TCP/UDP/SCTP over IPV6</a></h5>
     <p>
       Protocol ID: <code>tcp-ipv6</code>, <code>udp-ipv6</code>, <code>sctp-ipv6</code>
       <br/>
@@ -1679,7 +1679,7 @@ DSTPORTS = [ 80, 8080 ]
     </p>
 
 
-    <h5><a id="nwfelemsRulesProtoICMPv6">ICMPv6</a></h5>
+    <h5><a name="nwfelemsRulesProtoICMPv6">ICMPv6</a></h5>
     <p>
       Protocol ID: <code>icmpv6</code>
       <br/>
@@ -1779,7 +1779,7 @@ DSTPORTS = [ 80, 8080 ]
       <br/><br/>
     </p>
 
-    <h5><a id="nwfelemsRulesProtoMiscv6">ESP, AH, UDPLITE, 'ALL' over IPv6</a></h5>
+    <h5><a name="nwfelemsRulesProtoMiscv6">ESP, AH, UDPLITE, 'ALL' over IPv6</a></h5>
     <p>
       Protocol ID: <code>esp-ipv6</code>, <code>ah-ipv6</code>, <code>udplite-ipv6</code>, <code>all-ipv6</code>
       <br/>
@@ -1868,13 +1868,13 @@ DSTPORTS = [ 80, 8080 ]
       <br/><br/>
     </p>
 
-    <h3><a id="nwfelemsRulesAdv">Advanced Filter Configuration Topics</a></h3>
+    <h3><a name="nwfelemsRulesAdv">Advanced Filter Configuration Topics</a></h3>
     <p>
      The following sections discuss advanced filter configuration
      topics.
     </p>
 
-    <h4><a id="nwfelemsRulesAdvTracking">Connection tracking</a></h4>
+    <h4><a name="nwfelemsRulesAdvTracking">Connection tracking</a></h4>
     <p>
      The network filtering subsystem (on Linux) makes use of the connection
      tracking support of iptables. This helps in enforcing the
@@ -1908,7 +1908,7 @@ DSTPORTS = [ 80, 8080 ]
      which may or may not be desirable.
     </p>
 
-    <h4><a id="nwfelemsRulesAdvLimiting">Limiting Number of Connections</a></h4>
+    <h4><a name="nwfelemsRulesAdvLimiting">Limiting Number of Connections</a></h4>
     <p>
      To limit the number of connections a VM may establish, a rule must
      be provided that sets a limit of connections for a given
@@ -1981,7 +1981,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
       traffic behavior in relation to idle connections.
     </p>
 
-    <h2><a id="nwfcli">Command line tools</a></h2>
+    <h2><a name="nwfcli">Command line tools</a></h2>
     <p>
       The libvirt command line tool <code>virsh</code> has been extended
       with life-cycle support for network filters. All commands related
@@ -1996,7 +1996,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
      <li>nwfilter-edit : edit a network filter given its name</li>
     </ul>
 
-    <h2><a id="nwfexamples">Pre-existing network filters</a></h2>
+    <h2><a name="nwfexamples">Pre-existing network filters</a></h2>
     <p>
      The following is a list of example network filters that are
      automatically installed with libvirt.</p>
@@ -2051,7 +2051,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
      on top of the prevention of packet spoofing.
     </p>
 
-    <h2><a id="nwfwrite">Writing your own filters</a></h2>
+    <h2><a name="nwfwrite">Writing your own filters</a></h2>
 
     <p>
      Since libvirt only provides a couple of example networking filters, you
@@ -2124,7 +2124,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
     <code>udp-ipv6</code> traffic filtering node.
     </p>
 
-    <h3><a id="nwfwriteexample">Example custom filter</a></h3>
+    <h3><a name="nwfwriteexample">Example custom filter</a></h3>
     <p>
      As an example we want to now build a filter that fulfills the following
      list of requirements:
@@ -2227,7 +2227,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
 &lt;/rule&gt;
 </pre>
 
-    <h3><a id="nwfwriteexample2nd">Second example custom filter</a></h3>
+    <h3><a name="nwfwriteexample2nd">Second example custom filter</a></h3>
     <p>
      In this example we now want to build a similar filter as in the
      example above, but extend the list of requirements with an
@@ -2400,13 +2400,13 @@ modprobe ip_conntrack_ftp   # if above is not available
 
 </pre>
 
-    <h2><a id="nwflimits">Limitations</a></h2>
+    <h2><a name="nwflimits">Limitations</a></h2>
     <p>
      The following sections list (current) limitations of the network
      filtering subsystem.
     </p>
 
-    <h3><a id="nwflimitsmigr">VM Migration</a></h3>
+    <h3><a name="nwflimitsmigr">VM Migration</a></h3>
      <p>
       VM migration is only supported if the whole filter tree
       that is referenced by a virtual machine's top level filter
@@ -2424,7 +2424,7 @@ modprobe ip_conntrack_ftp   # if above is not available
       0.8.1 or later in order not to lose the network traffic filters
       associated with an interface.
      </p>
-    <h3><a id="nwflimitsvlan">VLAN filtering on Linux</a></h3>
+    <h3><a name="nwflimitsvlan">VLAN filtering on Linux</a></h3>
      <p>
       VLAN (802.1Q) packets, if sent by a virtual machine, cannot be filtered
       with rules for protocol IDs <code>arp</code>, <code>rarp</code>,

docs/formatsecret.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Secret XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="SecretAttributes">Secret XML</a></h2>
+    <h2><a name="SecretAttributes">Secret XML</a></h2>
 
     <p>
       Secrets stored by libvirt may have attributes associated with them, using
@@ -47,7 +47,7 @@
       </dd>
     </dl>
 
-    <h3><a id="VolumeUsageType">Usage type "volume"</a></h3>
+    <h3><a name="VolumeUsageType">Usage type "volume"</a></h3>
 
     <p>
       This secret is associated with a volume, whether the format is either
@@ -120,7 +120,7 @@ Secret value set
 #
     </pre>
 
-    <h3><a id="CephUsageType">Usage type "ceph"</a></h3>
+    <h3><a name="CephUsageType">Usage type "ceph"</a></h3>
     <p>
       This secret is associated with a Ceph RBD (rados block device).
       The <code>&lt;usage type='ceph'&gt;</code> element must contain
@@ -187,7 +187,7 @@ Secret value set
 &lt;/auth&gt;
     </pre>
 
-    <h3><a id="iSCSIUsageType">Usage type "iscsi"</a></h3>
+    <h3><a name="iSCSIUsageType">Usage type "iscsi"</a></h3>
 
     <p>
       This secret is associated with an iSCSI target for CHAP authentication.
@@ -272,7 +272,7 @@ Secret value set
 &lt;/auth&gt;
     </pre>
 
-    <h3><a id="tlsUsageType">Usage type "tls"</a></h3>
+    <h3><a name="tlsUsageType">Usage type "tls"</a></h3>
 
     <p>
       This secret may be used in order to provide the passphrase for the

docs/formatsnapshot.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Snapshot XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="SnapshotAttributes">Snapshot XML</a></h2>
+    <h2><a name="SnapshotAttributes">Snapshot XML</a></h2>
 
     <p>
       There are several types of snapshots:
@@ -235,15 +235,9 @@
         at the time of the snapshot (<span class="since">since
         0.9.5</span>).  Readonly.
       </dd>
-      <dt><code>cookie</code></dt>
-      <dd>Save image cookie containing additional data libvirt may need to
-        properly restore a domain from an active snapshot when such data
-        cannot be stored directly in the <code>domain</code> to maintain
-        compatibility with older libvirt or hypervisor. Readonly.
-      </dd>
     </dl>
 
-    <h2><a id="example">Examples</a></h2>
+    <h2><a name="example">Examples</a></h2>
 
     <p>Using this XML to create a disk snapshot of just vda on a qemu
       domain with two disks:</p>

docs/formatstorage.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Storage pool and volume XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="StoragePool">Storage pool XML</a></h2>
+    <h2><a name="StoragePool">Storage pool XML</a></h2>
 
     <p>
       Although all storage pool backends share the same public APIs and
@@ -29,7 +29,7 @@
       3.1.0</span>). This corresponds to the
       storage backend drivers listed further along in this document.
     </p>
-    <h3><a id="StoragePoolFirst">General metadata</a></h3>
+    <h3><a name="StoragePoolFirst">General metadata</a></h3>
 
     <pre>
 &lt;pool type="iscsi"&gt;
@@ -66,7 +66,7 @@
         pool. <span class="since">Since 0.4.1</span></dd>
     </dl>
 
-    <h3><a id="StoragePoolSource">Source elements</a></h3>
+    <h3><a name="StoragePoolSource">Source elements</a></h3>
 
     <p>
       A single <code>source</code> element is contained within the top level
@@ -207,21 +207,18 @@
         </dl>
         <dl>
           <dt><code>wwnn</code> and <code>wwpn</code></dt>
-          <dd>The required "World Wide Node Name" (<code>wwnn</code>) and
-            "World Wide Port Name" (<code>wwpn</code>) are used by the
-            "fc_host" adapter to uniquely identify the vHBA device in the
-            Fibre Channel storage fabric. If the vHBA device already exists
-            as a Node Device, then libvirt will use it; otherwise, the vHBA
-            will be created using the provided values. It is considered a
-            configuration error use the values from the HBA as those would
-            be for a "scsi_host" <code>type</code> pool instead. The
-            <code>wwnn</code> and <code>wwpn</code> have very specific
-            format requirements based on the hypervisor being used, thus
-            care should be taken if you decide to generate your own to
-            follow the standards; otherwise, the pool will fail to start
-            with an opaque error message indicating failure to write to
-            the vport_create file during vport create/delete due to
-            "No such file or directory".
+          <dd>The "World Wide Node Name" (<code>wwnn</code>) and "World Wide
+            Port Name" (<code>wwpn</code>) are used by the "fc_host" adapter
+            to uniquely identify the device in the Fibre Channel storage fabric
+            (the device can be either a HBA or vHBA). Both wwnn and wwpn should
+            be specified. Use the command 'virsh nodedev-dumpxml' to determine
+            how to set the values for the wwnn/wwpn of a (v)HBA. The wwnn and
+            wwpn have very specific numerical format requirements based on the
+            hypervisor being used, thus care should be taken if you decide to
+            generate your own to follow the standards; otherwise, the pool
+            will fail to start with an opaque error message indicating failure
+            to write to the vport_create file during vport create/delete due
+            to "No such file or directory".
             <span class="since">Since 1.0.4</span>
           </dd>
         </dl>
@@ -397,7 +394,7 @@
         is backend specific.  <span class="since">Since 0.8.4</span></dd>
     </dl>
 
-    <h3><a id="StoragePoolTarget">Target elements</a></h3>
+    <h3><a name="StoragePoolTarget">Target elements</a></h3>
 
     <p>
       A single <code>target</code> element is contained within the top level
@@ -447,7 +444,7 @@
         namespace. It provides information about the permissions to use for the
         final directory when the pool is built. There are 4 child elements.
         The <code>mode</code> element contains the octal permission set.
-        The <code>mode</code> defaults to 0711 when not provided.
+        The <code>mode</code> defaults to 0755 when not provided.
         The <code>owner</code> element contains the numeric user ID.
         The <code>group</code> element contains the numeric group ID.
         If <code>owner</code> or <code>group</code> aren't specified when
@@ -461,7 +458,7 @@
       </dd>
     </dl>
 
-    <h3><a id="StoragePoolExtents">Device extents</a></h3>
+    <h3><a name="StoragePoolExtents">Device extents</a></h3>
 
     <p>
       If a storage pool exposes information about its underlying
@@ -481,7 +478,7 @@
       device, measured in bytes.  <span class="since">Since 0.4.1</span>
     </p>
 
-    <h2><a id="StorageVol">Storage volume XML</a></h2>
+    <h2><a name="StorageVol">Storage volume XML</a></h2>
     <p>
       A storage volume will generally be either a file or a device
       node; <span class="since">since 1.2.0</span>, an optional
@@ -491,7 +488,7 @@
       XML format is available <span class="since">since 0.4.1</span>
     </p>
 
-    <h3><a id="StorageVolFirst">General metadata</a></h3>
+    <h3><a name="StorageVolFirst">General metadata</a></h3>
 
     <pre>
 &lt;volume type='file'&gt;
@@ -570,7 +567,7 @@
         on the local host. <span class="since">Since 0.4.1</span></dd>
     </dl>
 
-    <h3><a id="StorageVolTarget">Target elements</a></h3>
+    <h3><a name="StorageVolTarget">Target elements</a></h3>
 
     <p>
       A single <code>target</code> element is contained within the top level
@@ -686,7 +683,7 @@
       </dd>
     </dl>
 
-    <h3><a id="StorageVolBacking">Backing store elements</a></h3>
+    <h3><a name="StorageVolBacking">Backing store elements</a></h3>
 
     <p>
       A single <code>backingStore</code> element is contained within the top level
@@ -732,14 +729,14 @@
       </dd>
     </dl>
 
-    <h2><a id="examples">Example configuration</a></h2>
+    <h2><a name="examples">Example configuration</a></h2>
 
     <p>
       Here are a couple of examples, for a more complete set demonstrating
       every type of storage pool, consult the <a href="storage.html">storage driver page</a>
     </p>
 
-    <h3><a id="exampleFile">File based storage pool</a></h3>
+    <h3><a name="exampleFile">File based storage pool</a></h3>
 
     <pre>
 &lt;pool type="dir"&gt;
@@ -749,7 +746,7 @@
   &lt;/target&gt;
 &lt;/pool&gt;</pre>
 
-    <h3><a id="exampleISCSI">iSCSI based storage pool</a></h3>
+    <h3><a name="exampleISCSI">iSCSI based storage pool</a></h3>
 
     <pre>
 &lt;pool type="iscsi"&gt;
@@ -766,7 +763,7 @@
   &lt;/target&gt;
 &lt;/pool&gt;</pre>
 
-    <h3><a id="exampleVol">Storage volume</a></h3>
+    <h3><a name="exampleVol">Storage volume</a></h3>
 
     <pre>
 &lt;volume&gt;
@@ -784,7 +781,7 @@
   &lt;/target&gt;
 &lt;/volume&gt;</pre>
 
-    <h3><a id="exampleLuks">Storage volume using LUKS</a></h3>
+    <h3><a name="exampleLuks">Storage volume using LUKS</a></h3>
 
     <pre>
 &lt;volume&gt;

docs/formatstorageencryption.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Storage volume encryption XML format</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="StorageEncryption">Storage volume encryption XML</a></h2>
+    <h2><a name="StorageEncryption">Storage volume encryption XML</a></h2>
 
     <p>
       Storage volumes may be encrypted, the XML snippet described below is used
@@ -37,7 +37,7 @@
       secret value at the time of volume creation, and store it using the
       specified <code>uuid</code>.
     </p>
-    <h3><a id="StorageEncryptionDefault">"default" format</a></h3>
+    <h3><a name="StorageEncryptionDefault">"default" format</a></h3>
     <p>
       <code>&lt;encryption format="default"/&gt;</code> can be specified only
       when creating a qcow volume.  If the volume is successfully created, the
@@ -47,7 +47,7 @@
       in later operations with the volume, or when setting up a domain that
       uses the volume.
     </p>
-    <h3><a id="StorageEncryptionQcow">"qcow" format</a></h3>
+    <h3><a name="StorageEncryptionQcow">"qcow" format</a></h3>
     <p>
       The <code>qcow</code> format specifies that the built-in encryption
       support in <code>qcow</code>- or <code>qcow2</code>-formatted volume
@@ -56,7 +56,7 @@
       the <code>secret</code> element is not present during volume creation,
       a secret is automatically generated and attached to the volume.
     </p>
-    <h3><a id="StorageEncryptionLuks">"luks" format</a></h3>
+    <h3><a name="StorageEncryptionLuks">"luks" format</a></h3>
     <p>
       The <code>luks</code> format is specific to a luks encrypted volume
       and the secret is used in order to either encrypt during volume creation
@@ -119,7 +119,7 @@
     </dl>
 
 
-    <h2><a id="example">Examples</a></h2>
+    <h2><a name="example">Examples</a></h2>
 
     <p>
       Here is a simple example, specifying use of the <code>qcow</code> format:

docs/genaclperms.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 #
 # Copyright (C) 2013 Red Hat, Inc.
 #
@@ -74,7 +74,7 @@ while (<>) {
 
 print <<EOF;
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
 EOF

docs/goals.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Terminology and goals</h1>

docs/governance.html.in

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Project governance</h1>
@@ -14,7 +14,7 @@
       influence, within the community.
     </p>
 
-    <h2><a id="codeofconduct">Code of conduct</a></h2>
+    <h2><a name="codeofconduct">Code of conduct</a></h2>
 
     <p>
       The libvirt project community covers people from a wide variety of
@@ -49,7 +49,7 @@
         from them. Playing a blame game doesn't help anyone.</li>
     </ul>
 
-    <h2><a id="roles">Roles and responsibilities</a></h2>
+    <h2><a name="roles">Roles and responsibilities</a></h2>
 
     <h3><a href="users">Users</a></h3>
 
@@ -91,7 +91,7 @@
       ways listed in the next section.
     </p>
 
-    <h3><a id="contributors">Contributors</a></h3>
+    <h3><a name="contributors">Contributors</a></h3>
 
     <p>
       The contributors are community members who have some concrete impact
@@ -156,7 +156,7 @@
       covered are found in the source repositories, or website in question.
     </p>
 
-    <h3><a id="committers">Committers</a></h3>
+    <h3><a name="committers">Committers</a></h3>
 
     <p>
       The committers are the subset of contributors who have direct access
@@ -227,7 +227,7 @@
       to retain their role as a committer.
     </p>
 
-    <h3><a id="secteam">Security team</a></h3>
+    <h3><a name="secteam">Security team</a></h3>
 
     <p>
       The security team consists of a subset of the project committers
@@ -252,7 +252,7 @@
       before disclosing a private issue.
     </p>
 
-    <h2><a id="roughconsensus">Rough consensus</a></h2>
+    <h2><a name="roughconsensus">Rough consensus</a></h2>
 
     <p>
       A core concept for governance of the project described above is

docs/hacking.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Contributor guidelines</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="patches">General tips for contributing patches</a></h2>
+    <h2><a name="patches">General tips for contributing patches</a></h2>
     <ol>
       <li>
         <p>Discuss any large changes on the mailing list first.  Post patches
@@ -29,8 +29,8 @@
         file from zanata.</p>
       </li>
 
-      <li><p>Post patches using <code>git send-email</code>, with git
-        rename detection enabled.  You need a one-time setup of:</p>
+      <li><p>Post patches using "git send-email", with git rename
+        detection enabled.  You need a one-time setup of:</p>
 <pre>
   git config diff.renames true
 </pre>
@@ -50,44 +50,22 @@
   git pull --rebase
   (fix any conflicts)
   git send-email --cover-letter --no-chain-reply-to --annotate \
-                 --confirm=always --to=libvir-list@redhat.com master
+                 --to=libvir-list@redhat.com master
 </pre>
-        <p>For a single patch you can omit
+        <p>(Note that the "git send-email" subcommand may not be in
+        the main git package and using it may require installation of a
+        separate package, for example the "git-email" package in
+        Fedora.)  For a single patch you can omit
         <code>--cover-letter</code>, but a series of two or more
-        patches needs a cover letter.</p>
-        <p>Note that the <code>git send-email</code> subcommand may not
-        be in the main git package and using it may require installation
-        of a separate package, for example the "git-email" package in
-        Fedora and Debian.  If this is your first time using
-        <code>git send-email</code>, you might need to configure it to
-        point it to your SMTP server with something like:</p>
-<pre>
-  git config --global sendemail.smtpServer stmp.youremailprovider.net
-</pre>
-        <p>If you get tired of typing
-        <code>--to=libvir-list@redhat.com</code> all the time, you can
-        configure that to be automatically handled as well:</p>
+        patches needs a cover letter. If you get tired of typing
+        <code>--to=libvir-list@redhat.com</code> designation you can
+        set it in git config:</p>
 <pre>
   git config sendemail.to libvir-list@redhat.com
 </pre>
-        <p>As a rule, patches should be sent to the mailing list only: all
-        developers are subscribed to libvir-list and read it regularly, so
-        please don't CC individual developers unless they've explicitly
-        asked you to.</p>
-        <p>Avoid using mail clients for sending patches, as most of them
-        will mangle the messages in some way, making them unusable for our
-        purposes.  Gmail and other Web-based mail clients are particularly
-        bad at this.</p>
-        <p>If everything went well, your patch should show up on the
-        <a href="https://www.redhat.com/archives/libvir-list/">libvir-list
-        archives</a> in a matter of minutes; if you still can't find it on
-        there after an hour or so, you should double-check your setup.  Note
-        that your very first post to the mailing list will be subject to
-        moderation, and it's not uncommon for that to take around a day.</p>
         <p>Please follow this as close as you can, especially the rebase and
-        <code>git send-email</code> part, as it makes life easier for other
-        developers to review your patch set.</p>
-        <p>One should avoid sending patches as attachments,
+        git send-email part, as it makes life easier for other developers to
+        review your patch set. One should avoid sending patches as attachments,
         but rather send them in email body along with commit message. If a
         developer is sending another version of the patch (e.g. to address
         review comments), they are advised to note differences to previous
@@ -336,27 +314,7 @@
         Richard Jones' guide to working with open source projects</a>.
     </p>
 
-    <h2><a id="tooling">Tooling</a></h2>
-
-    <p>
-      libvirt includes support for some useful development tools right in its
-      source repository, meaning users will be able to take advantage of them
-      without little or no configuration. Examples include:
-    </p>
-
-    <ul>
-      <li>
-        <a href="https://github.com/jeaye/color_coded">color_coded</a>,
-        a vim plugin for libclang-powered semantic syntax highlighting;
-      </li>
-
-      <li>
-        <a href="http://valloric.github.io/YouCompleteMe/">YouCompleteMe</a>,
-        a vim plugin for libclang-powered semantic code completion.
-      </li>
-    </ul>
-
-    <h2><a id="naming">Naming conventions</a></h2>
+    <h2><a name="naming">Naming conventions</a></h2>
 
     <p>
       When reading libvirt code, a number of different naming conventions will
@@ -450,7 +408,7 @@
       </dd>
     </dl>
 
-    <h2><a id="indent">Code indentation</a></h2>
+    <h2><a name="indent">Code indentation</a></h2>
     <p>
       Libvirt's C source code generally adheres to some basic code-formatting
       conventions.  The existing code base is not totally consistent on this
@@ -487,7 +445,7 @@
       which will load the .lvimrc only when you edit libvirt code.
     </p>
 
-    <h2><a id="formatting">Code formatting (especially for new code)</a></h2>
+    <h2><a name="formatting">Code formatting (especially for new code)</a></h2>
 
     <p>
       With new code, we can be even more strict.
@@ -523,7 +481,7 @@
     </p>
 
 
-    <h2><a id="bracket_spacing">Bracket spacing</a></h2>
+    <h2><a name="bracket_spacing">Bracket spacing</a></h2>
 
     <p>
       The keywords <code>if</code>, <code>for</code>, <code>while</code>,
@@ -572,7 +530,7 @@
       int foo(int wizz);    // Good
 </pre>
 
-    <h2><a id="comma">Commas</a></h2>
+    <h2><a name="comma">Commas</a></h2>
 
     <p>
       Commas should always be followed by a space or end of line, and
@@ -609,7 +567,7 @@
       };
 </pre>
 
-    <h2><a id="semicolon">Semicolons</a></h2>
+    <h2><a name="semicolon">Semicolons</a></h2>
 
     <p>
       Semicolons should never have a space beforehand.  Inside the
@@ -638,7 +596,7 @@
       }
 </pre>
 
-    <h2><a id="curly_braces">Curly braces</a></h2>
+    <h2><a name="curly_braces">Curly braces</a></h2>
 
     <p>
       Omit the curly braces around an <code>if</code>, <code>while</code>,
@@ -819,7 +777,7 @@
   }
 </pre>
 
-    <h2><a id="preprocessor">Preprocessor</a></h2>
+    <h2><a name="preprocessor">Preprocessor</a></h2>
 
     <p>Macros defined with an ALL_CAPS name should generally be
       assumed to be unsafe with regards to arguments with side-effects
@@ -844,7 +802,7 @@
   #endif
 </pre>
 
-    <h2><a id="types">C types</a></h2>
+    <h2><a name="types">C types</a></h2>
 
     <p>
       Use the right type.
@@ -919,7 +877,7 @@
       it points to, or it is aliased to another pointer that is.
     </p>
 
-    <h2><a id="memalloc">Low level memory management</a></h2>
+    <h2><a name="memalloc">Low level memory management</a></h2>
 
     <p>
       Use of the malloc/free/realloc/calloc APIs is deprecated in the libvirt
@@ -1013,7 +971,7 @@
       </li>
     </ul>
 
-    <h2><a id="file_handling">File handling</a></h2>
+    <h2><a name="file_handling">File handling</a></h2>
 
     <p>
       Usage of the <code>fdopen()</code>, <code>close()</code>, <code>fclose()</code>
@@ -1059,7 +1017,7 @@
       </li>
     </ul>
 
-    <h2><a id="string_comparision">String comparisons</a></h2>
+    <h2><a name="string_comparision">String comparisons</a></h2>
 
     <p>
       Do not use the strcmp, strncmp, etc functions directly. Instead use
@@ -1109,7 +1067,7 @@
     </ul>
 
 
-    <h2><a id="string_copying">String copying</a></h2>
+    <h2><a name="string_copying">String copying</a></h2>
 
     <p>
       Do not use the strncpy function.  According to the man page, it
@@ -1169,7 +1127,7 @@
       and usually considered a flaw.
     </p>
 
-    <h2><a id="strbuf">Variable length string buffer</a></h2>
+    <h2><a name="strbuf">Variable length string buffer</a></h2>
 
     <p>
       If there is a need for complex string concatenations, avoid using
@@ -1202,7 +1160,7 @@
 </pre>
 
 
-    <h2><a id="includes">Include files</a></h2>
+    <h2><a name="includes">Include files</a></h2>
 
     <p>
       There are now quite a large number of include files, both libvirt
@@ -1251,7 +1209,7 @@
     </p>
 
 
-    <h2><a id="printf">Printf-style functions</a></h2>
+    <h2><a name="printf">Printf-style functions</a></h2>
 
     <p>
       Whenever you add a new printf-style function, i.e., one with a format
@@ -1280,7 +1238,7 @@
       does for snprintf.
     </p>
 
-    <h2><a id="goto">Use of goto</a></h2>
+    <h2><a name="goto">Use of goto</a></h2>
 
     <p>
       The use of goto is not forbidden, and goto is widely used
@@ -1363,7 +1321,7 @@ int foo()
 
 
 
-    <h2><a id="committers">Libvirt committer guidelines</a></h2>
+    <h2><a name="committers">Libvirt committer guidelines</a></h2>
 
     <p>
       The AUTHORS files indicates the list of people with commit access right

docs/hacking1.xsl

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output method="xml" encoding="UTF-8" indent="no"/>
+
+
+
+<xsl:template match="/">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+
+<xsl:template match="@*|node()">
+  <xsl:copy>
+    <xsl:apply-templates select="@*|node()"/>
+  </xsl:copy>
+</xsl:template>
+
+
+
+<!-- resolve b/i/code tags in a first pass, because they interfere with line
+     wrapping in the second pass -->
+<xsl:template match="html:b">*<xsl:apply-templates/>*</xsl:template>
+<xsl:template match="html:i">'<xsl:apply-templates/>'</xsl:template>
+<xsl:template match="html:code">"<xsl:apply-templates/>"</xsl:template>
+
+<!-- likewise, reformat a tags in first pass -->
+<xsl:template match="html:a">
+<xsl:text> </xsl:text><xsl:apply-templates/>
+<xsl:if test="@href">
+  <xsl:text> &lt;</xsl:text><xsl:value-of select="@href"/>
+  <xsl:text>&gt;</xsl:text>
+</xsl:if>
+</xsl:template>
+
+
+</xsl:stylesheet>

docs/hacking2.xsl

@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+                xmlns:html="http://www.w3.org/1999/xhtml"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:import href="wrapstring.xsl"/>
+
+<xsl:output method="text" encoding="UTF-8" indent="no"/>
+
+<xsl:strip-space elements="*"/>
+
+
+
+<xsl:variable name="newline">
+<xsl:text>
+</xsl:text>
+</xsl:variable>
+
+
+
+<xsl:template match="/">
+<xsl:text>-*- buffer-read-only: t -*- vi: set ro:
+DO NOT EDIT THIS FILE!  IT IS GENERATED AUTOMATICALLY
+from docs/hacking.html.in!
+
+
+
+</xsl:text>
+<xsl:apply-templates/>
+</xsl:template>
+
+
+
+<!-- title -->
+<xsl:template match="html:h1">
+<xsl:text>                         </xsl:text>
+<xsl:value-of select="normalize-space(.)"/>
+<xsl:text>
+                         </xsl:text>======================
+
+
+</xsl:template>
+
+
+
+<!-- output the current text node underlined -->
+<xsl:template name="underline">
+  <xsl:param name="text" select="normalize-space(.)"/>
+  <xsl:param name="text-length" select="string-length($text)"/>
+  <xsl:param name="char" select="'='"/>
+  <xsl:param name="line" select="$char"/>
+  <xsl:choose>
+    <xsl:when test="$text-length > 1">
+      <xsl:call-template name="underline">
+        <xsl:with-param name="text" select="$text"/>
+        <xsl:with-param name="text-length" select="$text-length - 1"/>
+        <xsl:with-param name="char" select="$char"/>
+        <xsl:with-param name="line" select="concat($line,$char)"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+<xsl:value-of select="$text"/>
+<xsl:value-of select="$newline"/>
+<xsl:value-of select="$line"/>
+<xsl:value-of select="$newline"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+
+<xsl:template match="html:h2">
+<xsl:value-of select="$newline"/>
+<xsl:call-template name="underline"/>
+</xsl:template>
+
+
+
+<xsl:template match="html:h3">
+<xsl:call-template name="underline">
+<xsl:with-param name="char" select="'-'"/>
+</xsl:call-template>
+</xsl:template>
+
+
+
+<!-- output text line wrapped at 80 chars -->
+<xsl:template match="text()">
+<xsl:call-template name="wrap-string">
+<xsl:with-param name="str" select="normalize-space(.)"/>
+<xsl:with-param name="wrap-col" select="80"/>
+<xsl:with-param name="break-mark" select="$newline"/>
+</xsl:call-template>
+</xsl:template>
+
+
+
+<xsl:template match="html:p">
+<xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+</xsl:template>
+
+
+
+<xsl:template match="html:ol/html:li">(<xsl:value-of select="position()"/>) <xsl:apply-templates/>
+</xsl:template>
+
+
+
+<xsl:template match="html:ul/html:li">- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+</xsl:template>
+
+
+
+<xsl:template match="html:li/html:ul/html:li">-- <xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+</xsl:template>
+
+<xsl:template match="html:dl/html:dt">*<xsl:apply-templates/>*<xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+</xsl:template>
+<xsl:template match="html:dl/html:dd"><xsl:apply-templates/><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/>
+</xsl:template>
+
+
+<!-- add newline before nested <ul> -->
+<xsl:template match="html:li/html:ul"><xsl:value-of select="$newline"/><xsl:value-of select="$newline"/><xsl:apply-templates/>
+</xsl:template>
+
+
+
+<xsl:template match="html:pre">
+<xsl:choose>
+<xsl:when test="starts-with(.,'&#xA;')"><xsl:value-of select="substring(.,2)"/><xsl:value-of select="$newline"/>
+</xsl:when>
+<xsl:otherwise>
+<xsl:value-of select="."/><xsl:value-of select="$newline"/>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+
+</xsl:stylesheet>

docs/hooks.html.in

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <body>
     <h1>Hooks for specific system management</h1>
 
     <ul id="toc"></ul>
 
-    <h2><a id="intro">Custom event scripts</a></h2>
+    <h2><a name="intro">Custom event scripts</a></h2>
     <p>Beginning with libvirt 0.8.0, specific events on a host system will
        trigger custom scripts.</p>
     <p>These custom <b>hook</b> scripts are executed when any of the following
@@ -26,7 +26,7 @@
           (<span class="since">since 1.2.2</span>)<br/><br/></li>
     </ul>
 
-    <h2><a id="location">Script location</a></h2>
+    <h2><a name="location">Script location</a></h2>
     <p>The libvirt hook scripts are located in the directory
        <code>$SYSCONFDIR/libvirt/hooks/</code>.</p>
     <ul>
@@ -42,7 +42,7 @@
        them executable.</p>
     <br/>
 
-    <h2><a id="names">Script names</a></h2>
+    <h2><a name="names">Script names</a></h2>
     <p>At present, there are five hook scripts that can be called:</p>
     <ul>
       <li><code>/etc/libvirt/hooks/daemon</code><br/><br/>
@@ -61,7 +61,7 @@
     </ul>
     <br/>
 
-    <h2><a id="structure">Script structure</a></h2>
+    <h2><a name="structure">Script structure</a></h2>
     <p>The hook scripts are executed using standard Linux process creation
        functions.  Therefore, they must begin with the declaration of the
        command interpreter to use.</p>
@@ -73,7 +73,7 @@
        binary, so you are welcome to use your favourite languages.</p>
     <br/>
 
-    <h2><a id="arguments">Script arguments</a></h2>
+    <h2><a name="arguments">Script arguments</a></h2>
     <p>The hook scripts are called with specific command line arguments,
        depending upon the script, and the operation being performed.</p>
     <p>The guest hook scripts, qemu and lxc, are also given the <b>full</b>
@@ -128,10 +128,10 @@
           none.</li>
     </ol>
 
-    <h4><a id="arguments_specifics">Specifics</a></h4>
+    <h4><a name="arguments_specifics">Specifics</a></h4>
     <p>This translates to the following specifics for each hook script:</p>
 
-    <h5><a id="daemon">/etc/libvirt/hooks/daemon</a></h5>
+    <h5><a name="daemon">/etc/libvirt/hooks/daemon</a></h5>
     <ul>
       <li>When the libvirt daemon is started, this script is called as:<br/>
           <pre>/etc/libvirt/hooks/daemon - start - start</pre></li>
@@ -146,7 +146,7 @@
        with the "start" operation.  There is no specific operation to indicate
        a "restart" is occurring.</p>
 
-    <h5><a id="qemu">/etc/libvirt/hooks/qemu</a></h5>
+    <h5><a name="qemu">/etc/libvirt/hooks/qemu</a></h5>
     <ul>
       <li>Before a QEMU guest is started, the qemu hook script is
         called in three locations; if any location fails, the guest
@@ -206,7 +206,7 @@
       </li>
     </ul>
 
-    <h5><a id="lxc">/etc/libvirt/hooks/lxc</a></h5>
+    <h5><a name="lxc">/etc/libvirt/hooks/lxc</a></h5>
     <ul>
       <li>Before a LXC guest is started, the lxc hook script is
         called in three locations; if any location fails, the guest
@@ -240,7 +240,7 @@
       </li>
     </ul>
 
-    <h5><a id="libxl">/etc/libvirt/hooks/libxl</a></h5>
+    <h5><a name="libxl">/etc/libvirt/hooks/libxl</a></h5>
     <ul>
       <li>Before a Xen guest is started using libxl driver, the libxl hook
         script is called in three locations; if any location fails, the guest
@@ -284,12 +284,12 @@
       </li>
     </ul>
 
-    <h5><a id="network">/etc/libvirt/hooks/network</a></h5>
+    <h5><a name="network">/etc/libvirt/hooks/network</a></h5>
     <ul>
       <li><span class="since">Since 1.2.2</span>, before a network is started,
         this script is called as:<br/>
           <pre>/etc/libvirt/hooks/network network_name start begin -</pre></li>
-      <li>After the network is started, up &amp; running, the script is
+      <li>After the network is started, up &and; running, the script is
         called as:<br/>
           <pre>/etc/libvirt/hooks/network network_name started begin -</pre></li>
       <li>When a network is shut down, this script is called as:<br/>
@@ -310,7 +310,7 @@
 
     <br/>
 
-    <h2><a id="execution">Script execution</a></h2>
+    <h2><a name="execution">Script execution</a></h2>
     <ul>
       <li>The "start" operation for the guest and network hook scripts,
           executes <b>prior</b> to the object (guest or network) being created.
@@ -335,7 +335,7 @@
     </ul>
     <br/>
 
-    <h2><a id="qemu_migration">QEMU guest migration</a></h2>
+    <h2><a name="qemu_migration">QEMU guest migration</a></h2>
     <p>Migration of a QEMU guest involves running hook scripts on both the
        source and destination hosts:</p>
     <ol>
@@ -357,14 +357,14 @@
     </ol>
     <br/>
 
-    <h2><a id="recursive">Calling libvirt functions from within a hook script</a></h2>
+    <h2><a name="recursive">Calling libvirt functions from within a hook script</a></h2>
     <p><b>DO NOT DO THIS!</b></p>
     <p>A hook script must not call back into libvirt, as the libvirt daemon
        is already waiting for the script to exit.</p>
     <p>A deadlock is likely to occur.</p>
     <br/>
 
-    <h2><a id="return_codes">Return codes and logging</a></h2>
+    <h2><a name="return_codes">Return codes and logging</a></h2>
     <p>If a hook script returns with an exit code of 0, the libvirt daemon
        regards this as successful and performs no logging of it.</p>
     <p>However, if a hook script returns with a non zero exit code, the libvirt

docs/hvsupport.pl

@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 use strict;
 use warnings;
@@ -332,7 +332,7 @@ foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) {
 
 print <<EOF;
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <body class="hvsupport">
 <h1>libvirt API support matrix</h1>

docs/index.html.in

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <script type="text/javascript" src="js/jquery-3.1.1.min.js"> </script>
-    <script type="text/javascript" src="js/moment.min.js"> </script>
-    <script type="text/javascript" src="js/jquery.rss.min.js"> </script>
+    <script type="text/javascript" src="js/jquery-3.1.1.min.js"></script>
+    <script type="text/javascript" src="js/moment.min.js"></script>
+    <script type="text/javascript" src="js/jquery.rss.min.js"></script>
 
     <script type="text/javascript">
       <!--
@@ -59,16 +59,16 @@
 
         <dt><a href="format.html">XML configuration</a></dt>
         <dd>Description of the XML schemas for
-          <a href="formatdomain.html">domains</a>,
-          <a href="formatnetwork.html">networks</a>,
-          <a href="formatnwfilter.html">network filtering</a>,
-          <a href="formatstorage.html">storage</a>,
-          <a href="formatstorageencryption.html">storage encryption</a>,
-          <a href="formatcaps.html">capabilities</a>,
-          <a href="formatdomaincaps.html">domain capabilities</a>,
-          <a href="formatnode.html">node devices</a>,
-          <a href="formatsecret.html">secrets</a>,
-          <a href="formatsnapshot.html">snapshots</a></dd>
+          <a href="formatdomain.html" shape="rect">domains</a>,
+          <a href="formatnetwork.html" shape="rect">networks</a>,
+          <a href="formatnwfilter.html" shape="rect">network filtering</a>,
+          <a href="formatstorage.html" shape="rect">storage</a>,
+          <a href="formatstorageencryption.html" shape="rect">storage encryption</a>,
+          <a href="formatcaps.html" shape="rect">capabilities</a>,
+          <a href="formatdomaincaps.html" shape="rect">domain capabilities</a>,
+          <a href="formatnode.html" shape="rect">node devices</a>,
+          <a href="formatsecret.html" shape="rect">secrets</a>,
+          <a href="formatsnapshot.html" shape="rect">snapshots</a></dd>
         <dt><a href="http://wiki.libvirt.org">Wiki</a></dt>
         <dd>Read further community contributed content</dd>
       </dl>