qemu: Let empty default VNC password work as documented

CVE-2016-5008 Setting an empty graphics password is documented as a way to disable VNC/SPICE access, but QEMU does not always behaves like that. VNC would happily accept the empty password. Let's enforce the behavior by setting password expiration to "now". https://bugzilla.redhat.com/show_bug.cgi?id=1180092 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> (cherry picked from commit bb848feec0) (cherry picked from commit d933f68ee6)
CVE-2015-5313: storage: don't allow '/' in filesystem volume names
2025-09-27 05:44:52 +03:00 · 2016-06-30 13:57:51 +01:00 · 2015-12-15 20:30:35 -07:00 · 2015-12-15 20:30:35 -07:00 · 2015-12-15 20:30:35 -07:00 · 2015-12-15 20:30:35 -07:00
3690 changed files with 1273287 additions and 1280057 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@
 *.pyc
 *.rej
 *.s
-*.swp
 *~
 .#*
 .deps
@@ -41,7 +40,6 @@
 /build-aux
 /build-aux/
 /build/
-/confdefs.h
 /config.cache
 /config.guess
 /config.h
@@ -52,7 +50,6 @@
 /config.sub
 /configure
 /configure.lineno
-/conftest.*
 /daemon/*_dispatch.h
 /daemon/libvirt_qemud
 /daemon/libvirtd
@@ -63,13 +60,11 @@
 /daemon/libvirtd.pod
 /daemon/libvirtd.policy
 /daemon/libvirtd.service
-/daemon/libvirtd.socket
 /daemon/test_libvirtd.aug
 /docs/aclperms.htmlinc
 /docs/apibuild.py.stamp
 /docs/devhelp/libvirt.devhelp
 /docs/hvsupport.html.in
-/docs/libvirt-admin-*.xml
 /docs/libvirt-api.xml
 /docs/libvirt-lxc-*.xml
 /docs/libvirt-qemu-*.xml
@@ -80,10 +75,8 @@
 /examples/dominfo/info1
 /examples/domsuspend/suspend
 /examples/dommigrate/dommigrate
-/examples/domtop/domtop
 /examples/hellolibvirt/hellolibvirt
 /examples/openauth/openauth
-/examples/rename/rename
 /gnulib/lib/*
 /gnulib/m4/*
 /gnulib/tests/*
@@ -91,7 +84,7 @@
 /libtool
 /libvirt-*.tar.gz
 /libvirt-[0-9]*
-/libvirt*.pc
+/libvirt.pc
 /libvirt.spec
 /ltconfig
 /ltmain.sh
@@ -105,7 +98,6 @@
 /run
 /sc_*
 /src/.*.stamp
-/src/*.pc
 /src/access/org.libvirt.api.policy
 /src/access/viraccessapicheck.c
 /src/access/viraccessapicheck.h
@@ -113,8 +105,6 @@
 /src/access/viraccessapichecklxc.h
 /src/access/viraccessapicheckqemu.c
 /src/access/viraccessapicheckqemu.h
-/src/admin/admin_client.h
-/src/admin/admin_protocol.[ch]
 /src/esx/*.generated.*
 /src/hyperv/*.generated.*
 /src/libvirt*.def
@@ -125,13 +115,10 @@
 /src/libvirt_access_lxc.xml
 /src/libvirt_access_qemu.syms
 /src/libvirt_access_qemu.xml
-/src/libvirt_admin.syms
 /src/libvirt_*.stp
 /src/libvirt_*helper
 /src/libvirt_*probes.h
 /src/libvirt_lxc
-/src/locking/libxl-lockd.conf
-/src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h
 /src/locking/lock_protocol.[ch]
 /src/locking/qemu-lockd.conf
--- a/.gnulib
+++ b/.gnulib
--- a/.mailmap
+++ b/.mailmap
@@ -5,10 +5,7 @@

 <bozzolan@gmail.com> <redshift@gmx.com>
 <charles_duffy@messageone.com> <charles@dyfis.net>
-<claudio.bley@gmail.com> <cbley@av-test.de>
 <dfj@redhat.com> <dfj@dfj.bne.redhat.com>
-<dpkshetty@gmail.com> <deepakcs@linux.vnet.ibm.com>
-<dpkshetty@gmail.com> <deepakcs@redhat.com>
 <eblake@redhat.com> <ebb9@byu.net>
 <gdolley@arpnetworks.com> <gdolley@ucla.edu>
 <gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com>
@@ -59,5 +56,3 @@ Philipp Hahn <hahn@univention.de>
 Marco Bozzolan <bozzolan@gmail.com>
 Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
-Wang Yufei (James) <james.wangyufei@huawei.com>
-Deepak C Shetty <dpkshetty@gmail.com>
--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -8,27 +8,31 @@ Daniel Veillard <veillard@redhat.com> or <daniel@veillard.com>
 The primary maintainers and people with commit access rights:

 Alex Jia <ajia@redhat.com>
-Cédric Bosdonnat <cbosdonnat@suse.com>
+Anthony Liguori <aliguori@us.ibm.com>
+Chris Lalancette <clalance@redhat.com>
 Christophe Fergeau <cfergeau@redhat.com>
-Claudio Bley <claudio.bley@gmail.com>
+Claudio Bley <cbley@av-test.de>
 Cole Robinson <crobinso@redhat.com>
 Daniel Berrange <berrange@redhat.com>
 Daniel Veillard <veillard@redhat.com>
-Dmitry Guryanov <dguryanov@parallels.com>
+Dave Allan <dallan@redhat.com>
 Doug Goldstein <cardoe@gentoo.org>
 Eric Blake <eblake@redhat.com>
-Erik Skultety <eskultet@redhat.com>
 Gao Feng <gaofeng@cn.fujitsu.com>
+Guannan Ren <gren@redhat.com>
 Guido Günther <agx@sigxcpu.org>
 Ján Tomko <jtomko@redhat.com>
 Jim Fehlig <jfehlig@suse.com>
+Jim Meyering <meyering@redhat.com>
 Jiří Denemark <jdenemar@redhat.com>
 John Ferlan <jferlan@redhat.com>
+John Levon <john.levon@sun.com>
 Laine Stump <laine@redhat.com>
 Mark McLoughlin <markmc@redhat.com>
 Martin Kletzander <mkletzan@redhat.com>
 Matthias Bolte <matthias.bolte@googlemail.com>
 Michal Prívozník <mprivozn@redhat.com>
+Osier Yang <jyang@redhat.com>
 Pavel Hrdina <phrdina@redhat.com>
 Peter Krempa <pkrempa@redhat.com>
 Richard W.M. Jones <rjones@redhat.com>
@@ -38,18 +42,11 @@ Wen Congyang <wency@cn.fujitsu.com>

 Previous maintainers:

-Anthony Liguori <aliguori@us.ibm.com>
 Atsushi SAKAI <sakaia@jp.fujitsu.com>
-Chris Lalancette <clalance@redhat.com>
 Dan Smith <danms@us.ibm.com>
-Dave Allan <dallan@redhat.com>
 Dave Leskovec <dlesko@linux.vnet.ibm.com>
-Guannan Ren <gren@redhat.com>
-Jim Meyering <meyering@redhat.com>
-John Levon <john.levon@sun.com>
 Justin Clift <jclift@redhat.com>
 Karel Zak <kzak@redhat.com>
-Osier Yang <jyang@redhat.com>

 Patches have also been contributed by:

--- a/COPYING.LESSER
+++ b/COPYING.LESSER
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -158,7 +158,7 @@ Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

                     END OF TERMS AND CONDITIONS
-
+
           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
--- a/103
+++ b/103
@@ -14,16 +14,7 @@ General tips for contributing patches
 (1) Discuss any large changes on the mailing list first. Post patches early and
 listen to feedback.

-(2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git")
-and is browsable along with other libvirt-related repositories (e.g.
-libvirt-python) online <http://libvirt.org/git/>.
-
-(3) Patches to translations are maintained via the zanata project
-<https://fedora.zanata.org/>. If you want to fix a translation in a .po file,
-join the appropriate language team. The libvirt release process automatically
-pulls the latest version of each translation file from zanata.
-
-(4) Post patches in unified diff format, with git rename detection enabled. You
+(2) Post patches in unified diff format, with git rename detection enabled. You
 need a one-time setup of:

  git config diff.renames true
@@ -66,16 +57,16 @@ Please follow this as close as you can, especially the rebase and 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 versions after the "---" line in the
-patch so that it helps reviewers but doesn't become part of git history.
-Moreover, such patch needs to be prefixed correctly with
-"--subject-prefix=PATCHv2" appended to "git send-email" (substitute "v2" with
-the correct version if needed though).
+another version of the patch (e.g. to address review comments), he is advised
+to note differences to previous versions after the "---" line in the patch so
+that it helps reviewers but doesn't become part of git history. Moreover, such
+patch needs to be prefixed correctly with "--subject-prefix=PATCHv2" appended
+to "git send-email" (substitute "v2" with the correct version if needed
+though).



-(5) In your commit message, make the summary line reasonably short (60 characters
+(3) In your commit message, make the summary line reasonably short (60 characters
 is typical), followed by a blank line, followed by any longer description of
 why your patch makes sense. If the patch fixes a regression, and you know what
 commit introduced the problem, mentioning that is useful. If the patch
@@ -87,7 +78,7 @@ is up to you if you want to include or omit them in the commit message.



-(6) Split large changes into a series of smaller patches, self-contained if
+(4) Split large changes into a series of smaller patches, self-contained if
 possible, with an explanation of each patch and an explanation of how the
 sequence of patches fits together. Moreover, please keep in mind that it's
 required to be able to compile cleanly (*including* "make check" and "make
@@ -98,10 +89,10 @@ things).



-(7) Make sure your patches apply against libvirt GIT. Developers only follow GIT
+(5) Make sure your patches apply against libvirt GIT. Developers only follow GIT
 and don't care much about released versions.

-(8) Run the automated tests on your code before submitting any changes. In
+(6) Run the automated tests on your code before submitting any changes. In
 particular, configure with compile warnings set to -Werror. This is done
 automatically for a git checkout; from a tarball, use:

@@ -118,7 +109,7 @@ issues, such as leaks or use of uninitialized variables.

 Some tests are skipped by default in a development environment, based on the
 time they take in comparison to the likelihood that those tests will turn up
-problems during incremental builds. These tests default to being run when
+problems during incremental builds. These tests default to being run when when
 building from a tarball or with the configure option --enable-expensive-tests;
 you can also force a one-time toggle of these tests by setting
 VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in:
@@ -141,20 +132,13 @@ Also, individual tests can be run from inside the "tests/" directory, like:

  ./qemuxml2xmltest

-If you are adding new test cases, or making changes that alter existing test
-output, you can use the environment variable VIR_TEST_REGENERATE_OUTPUT to
-quickly update the saved test data. Of course you still need to review the
-changes VERY CAREFULLY to ensure they are correct.
-
-  VIR_TEST_REGENERATE_OUTPUT=1 ./qemuxml2argvtest
-
 There is also a "./run" script at the top level, to make it easier to run
 programs that have not yet been installed, as well as to wrap invocations of
 various tests under gdb or Valgrind.



-(9) The Valgrind test should produce similar output to "make check". If the output
+(7) The Valgrind test should produce similar output to "make check". If the output
 has traces within libvirt API's, then investigation is required in order to
 determine the cause of the issue. Output such as the following indicates some
 sort of leak:
@@ -230,14 +214,14 @@ to "tests/.valgrind.supp" in order to suppress the warning:



-(10) Update tests and/or documentation, particularly if you are adding a new
+(8) Update tests and/or documentation, particularly if you are adding a new
 feature or changing the output of a program.



 There is more on this subject, including lots of links to background reading
 on the subject, on Richard Jones' guide to working with open source projects
-<http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/>.
+<http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/>.


 Code indentation
@@ -382,23 +366,16 @@ although use of a semicolon is not currently rejected.

 Curly braces
 ============
-Omit the curly braces around an "if", "while", "for" etc. body only when both
-that body and the condition itself occupy a single line. In every other case
-we require the braces. This ensures that it is trivially easy to identify a
-single-'statement' loop: each has only one 'line' in its body.
+Omit the curly braces around an "if", "while", "for" etc. body only when that
+body occupies a single line. In every other case we require the braces. This
+ensures that it is trivially easy to identify a single-'statement' loop: each
+has only one 'line' in its body.

-  while (expr)             // single line body; {} is forbidden
+Omitting braces with a single-line body is fine:
+
+  while (expr) // one-line body -> omitting curly braces is ok
      single_line_stmt();

-  while (expr(arg1,
-              arg2))      // indentation makes it obvious it is single line,
-      single_line_stmt(); // {} is optional (not enforced either way)
-
-  while (expr1 &&
-         expr2) {         // multi-line, at same indentation, {} required
-      single_line_stmt();
-  }
-
 However, the moment your loop/if/else body extends on to a second line, for
 whatever reason (even if it's just an added comment), then you should add
 braces. Otherwise, it would be too easy to insert a statement just before that
@@ -484,33 +461,6 @@ But if negating a complex condition is too ugly, then at least add braces:
      x = y;
  }

-Use hanging braces for compound statements: the opening brace of a compound
-statement should be on the same line as the condition being tested. Only
-top-level function bodies, nested scopes, and compound structure declarations
-should ever have { on a line by itself.
-
-  void
-  foo(int a, int b)
-  {                          // correct - function body
-      int 2d[][] = {
-        {                    // correct - complex initialization
-          1, 2,
-        },
-      };
-      if (a)
-      {                      // BAD: compound brace on its own line
-          do_stuff();
-      }
-      {                      // correct - nested scope
-          int tmp;
-          if (a < b) {       // correct - hanging brace
-              tmp = b;
-              b = a;
-              a = tmp;
-          }
-      }
-  }
-

 Preprocessor
 ============
@@ -527,7 +477,7 @@ Use parenthesis when checking if a macro is defined, and use indentation to
 track nesting:

  #if defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_FALLOCATE)
-  # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c)
+  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
  #endif


@@ -826,7 +776,7 @@ Variable length string buffer
 =============================
 If there is a need for complex string concatenations, avoid using the usual
 sequence of malloc/strcpy/strcat/snprintf functions and make use of the
-virBuffer API described in virbuffer.h
+virBuffer API described in buf.h

 Typical usage is as follows:

@@ -844,8 +794,11 @@ Typical usage is as follows:

     ...

-     if (virBufferCheckError(&buf) < 0)
+     if (virBufferError(&buf)) {
+         virBufferFreeAndReset(&buf);
+         virReportOOMError();
         return NULL;
+     }

     return virBufferContentAndReset(&buf);
  }
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \
  tests po examples/object-events examples/hellolibvirt \
  examples/dominfo examples/domsuspend examples/apparmor \
  examples/xml/nwfilter examples/openauth examples/systemtap \
-  tools/wireshark examples/dommigrate examples/polkit \
-  examples/lxcconvert examples/domtop examples/rename
+  tools/wireshark examples/dommigrate

 ACLOCAL_AMFLAGS = -I m4

@@ -38,9 +37,6 @@ EXTRA_DIST = \
  libvirt.spec libvirt.spec.in \
  mingw-libvirt.spec.in \
  libvirt.pc.in \
-  libvirt-qemu.pc.in \
-  libvirt-lxc.pc.in \
-  libvirt-admin.pc.in \
  autobuild.sh \
  Makefile.nonreentrant \
  autogen.sh \
@@ -50,7 +46,7 @@ EXTRA_DIST = \
  $(XML_EXAMPLES)

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc
+pkgconfig_DATA = libvirt.pc

 NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then			\
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,10 +20,6 @@ no_git=
 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
@@ -39,7 +35,7 @@ if test -z "$NOCONFIGURE" ; then
    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 "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
--- a/47
+++ b/47
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2013-12-05.23; # UTC

 # Bootstrap this package from checked-out sources.

-# Copyright (C) 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,9 +42,6 @@ export LC_ALL

 local_gl_dir=gl

-# Honour $PERL, but work even if there is none
-PERL="${PERL-perl}"
-
 me=$0

 usage() {
@@ -213,17 +210,7 @@ bootstrap_sync=false
 use_git=true

 check_exists() {
-  if test "$1" = "--verbose"; then
-    ($2 --version </dev/null) >/dev/null 2>&1
-    if test $? -ge 126; then
-      # If not found, run with diagnostics as one may be
-      # presented with env variables to set to find the right version
-      ($2 --version </dev/null)
-    fi
-  else
-    ($1 --version </dev/null) >/dev/null 2>&1
-  fi
-
+  ($1 --version </dev/null) >/dev/null 2>&1
  test $? -lt 126
 }

@@ -421,7 +408,7 @@ sort_ver() { # sort -V is not generally available
 get_version() {
  app=$1

-  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+  $app --version >/dev/null 2>&1 || return 1

  $app --version 2>&1 |
  sed -n '# Move version to start of line.
@@ -459,7 +446,6 @@ check_versions() {
    test "$appvar" = TAR && appvar=AMTAR
    case $appvar in
        GZIP) ;; # Do not use $GZIP:  it contains gzip options.
-        PERL::*) ;; # Keep perl modules as-is
        *) eval "app=\${$appvar-$app}" ;;
    esac

@@ -477,22 +463,11 @@ check_versions() {
          ret=1
          continue
        } ;;
-      # Another check is for perl modules.  These can be written as
-      # e.g. perl::XML::XPath in case of XML::XPath module, etc.
-      perl::*)
-        # Extract module name
-        app="${app#perl::}"
-        if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then
-          warn_ "Error: perl module '$app' not found"
-          ret=1
-        fi
-        continue
-        ;;
    esac
    if [ "$req_ver" = "-" ]; then
      # Merely require app to exist; not all prereq apps are well-behaved
      # so we have to rely on $? rather than get_version.
-      if ! check_exists --verbose $app; then
+      if ! check_exists $app; then
        warn_ "Error: '$app' not found"
        ret=1
      fi
@@ -623,8 +598,8 @@ case ${GNULIB_SRCDIR--} in
  # Note that $use_git is necessarily true in this case.
  if git_modules_config submodule.gnulib.url >/dev/null; then
    echo "$0: getting gnulib files..."
-    git submodule init -- "$gnulib_path" || exit $?
-    git submodule update -- "$gnulib_path" || exit $?
+    git submodule init || exit $?
+    git submodule update || exit $?

  elif [ ! -d "$gnulib_path" ]; then
    echo "$0: getting gnulib files..."
@@ -653,14 +628,13 @@ case ${GNULIB_SRCDIR--} in
      # This fallback allows at least git 1.5.5.
      if test -f "$gnulib_path"/gnulib-tool; then
        # Since file already exists, assume submodule init already complete.
-        git submodule update -- "$gnulib_path" || exit $?
+        git submodule update || exit $?
      else
        # Older git can't clone into an empty directory.
        rmdir "$gnulib_path" 2>/dev/null
        git clone --reference "$GNULIB_SRCDIR" \
          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
-          && git submodule init -- "$gnulib_path" \
-          && git submodule update -- "$gnulib_path" \
+          && git submodule init && git submodule update \
          || exit $?
      fi
    fi
@@ -915,8 +889,7 @@ if test $use_libtool = 1; then
  esac
 fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
-$gnulib_tool $gnulib_tool_options --import $gnulib_modules \
-  || die "gnulib-tool failed"
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&

 for file in $gnulib_files; do
  symlink_to_dir "$GNULIB_SRCDIR" $file \
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.

-# Copyright (C) 2010-2014 Red Hat, Inc.
+# Copyright (C) 2010-2013 Red Hat, Inc.

 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,6 @@ clock-time
 close
 connect
 configmake
-count-leading-zeros
 count-one-bits
 crypto/md5
 crypto/sha256
@@ -196,7 +195,10 @@ local_gl_dir=gnulib/local
 # Build prerequisites
 # Note that some of these programs are only required for 'make dist' to
 # succeed from a fresh git checkout; not all of these programs are
-# required to run 'make dist' on a tarball.
+# required to run 'make dist' on a tarball.  As a special case, we want
+# to require the equivalent of the Fedora python-devel package, but
+# RHEL 5 lacks the witness python-config package; we hack around that
+# old environment below.
 buildreq="\
 autoconf   2.59
 automake   1.9.6
@@ -207,13 +209,20 @@ gzip       -
 libtool    -
 patch      -
 perl       5.5
-perl::XML::XPath -
 pkg-config -
+python-config -
 rpcgen     -
 tar        -
 xmllint	   -
 xsltproc   -
 "
+# Use rpm as a fallback to bypass the bootstrap probe for python-config,
+# for the sake of RHEL 5; without requiring it on newer systems that
+# have python-config to begin with.
+if `(${PYTHON_CONFIG-python-config} --version;
+     test $? -lt 126 || rpm -q python-devel) >/dev/null 2>&1`; then
+  PYTHON_CONFIG=true
+fi

 # Automake requires that ChangeLog and AUTHORS exist.
 touch AUTHORS ChangeLog || exit 1
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -27,20 +27,13 @@ my $ret = 0;
 my $incomment = 0;

 foreach my $file (@ARGV) {
-    # Per-file variables for multiline Curly Bracket (cb_) check
-    my $cb_linenum = 0;
-    my $cb_code = "";
-    my $cb_scolon = 0;
-
    open FILE, $file;

    while (defined (my $line = <FILE>)) {
        my $data = $line;
-        # For temporary modifications
-        my $tmpdata;

-        # Kill any quoted , ; = or "
-        $data =~ s/'[";,=]'/'X'/g;
+        # Kill any quoted , ; or "
+        $data =~ s/'[";,]'/'X'/g;

        # Kill any quoted strings
        $data =~ s,"([^\\\"]|\\.)*","XXX",g;
@@ -84,17 +77,13 @@ foreach my $file (@ARGV) {
        #
        #  foo (*bar, wizz);
        #
-        # We also don't want to spoil the $data so it can be used
-        # later on.
-        $tmpdata = $data;
-        while ($tmpdata =~ /(\w+)\s\((?!\*)/) {
+        while ($data =~ /(\w+)\s\((?!\*)/) {
            my $kw = $1;

            # Allow space after keywords only
            if ($kw =~ /^(if|for|while|switch|return)$/) {
-                $tmpdata =~ s/($kw\s\()/XXX(/;
+                $data =~ s/($kw\s\()/XXX(/;
            } else {
-                print "Whitespace after non-keyword:\n";
                print "$file:$.: $line";
                $ret = 1;
                last;
@@ -103,26 +92,26 @@ foreach my $file (@ARGV) {

        # Require whitespace immediately after keywords,
        # but none after the opening bracket
-        if ($data =~ /\b(if|for|while|switch|return)\(/ ||
-            $data =~ /\b(if|for|while|switch|return)\s+\(\s/) {
-            print "No whitespace after keyword:\n";
+        while ($data =~ /\b(if|for|while|switch|return)\(/ ||
+               $data =~ /\b(if|for|while|switch|return)\s+\(\s/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Forbid whitespace between )( of a function typedef
-        if ($data =~ /\(\*\w+\)\s+\(/) {
-            print "Whitespace between ')' and '(':\n";
+        while ($data =~ /\(\*\w+\)\s+\(/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Forbid whitespace following ( or prior to )
-        if ($data =~ /\S\s+\)/ ||
-            $data =~ /\(\s+\S/) {
-            print "Whitespace after '(' or before ')':\n";
+        while ($data =~ /\S\s+\)/ ||
+               $data =~ /\(\s+\S/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Forbid whitespace before ";" or ",". Things like below are allowed:
@@ -135,67 +124,36 @@ foreach my $file (@ARGV) {
        #          errno == EINTR)
        #       ;
        #
-        if ($data =~ /[^;\s]\s+[;,]/) {
-            print "Whitespace before (semi)colon:\n";
+        while ($data =~ /[^;\s]\s+[;,]/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Require EOL, macro line continuation, or whitespace after ";".
        # Allow "for (;;)" as an exception.
-        if ($data =~ /;[^	 \\\n;)]/) {
-            print "Invalid character after semicolon:\n";
+        while ($data =~ /;[^	 \\\n;)]/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Require EOL, space, or enum/struct end after comma.
-        if ($data =~ /,[^ \\\n)}]/) {
-            print "Invalid character after comma:\n";
+        while ($data =~ /,[^ \\\n)}]/) {
            print "$file:$.: $line";
            $ret = 1;
+            last;
        }

        # Require spaces around assignment '=', compounds and '=='
        # with the exception of virAssertCmpInt()
-        $tmpdata = $data;
-        $tmpdata =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/;
-        if ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ ||
-            $tmpdata =~ /=[^= \\\n]/) {
-            print "Spacing around '=' or '==':\n";
+        while ($data =~ /[^!<>&|\-+*\/%\^'= ]=\+[^=]/ ||
+               $data =~ /[^!<>&|\-+*\/%\^'=]=[^= \\\n]/ ||
+               $data =~ /[\S]==/ ||
+               ($data =~ /==[^\s,]/ && $data !~ /[\s]virAssertCmpInt\(/)) {
            print "$file:$.: $line";
            $ret = 1;
-        }
-
-        # One line conditional statements with one line bodies should
-        # not use curly brackets.
-        if ($data =~ /^\s*(if|while|for)\b.*\{$/) {
-            $cb_linenum = $.;
-            $cb_code = $line;
-            $cb_scolon = 0;
-        }
-
-        # We need to check for exactly one semicolon inside the body,
-        # because empty statements (e.g. with comment only) are
-        # allowed
-        if ($cb_linenum == $. - 1 && $data =~ /^[^;]*;[^;]*$/) {
-            $cb_code .= $line;
-            $cb_scolon = 1;
-        }
-
-        if ($data =~ /^\s*}\s*$/ &&
-            $cb_linenum == $. - 2 &&
-            $cb_scolon) {
-
-            print "Curly brackets around single-line body:\n";
-            print "$file:$cb_linenum-$.:\n$cb_code$line";
-            $ret = 1;
-
-            # There _should_ be no need to reset the values; but to
-            # keep my inner peace...
-            $cb_linenum = 0;
-            $cb_scolon = 0;
-            $cb_code = "";
+            last;
        }
    }
    close FILE;
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2008-2015 Red Hat, Inc.
+# Copyright (C) 2008-2014 Red Hat, Inc.
 # Copyright (C) 2003-2008 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
@@ -90,7 +90,7 @@ endif

 # Files that should never cause syntax check failures.
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-  (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.(po|fig|gif|ico|png))$$
+  (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.po)$$

 # Functions like free() that are no-ops on NULL arguments.
 useless_free_options =				\
@@ -160,6 +160,7 @@ useless_free_options =				\
  --name=virNWFilterRuleDefFree			\
  --name=virNWFilterRuleInstFree		\
  --name=virNetworkDefFree			\
+  --name=virNetworkObjFree			\
  --name=virNodeDeviceDefFree			\
  --name=virNodeDeviceObjFree			\
  --name=virObjectUnref                         \
@@ -248,6 +249,8 @@ useless_free_options =				\
 # y virNetworkDefFree
 # n virNetworkFree (returns int)
 # n virNetworkFreeName (returns int)
+# y virNetworkObjFree
+# n virNetworkObjListFree FIXME
 # n virNodeDevCapsDefFree FIXME
 # y virNodeDeviceDefFree
 # n virNodeDeviceFree (returns int)
@@ -300,11 +303,10 @@ sc_flags_debug:
 # than d).  The existence of long long, and of documentation about
 # flags, makes the regex in the third test slightly harder.
 sc_flags_usage:
-	@test "$$(cat $(srcdir)/include/libvirt/libvirt-domain.h	\
+	@test "$$(cat $(srcdir)/include/libvirt/libvirt.h.in		\
 	    $(srcdir)/include/libvirt/virterror.h			\
 	    $(srcdir)/include/libvirt/libvirt-qemu.h			\
 	    $(srcdir)/include/libvirt/libvirt-lxc.h			\
-	    $(srcdir)/include/libvirt/libvirt-admin.h			\
 	  | grep -c '\(long\|unsigned\) flags')" != 4 &&		\
 	  { echo '$(ME): new API should use "unsigned int flags"' 1>&2;	\
 	    exit 1; } || :
@@ -565,13 +567,8 @@ sc_avoid_attribute_unused_in_header:
 	halt='use ATTRIBUTE_UNUSED in .c rather than .h files'		\
 	  $(_sc_search_regexp)

-sc_prohibit_int_index:
-	@prohibit='\<(int|unsigned)\s*\*?index\>(\s|,|;)'	\
-	halt='use different name than 'index' for declaration'	        \
-	  $(_sc_search_regexp)
-
 sc_prohibit_int_ijk:
-	@prohibit='\<(int|unsigned) ([^(=]* )*(i|j|k)\>(\s|,|;)'	\
+	@prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)\>(\s|,|;)'		\
 	halt='use size_t, not int/unsigned int for loop vars i, j, k'	\
 	  $(_sc_search_regexp)

@@ -587,12 +584,6 @@ sc_prohibit_loop_var_decl:
 	halt='declare loop iterators outside the for statement'		\
 	  $(_sc_search_regexp)

-# Use 'bool', not 'int', when assigning true or false
-sc_prohibit_int_assign_bool:
-	@prohibit='\<int\>.*= *(true|false)'				\
-	halt='use bool type for boolean values'				\
-	  $(_sc_search_regexp)
-
 # Many of the function names below came from this filter:
 # git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \
 # |sed 's/.*\.c-  *//'|perl -pe 's/ ?\(.*//'|sort -u \
@@ -689,7 +680,7 @@ sc_require_whitespace_in_translation:
 # Enforce recommended preprocessor indentation style.
 sc_preprocessor_indentation:
 	@if cppi --version >/dev/null 2>&1; then			\
-	  $(VC_LIST_EXCEPT) | grep -E '\.[ch](\.in)?$$' | xargs cppi -a -c	\
+	  $(VC_LIST_EXCEPT) | grep '\.[ch]$$' | xargs cppi -a -c	\
 	    || { echo '$(ME): incorrect preprocessor indentation' 1>&2;	\
 		exit 1; };						\
 	else								\
@@ -783,8 +774,8 @@ sc_prohibit_cross_inclusion:
 	    access/ | conf/) safe="($$dir|conf|util)";;			\
 	    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)";;	\
+	      safe="($$dir|util|conf)";;				\
+	    xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";;		\
 	    *) safe="($$dir|$(mid_dirs)|util)";;			\
 	  esac;								\
 	  in_vc_files="^src/$$dir"					\
@@ -919,26 +910,13 @@ sc_require_space_before_label:
 	halt="Top-level labels should be indented by one space"        \
 	  $(_sc_search_regexp)

-# Doesn't catch all cases of mismatched braces across if-else, but it helps
-sc_require_if_else_matching_braces:
-	@prohibit='(  else( if .*\))? {|} else( if .*\))?$$)'		\
-	in_vc_files='\.[chx]$$'						\
-	halt="if one side of if-else uses {}, both sides must use it"	\
-	  $(_sc_search_regexp)
-
 sc_curly_braces_style:
-	@files=$$($(VC_LIST_EXCEPT) | grep '\.[ch]$$');			\
-	if $(GREP) -nHP							\
-'^\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, 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,'	\
-		'see HACKING' 1>&2; exit 1;				\
-	fi
+	@files=$$($(VC_LIST_EXCEPT) | grep '\.[ch]$$');                \
+	$(GREP) -nHP                                                   \
+'^\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 && { echo '$(ME): Non-K&R style used for curly'        \
+			  'braces around function body, see'           \
+			  'HACKING' 1>&2; exit 1; } || :

 sc_prohibit_windows_special_chars_in_filename:
 	@files=$$($(VC_LIST_EXCEPT) | grep '[:*?"<>|]');               \
@@ -951,70 +929,9 @@ sc_prohibit_mixed_case_abbreviations:
 	halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi'	\
 	  $(_sc_search_regexp)

-# Require #include <locale.h> in all files that call setlocale()
-sc_require_locale_h:
-	@require='include.*locale\.h'					\
-	containing='setlocale *('					\
-	halt='setlocale() requires <locale.h>'				\
-	  $(_sc_search_regexp)
-
-sc_prohibit_empty_first_line:
-	@awk 'BEGIN { fail=0; }						\
-	FNR == 1 { if ($$0 == "") { print FILENAME ":1:"; fail=1; } }	\
-	END { if (fail == 1) {						\
-	  print "$(ME): Prohibited empty first line" > "/dev/stderr";	\
-	} exit fail; }' $$($(VC_LIST_EXCEPT));
-
-sc_prohibit_paren_brace:
-	@prohibit='\)\{$$'						\
-	in_vc_files='\.[chx]$$'						\
-	halt='Put space between closing parenthesis and opening brace'	\
-	  $(_sc_search_regexp)
-
-# C guarantees that static variables are zero initialized, and some compilers
-# waste space by sticking explicit initializers in .data instead of .bss
-sc_prohibit_static_zero_init:
-	@prohibit='\bstatic\b.*= *(0[^xX0-9]|NULL|false)'		\
-	in_vc_files='\.[chx](\.in)?$$'					\
-	halt='static variables do not need explicit zero initialization'\
-	  $(_sc_search_regexp)
-
-# FreeBSD exports the "devname" symbol which produces a warning.
-sc_prohibit_devname:
-	@prohibit='\bdevname\b'	\
-	exclude='sc_prohibit_devname' \
-	halt='avoid using 'devname' as FreeBSD exports the symbol' \
-	  $(_sc_search_regexp)
-
-sc_prohibit_system_error_with_vir_err:
-	@prohibit='\bvirReportSystemError *\(VIR_ERR_' \
-	halt='do not use virReportSystemError with VIR_ERR_* error codes' \
-	  $(_sc_search_regexp)
-
-# Rule to prohibit usage of virXXXFree within library, daemon, remote, etc.
-# functions. There's a corresponding exclude to allow usage within tests,
-# docs, examples, tools, src/libvirt-*.c, and include/libvirt/libvirt-*.h
-sc_prohibit_virXXXFree:
-	@prohibit='\bvir(Domain|Network|NodeDevice|StorageVol|StoragePool|Stream|Secret|NWFilter|Interface|DomainSnapshot)Free\b'	\
-	exclude='sc_prohibit_virXXXFree' \
-	halt='avoid using 'virXXXFree', use 'virObjectUnref' instead' \
-	  $(_sc_search_regexp)
-
-sc_prohibit_sysconf_pagesize:
-	@prohibit='sysconf\(_SC_PAGESIZE' \
-	halt='use virGetSystemPageSize[KB] instead of sysconf(_SC_PAGESIZE)' \
-	  $(_sc_search_regexp)
-
-sc_prohibit_pthread_create:
-	@prohibit='\bpthread_create\b' \
-	exclude='sc_prohibit_pthread_create' \
-	halt="avoid using 'pthread_create', use 'virThreadCreate' instead" \
-	  $(_sc_search_regexp)
-
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null

-ifneq ($(_gl-Makefile),)
 ifeq (0,$(MAKELEVEL))
  _curr_status = .git-module-status
  # The sed filter accommodates those who check out on a commit from which
@@ -1047,7 +964,6 @@ ifeq (0,$(MAKELEVEL))
 maint.mk Makefile: _autogen
  endif
 endif
-endif

 # It is necessary to call autogen any time gnulib changes.  Autogen
 # reruns configure, then we regenerate all Makefiles at once.
@@ -1057,38 +973,30 @@ _autogen:
 	./config.status

 # regenerate HACKING as part of the syntax-check
-ifneq ($(_gl-Makefile),)
 syntax-check: $(top_srcdir)/HACKING bracket-spacing-check
-endif

 bracket-spacing-check:
 	$(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
 	$(PERL) $(top_srcdir)/build-aux/bracket-spacing.pl $$files || \
-	  { echo '$(ME): incorrect formatting, see HACKING for rules' 1>&2; \
+	  { echo '$(ME): incorrect whitespace, see HACKING for rules' 1>&2; \
 	    exit 1; }

 # sc_po_check can fail if generated files are not built first
 sc_po_check: \
 		$(srcdir)/daemon/remote_dispatch.h \
 		$(srcdir)/daemon/qemu_dispatch.h \
-		$(srcdir)/src/remote/remote_client_bodies.h \
-		$(srcdir)/daemon/admin_dispatch.h \
-		$(srcdir)/src/admin/admin_client.h
+		$(srcdir)/src/remote/remote_client_bodies.h
 $(srcdir)/daemon/remote_dispatch.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C daemon remote_dispatch.h
 $(srcdir)/daemon/qemu_dispatch.h: $(srcdir)/src/remote/qemu_protocol.x
 	$(MAKE) -C daemon qemu_dispatch.h
 $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protocol.x
 	$(MAKE) -C src remote/remote_client_bodies.h
-$(srcdir)/daemon/admin_dispatch.h: $(srcdir)/src/admin/admin_protocol.x
-	$(MAKE) -C daemon admin_dispatch.h
-$(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x
-	$(MAKE) -C src admin/admin_client.h

 # List all syntax-check exemptions:
-exclude_file_name_regexp--sc_avoid_strcase = ^tools/vsh\.h$$
+exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$

-_src1=libvirt-stream|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virfile)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
 _test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock
 exclude_file_name_regexp--sc_avoid_write = \
  ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$
@@ -1115,13 +1023,13 @@ exclude_file_name_regexp--sc_prohibit_asprintf = \
  ^(bootstrap.conf$$|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$$)
+  ^(docs/|examples/|src/util/virstring\.c|tests/virnetserverclientmock.c$$)

 exclude_file_name_regexp--sc_prohibit_close = \
-  (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir(cgroup|pci)mock\.c)$$)
+  (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vir(cgroup|pci)mock\.c)$$)

 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
-  (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff$$)
+  (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.(gif|ico|png|diff)$$)

 _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
 exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
@@ -1139,7 +1047,7 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
  ^((po|tests)/|docs/.*(py|html\.in)|run.in$$|tools/wireshark/util/genxdrstub\.pl$$)

 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-  ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|vircgroupmock)\.c|tools/wireshark/src/packet-libvirt\.c)$$
+  ^(docs/hacking\.html\.in)|(src/util/viralloc\.[ch]|examples/.*|tests/securityselinuxhelper\.c|tests/vircgroupmock\.c|tools/wireshark/src/packet-libvirt.c)$$

 exclude_file_name_regexp--sc_prohibit_readlink = \
  ^src/(util/virutil|lxc/lxc_container)\.c$$
@@ -1147,11 +1055,12 @@ exclude_file_name_regexp--sc_prohibit_readlink = \
 exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/virutil\.c$$

 exclude_file_name_regexp--sc_prohibit_sprintf = \
-  (^docs/hacking\.html\.in|\.stp|\.pl)$$
+  ^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)|(tools/wireshark/util/genxdrstub\.pl)$$

 exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virstring\.c$$

-exclude_file_name_regexp--sc_prohibit_strtol = ^examples/dom.*/.*\.c$$
+exclude_file_name_regexp--sc_prohibit_strtol = \
+  ^(src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c)|(examples/domsuspend/suspend.c)$$

 exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$

@@ -1166,7 +1075,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \
 	^(examples/|tools/virsh-edit\.c$$)

 exclude_file_name_regexp--sc_trailing_blank = \
-  /qemuhelpdata/|/sysinfodata/.*\.data|/nodeinfodata/.*\.cpuinfo$$
+  (/qemuhelpdata/|/sysinfodata/.*\.data|\.(fig|gif|ico|png)$$)

 exclude_file_name_regexp--sc_unmarked_diagnostics = \
  ^(docs/apibuild.py|tests/virt-aa-helper-test)$$
@@ -1191,25 +1100,7 @@ exclude_file_name_regexp--sc_prohibit_getenv = \
  ^tests/.*\.[ch]$$

 exclude_file_name_regexp--sc_avoid_attribute_unused_in_header = \
-  ^(src/util/virlog\.h|src/network/bridge_driver\.h)$$
+  ^src/util/virlog\.h$$

 exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations = \
  ^src/(vbox/vbox_CAPI.*.h|esx/esx_vi.(c|h)|esx/esx_storage_backend_iscsi.c)$$
-
-exclude_file_name_regexp--sc_prohibit_empty_first_line = \
-  ^(README|daemon/THREADS\.txt|src/esx/README|docs/library.xen|tests/(vmwarever|nodeinfo)data/.*)$$
-
-exclude_file_name_regexp--sc_prohibit_useless_translation = \
-  ^tests/virpolkittest.c
-
-exclude_file_name_regexp--sc_prohibit_devname = \
-  ^(tools/virsh.pod|cfg.mk|docs/.*)$$
-
-exclude_file_name_regexp--sc_prohibit_virXXXFree = \
-  ^(docs/|tests/|examples/|tools/|cfg.mk|src/test/test_driver.c|src/libvirt_public.syms|include/libvirt/libvirt-(domain|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).h|src/libvirt-(domain|qemu|network|nodedev|storage|stream|secret|nwfilter|interface|domain-snapshot).c$$)
-
-exclude_file_name_regexp--sc_prohibit_sysconf_pagesize = \
-  ^(cfg\.mk|src/util/virutil\.c)$$
-
-exclude_file_name_regexp--sc_prohibit_pthread_create = \
-  ^(cfg\.mk|src/util/virthread\.c|tests/.*)$$
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.

-dnl Copyright (C) 2005-2015 Red Hat, Inc.
+dnl Copyright (C) 2005-2014 Red Hat, Inc.
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public
@@ -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], [1.2.20], [libvir-list@redhat.com], [], [http://libvirt.org])
+AC_INIT([libvirt], [1.2.5], [libvir-list@redhat.com], [], [http://libvirt.org])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -25,10 +25,6 @@ AC_CONFIG_MACRO_DIR([m4])
 dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep
 dnl quiet about the fact that we intentionally cater to automake 1.9
 AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar subdir-objects])
-dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
-dnl we don't really need the 'u' even in older toolchains.  Then there is
-dnl older libtool, which spelled it AR_FLAGS
-m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])

 # Maintainer note - comment this line out if you plan to rerun
 # GNULIB_POSIXCHECK testing to see if libvirt should be using more modules.
@@ -123,7 +119,6 @@ PARTED_REQUIRED="1.8.0"
 DEVMAPPER_REQUIRED=1.0.0
 LIBPCAP_REQUIRED="1.0.0"
 LIBNL_REQUIRED="1.1"
-PARALLELS_SDK_REQUIRED="7.0.22"

 dnl Checks for C compiler.
 AC_PROG_CC
@@ -252,7 +247,6 @@ LIBVIRT_CHECK_SELINUX
 LIBVIRT_CHECK_SSH2
 LIBVIRT_CHECK_SYSTEMD_DAEMON
 LIBVIRT_CHECK_UDEV
-LIBVIRT_CHECK_WIRESHARK
 LIBVIRT_CHECK_YAJL

 AC_MSG_CHECKING([for CPUID instruction])
@@ -281,7 +275,7 @@ dnl and various less common threadsafe functions
 AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \
  getmntent_r getpwuid_r getuid kill mmap newlocale posix_fallocate \
  posix_memalign prlimit regexec sched_getaffinity setgroups setns \
-  setrlimit symlink sysctlbyname getifaddrs sched_setscheduler])
+  setrlimit symlink sysctlbyname])

 dnl Availability of pthread functions. Because of $LIB_PTHREAD, we
 dnl cannot use AC_CHECK_FUNCS_ONCE. LIB_PTHREAD and LIBMULTITHREAD
@@ -389,11 +383,6 @@ AC_CHECK_TYPE([struct ifreq],
        #include <net/if.h>
  ]])

-AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO,
-                ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES],
-  [], [], [[#include <linux/ethtool.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.
@@ -402,7 +391,7 @@ AM_CONDITIONAL([HAVE_LIBTASN1], [test "x$ac_cv_header_libtasn1_h" = "xyes"])
 AC_CHECK_LIB([intl],[gettext],[])

 dnl Do we have rpcgen?
-AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no])
+AC_PATH_PROG([RPCGEN], [rpcgen], [no])
 AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"])
 dnl Is this GLIBC's buggy rpcgen?
 AM_CONDITIONAL([HAVE_GLIBC_RPCGEN],
@@ -436,8 +425,6 @@ AC_PATH_PROG([MODPROBE], [modprobe], [modprobe],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([RMMOD], [rmmod], [rmmod],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
-AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl],
-	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([SCRUB], [scrub], [scrub],
@@ -453,8 +440,6 @@ AC_DEFINE_UNQUOTED([RADVD],["$RADVD"],
        [Location or name of the radvd program])
 AC_DEFINE_UNQUOTED([TC],["$TC"],
        [Location or name of the tc program (see iproute2)])
-AC_DEFINE_UNQUOTED([MMCTL],["$MMCTL"],
-        [Location or name of the mm-ctl program])
 AC_DEFINE_UNQUOTED([OVSVSCTL],["$OVSVSCTL"],
        [Location or name of the ovs-vsctl program])

@@ -563,6 +548,10 @@ AC_ARG_WITH([hyperv],
  [AS_HELP_STRING([--with-hyperv],
    [add Hyper-V support @<:@default=check@:>@])])
 m4_divert_text([DEFAULTS], [with_hyperv=check])
+AC_ARG_WITH([parallels],
+  [AS_HELP_STRING([--with-parallels],
+    [add Parallels Cloud Server support @<:@default=check@:>@])])
+m4_divert_text([DEFAULTS], [with_parallels=check])
 AC_ARG_WITH([test],
  [AS_HELP_STRING([--with-test],
    [add test driver support @<:@default=yes@:>@])])
@@ -822,6 +811,7 @@ if test "$with_libvirtd" = "yes" ; then
 fi
 AM_CONDITIONAL([WITH_LIBVIRTD], [test "$with_libvirtd" = "yes"])

+
 old_LIBS="$LIBS"
 old_CFLAGS="$CFLAGS"
 LIBXENSERVER_LIBS=""
@@ -873,37 +863,24 @@ old_LIBS="$LIBS"
 old_CFLAGS="$CFLAGS"
 LIBXL_LIBS=""
 LIBXL_CFLAGS=""
-LIBXL_FIRMWARE_DIR=""
-LIBXL_EXECBIN_DIR=""
-
 dnl search for libxl, aka libxenlight
-dnl Xen > 4.5 introduced a pkgconfig file, check for it first
 fail=0
 if test "$with_libxl" != "no" ; then
-    PKG_CHECK_MODULES([LIBXL], [xenlight], [
-     LIBXL_FIRMWARE_DIR=`$PKG_CONFIG --variable xenfirmwaredir xenlight`
-     LIBXL_EXECBIN_DIR=`$PKG_CONFIG --variable libexec_bin xenlight`
-     LIBXL_LIBS="$LIBXL_LIBS -lxenctrl"
-     with_libxl=yes
-    ], [LIBXL_FOUND=no])
-    if test "$LIBXL_FOUND" = "no"; then
-        dnl No xenlight pkg-config file
-        if test "$with_libxl" != "yes" && test "$with_libxl" != "check" ; then
-            LIBXL_CFLAGS="-I$with_libxl/include"
-            LIBXL_LIBS="-L$with_libxl"
-        fi
-        CFLAGS="$CFLAGS $LIBXL_CFLAGS"
-        LIBS="$LIBS $LIBXL_LIBS"
-        AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [
-            with_libxl=yes
-            LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl"
-        ],[
-            if test "$with_libxl" = "yes"; then
-                fail=1
-            fi
-            with_libxl=no
-        ])
+    if test "$with_libxl" != "yes" && test "$with_libxl" != "check" ; then
+        LIBXL_CFLAGS="-I$with_libxl/include"
+        LIBXL_LIBS="-L$with_libxl"
    fi
+    CFLAGS="$CFLAGS $LIBXL_CFLAGS"
+    LIBS="$LIBS $LIBXL_LIBS"
+    AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [
+        with_libxl=yes
+        LIBXL_LIBS="$LIBXL_LIBS -lxenlight -lxenctrl"
+    ],[
+        if test "$with_libxl" = "yes"; then
+            fail=1
+        fi
+        with_libxl=no
+    ])
 fi

 LIBS="$old_LIBS"
@@ -914,16 +891,7 @@ if test $fail = 1; then
 fi

 if test "$with_libxl" = "yes"; then
-    dnl If building with libxl, use the libxl utility header and lib too
-    AC_CHECK_HEADERS([libxlutil.h])
-    LIBXL_LIBS="$LIBXL_LIBS -lxlutil"
    AC_DEFINE_UNQUOTED([WITH_LIBXL], 1, [whether libxenlight driver is enabled])
-    if test "x$LIBXL_FIRMWARE_DIR" != "x"; then
-        AC_DEFINE_UNQUOTED([LIBXL_FIRMWARE_DIR], ["$LIBXL_FIRMWARE_DIR"], [directory containing Xen firmware blobs])
-    fi
-    if test "x$LIBXL_EXECBIN_DIR" != "x"; then
-        AC_DEFINE_UNQUOTED([LIBXL_EXECBIN_DIR], ["$LIBXL_EXECBIN_DIR"], [directory containing Xen libexec binaries])
-    fi
 fi
 AM_CONDITIONAL([WITH_LIBXL], [test "$with_libxl" = "yes"])

@@ -999,7 +967,7 @@ AM_CONDITIONAL([WITH_XEN], [test "$with_xen" = "yes"])
 AC_SUBST([XEN_CFLAGS])
 AC_SUBST([XEN_LIBS])

-AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
+AM_CONDITIONAL([WITH_XENXS], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])

 dnl
 dnl check for kernel headers required by xen_inotify
@@ -1078,7 +1046,21 @@ dnl
 dnl Checks for the Parallels driver
 dnl

-LIBVIRT_DRIVER_CHECK_VZ
+if test "$with_parallels" = "check"; then
+    with_parallels=$with_linux
+    if test ! $host_cpu = 'x86_64'; then
+        with_parallels=no
+    fi
+fi
+
+if test "$with_parallels" = "yes" && test "$with_linux" = "no"; then
+    AC_MSG_ERROR([The Parallels driver can be enabled on Linux only.])
+fi
+
+if test "$with_parallels" = "yes"; then
+    AC_DEFINE_UNQUOTED([WITH_PARALLELS], 1, [whether Parallels driver is enabled])
+fi
+AM_CONDITIONAL([WITH_PARALLELS], [test "$with_parallels" = "yes"])

 dnl
 dnl Checks for bhyve driver
@@ -1339,28 +1321,24 @@ AC_ARG_WITH([polkit],
 with_polkit0=no
 with_polkit1=no
 if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then
-  dnl Check for new polkit first. We directly talk over DBus
-  dnl but we use existence of pkcheck binary as a sign that
-  dnl we should prefer polkit-1 over polkit-0, so we check
-  dnl for it even though we don't ultimately use it
+  dnl Check for new polkit first - just a binary
  AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])
  if test "x$PKCHECK_PATH" != "x" ; then
-    dnl Found pkcheck, so ensure dbus-devel is present
-    if test "x$with_dbus" = "xyes" ; then
-      AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,
-          [use PolicyKit for UNIX socket access checks])
-      AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,
-          [use PolicyKit for UNIX socket access checks])
-      with_polkit="yes"
-      with_polkit1="yes"
+    AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])
+    AC_MSG_CHECKING([whether pkcheck supports uid value])
+    pkcheck_supports_uid=`$PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1`
+    if test "x$pkcheck_supports_uid" = "xtrue"; then
+      AC_MSG_RESULT([yes])
+      AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck])
    else
-      if test "x$with_polkit" = "xcheck" ; then
-        with_polkit=no
-      else
-         AC_MSG_ERROR(
-           [You must install dbus to compile libvirt with polkit-1])
-      fi
+      AC_MSG_RESULT([no])
    fi
+    AC_DEFINE_UNQUOTED([WITH_POLKIT], 1,
+        [use PolicyKit for UNIX socket access checks])
+    AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1,
+        [use PolicyKit for UNIX socket access checks])
+    with_polkit="yes"
+    with_polkit1="yes"
  else
    dnl Check for old polkit second - library + binary
    PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED,
@@ -1409,7 +1387,7 @@ AC_ARG_WITH([firewalld],
 if test "x$with_firewalld" = "xcheck" ; then
   with_firewalld=$with_dbus
 fi
-if test "x$with_firewalld" = "xyes" ; then
+if test "x$with_firewalld" == "xyes" ; then
  if test "x$with_dbus" != "xyes" ; then
     AC_MSG_ERROR([You must have dbus enabled for firewalld support])
  fi
@@ -1670,6 +1648,10 @@ if test "$with_pm_utils" = "yes"; then
 fi
 AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"])

+dnl virsh libraries
+VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS"
+AC_SUBST([VIRSH_LIBS])
+
 dnl check if the network driver should be compiled

 AC_ARG_WITH([network],
@@ -1752,10 +1734,6 @@ AC_ARG_WITH([storage-gluster],
  [AS_HELP_STRING([--with-storage-gluster],
    [with Gluster backend for the storage driver @<:@default=check@:>@])],
  [],[with_storage_gluster=check])
-AC_ARG_WITH([storage-zfs],
-  [AS_HELP_STRING([--with-storage-zfs],
-    [with ZFS backend for the storage driver @<:@default=check@:>@])],
-  [],[with_storage_zfs=check])

 if test "$with_libvirtd" = "no"; then
  with_storage_dir=no
@@ -1768,7 +1746,6 @@ if test "$with_libvirtd" = "no"; then
  with_storage_rbd=no
  with_storage_sheepdog=no
  with_storage_gluster=no
-  with_storage_zfs=no
 fi
 if test "$with_storage_dir" = "yes" ; then
  AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled])
@@ -1949,14 +1926,14 @@ AC_SUBST([LIBRBD_LIBS])

 if test "$with_storage_sheepdog" = "yes" ||
   test "$with_storage_sheepdog" = "check"; then
-  AC_PATH_PROGS([SHEEPDOGCLI], [collie dog], [], [$PATH:/sbin:/usr/sbin])
+  AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])

  if test "$with_storage_sheepdog" = "yes"; then
-    if test -z "$SHEEPDOGCLI"; then
-      AC_MSG_ERROR([We need sheepdog client for Sheepdog storage driver])
+    if test -z "$COLLIE"; then
+      AC_MSG_ERROR([We need collie for Sheepdog storage driver])
    fi
  else
-    if test -z "$SHEEPDOGCLI"; then
+    if test -z "$COLLIE"; then
      with_storage_sheepdog=no
    fi

@@ -1968,7 +1945,7 @@ if test "$with_storage_sheepdog" = "yes" ||
  if test "$with_storage_sheepdog" = "yes"; then
    AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
      [whether Sheepdog backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([SHEEPDOGCLI],["$SHEEPDOGCLI"],[Location of sheepdog client program])
+    AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program])
  fi
 fi
 AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],
@@ -1986,43 +1963,6 @@ if test "$with_storage_gluster" = "yes"; then
 fi
 AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"])

-if test "$with_storage_zfs" = "check"; then
-    with_storage_zfs=$with_freebsd
-fi
-
-if test "$with_storage_zfs" = "yes" && test "$with_freebsd" = "no"; then
-    AC_MSG_ERROR([The ZFS storage driver can be enabled on FreeBSD only.])
-fi
-
-if test "$with_storage_zfs" = "yes" ||
-   test "$with_storage_zfs" = "check"; then
-  AC_PATH_PROG([ZFS], [zfs], [], [$PATH:/sbin:/usr/sbin])
-  AC_PATH_PROG([ZPOOL], [zpool], [], [$PATH:/sbin:/usr/sbin])
-
-  if test "$with_storage_zfs" = "yes"; then
-    if test -z "$ZFS" || test -z "$ZPOOL"; then
-      AC_MSG_ERROR([We need zfs and zpool for ZFS storage driver])
-    fi
-  else
-    if test -z "$ZFS" || test -z "$ZPOOL"; then
-      with_storage_zfs=no
-    fi
-
-    if test "$with_storage_zfs" = "check"; then
-      with_storage_zfs=yes
-    fi
-  fi
-
-  if test "$with_storage_zfs" = "yes"; then
-    AC_DEFINE_UNQUOTED([WITH_STORAGE_ZFS], 1,
-      [whether ZFS backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([ZFS], ["$ZFS"], [Location of zfs program])
-    AC_DEFINE_UNQUOTED([ZPOOL], ["$ZPOOL"], [Location of zpool program])
-  fi
-fi
-AM_CONDITIONAL([WITH_STORAGE_ZFS],
-  [test "$with_storage_zfs" = "yes"])
-
 if test "$with_storage_fs" = "yes" ||
   test "$with_storage_gluster" = "yes"; then
  AC_PATH_PROG([GLUSTER_CLI], [gluster], [], [$PATH:/sbin:/usr/sbin])
@@ -2188,19 +2128,9 @@ fi
 AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"])


-dnl
-dnl check for kernel headers required by btrfs ioctl
-dnl
-if test "$with_linux" = "yes"; then
-    AC_CHECK_HEADERS([linux/btrfs.h])
-fi
-
 dnl Allow perl/python overrides
 AC_PATH_PROGS([PYTHON], [python2 python])
 AC_PATH_PROG([PERL], [perl])
-if test -z "$PERL"; then
-         AC_MSG_ERROR([Failed to find perl.])
-fi

 AC_ARG_WITH([test-suite],
            [AS_HELP_STRING([--with-test-suite],
@@ -2342,7 +2272,6 @@ WIN32_EXTRA_CFLAGS=
 dnl libvirt.syms is generated in builddir, but libvirt_qemu.syms is in git;
 dnl hence the asymmetric naming of these two symbol files.
 LIBVIRT_SYMBOL_FILE=libvirt.syms
-LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.syms
 LIBVIRT_LXC_SYMBOL_FILE='$(srcdir)/libvirt_lxc.syms'
 LIBVIRT_QEMU_SYMBOL_FILE='$(srcdir)/libvirt_qemu.syms'
 MSCOM_LIBS=
@@ -2373,7 +2302,6 @@ case "$host" in
    # Also set the symbol file to .def, so src/Makefile generates libvirt.def
    # from libvirt.syms and passes libvirt.def instead of libvirt.syms to the linker
    LIBVIRT_SYMBOL_FILE=libvirt.def
-    LIBVIRT_ADMIN_SYMBOL_FILE=libvirt_admin.def
    LIBVIRT_LXC_SYMBOL_FILE=libvirt_lxc.def
    LIBVIRT_QEMU_SYMBOL_FILE=libvirt_qemu.def
    # mingw's ld has the --version-script parameter, but it requires a .def file
@@ -2389,7 +2317,6 @@ AC_SUBST([CYGWIN_EXTRA_LIBADD])
 AC_SUBST([MINGW_EXTRA_LDFLAGS])
 AC_SUBST([WIN32_EXTRA_CFLAGS])
 AC_SUBST([LIBVIRT_SYMBOL_FILE])
-AC_SUBST([LIBVIRT_ADMIN_SYMBOL_FILE])
 AC_SUBST([LIBVIRT_LXC_SYMBOL_FILE])
 AC_SUBST([LIBVIRT_QEMU_SYMBOL_FILE])
 AC_SUBST([VERSION_SCRIPT_FLAGS])
@@ -2519,9 +2446,6 @@ AC_ARG_WITH([qemu-group],
 AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
 AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])

-AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
-                  [/usr/libexec:/usr/lib/qemu])
-AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])

 AC_ARG_WITH([macvtap],
  [AS_HELP_STRING([--with-macvtap],
@@ -2642,11 +2566,7 @@ if test "$with_linux" = "yes"; then
             [whether the netlink v1 library is available])
        ], [
            if test "$with_macvtap" = "yes"; then
-                    if test "$LIBNL_REQUIRED" = "3.0";then
-                        AC_MSG_ERROR([libnl3-devel >= $LIBNL_REQUIRED is required for macvtap support])
-                    else
-                        AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support])
-                    fi
+                AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support])
            fi
        ])
    fi
@@ -2656,11 +2576,74 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"])
 AC_SUBST([LIBNL_CFLAGS])
 AC_SUBST([LIBNL_LIBS])

+dnl wireshark dissector
+
+AC_ARG_WITH([wireshark-dissector],
+  [AS_HELP_STRING([--with-wireshark-dissector],
+    [enable wireshark dissector plugin support @<:@default=check@:>@])],
+  [ with_wireshark_dissector=$withval ],
+  [ with_wireshark_dissector=check ])
+
+AC_DEFUN([LIBVIRT_WS_HANDLE_ERROR], [
+  if test "$with_wireshark_dissector" = "yes"; then
+    AC_MSG_ERROR([$1])
+  else
+    with_wireshark_dissector=no
+  fi
+])
+if test "$with_wireshark_dissector" != "no"; then
+    dnl Check for XDR headers existence
+    AC_CHECK_HEADERS([rpc/types.h])
+
+    dnl Check for glib-2.0 existence
+    PKG_CHECK_MODULES([GLIB], [glib-2.0], [
+      WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS `$PKG_CONFIG --cflags glib-2.0`"
+    ], [
+      LIBVIRT_WS_HANDLE_ERROR([pkg-config 'glib-2.0' is required for wireshark-dissector support])
+    ])
+
+    dnl Search for wireshark(or tshark) command
+    AC_PATH_PROG([WIRESHARK], [wireshark])
+    AC_PATH_PROG([WIRESHARK], [tshark])
+    if test -z "$WIRESHARK"; then
+        LIBVIRT_WS_HANDLE_ERROR([command not found wireshark or tshark])
+    else
+        dnl Check for wireshark headers
+        save_CPPFLAGS="$CPPFLAGS"
+        WS_DISSECTOR_CPPFLAGS="$WS_DISSECTOR_CPPFLAGS -I`dirname $WIRESHARK`/../include/wireshark"
+        CPPFLAGS="$CPPFLAGS $WS_DISSECTOR_CPPFLAGS"
+        AC_CHECK_HEADERS([wireshark/config.h],, [
+            LIBVIRT_WS_HANDLE_ERROR([wireshark/config.h is required for wireshark-dissector support])
+        ])
+        AC_CHECK_HEADERS([wireshark/epan/packet.h wireshark/epan/dissectors/packet-tcp.h],, [
+            LIBVIRT_WS_HANDLE_ERROR([wireshark/epan/{packet,packet-tcp}.h are required for wireshark-dissector support])
+        ], [
+          #include <wireshark/config.h>
+        ])
+        CPPFLAGS="$save_CPPFLAGS"
+    fi
+    if test "$with_wireshark_dissector" != "no"; then
+        with_wireshark_dissector=yes
+    fi
+fi
+AC_SUBST([WS_DISSECTOR_CPPFLAGS])
+AM_CONDITIONAL([WITH_WIRESHARK_DISSECTOR], [test "$with_wireshark_dissector" = "yes"])
+
+AC_ARG_WITH([ws-plugindir],
+  [AS_HELP_STRING([--with-ws-plugindir],
+    [wireshark plugins directory for use when installing wireshark plugin])],
+  [ws_plugindir=$withval])
+
+if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then
+    ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '`
+    ws_plugindir="$libdir/wireshark/plugins/$ws_version"
+fi
+AC_SUBST([ws_plugindir])
+
 # Check for Linux vs. BSD ifreq members
 AC_CHECK_MEMBERS([struct ifreq.ifr_newname,
                  struct ifreq.ifr_ifindex,
-                  struct ifreq.ifr_index,
-                  struct ifreq.ifr_hwaddr],
+                  struct ifreq.ifr_index],
                 [], [],
                 [#include <sys/socket.h>
                  #include <net/if.h>
@@ -2708,17 +2691,6 @@ if test $with_freebsd = yes; then
                 )
 fi

-# FreeBSD 10-STABLE requires _IFI_OQDROPS to be defined for if_data.ifi_oqdrops
-# field be available
-old_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -D_IFI_OQDROPS"
-
-AC_CHECK_MEMBERS([struct if_data.ifi_oqdrops],
-		 [],
-		 [CFLAGS="$old_CFLAGS"],
-		 [#include <net/if.h>
-		 ])
-
 # Check if we need to look for ifconfig
 if test "$want_ifconfig" = "yes"; then
     AC_PATH_PROG([IFCONFIG_PATH], [ifconfig])
@@ -2743,31 +2715,6 @@ test "x$lv_cv_static_analysis" = xyes && t=1
 AC_DEFINE_UNQUOTED([STATIC_ANALYSIS], [$t],
  [Define to 1 when performing static analysis.])

-AC_ARG_WITH([default-editor],
-  [AS_HELP_STRING([--with-default-editor],
-    [Editor to use for interactive commands
-     @<:@default=vi@:>@])],
-  [DEFAULT_EDITOR=${withval}],
-  [DEFAULT_EDITOR=vi])
-AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$DEFAULT_EDITOR"], [Default editor to use])
-
-AC_ARG_WITH([loader-nvram],
-  [AS_HELP_STRING([--with-loader-nvram],
-    [Pass list of pairs of <loader>:<nvram> paths. Both
-     pairs and list items are separated by a colon.
-     @<:default=paths to OVMF and its clones@:>@])],
-     [if test "$withval" = "no"; then
-        withval=""
-      else
-        l=`echo $withval | tr ':' '\n' | wc -l`
-        if test "`expr $l % 2`" -ne 0; then
-            AC_MSG_ERROR([Malformed --with-loader-nvram argument])
-        fi
-      fi
-      AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM],
-                          ["$withval"],
-                          [List of loader:nvram pairs])])
-
 # Some GNULIB base64 symbols clash with a kerberos library
 AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash])
 AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash])
@@ -2780,14 +2727,7 @@ AC_CONFIG_FILES([\
        docs/schemas/Makefile \
        gnulib/lib/Makefile \
        gnulib/tests/Makefile \
-        libvirt.pc \
-        libvirt-qemu.pc \
-        libvirt-lxc.pc \
-        libvirt-admin.pc \
-        src/libvirt.pc \
-        src/libvirt-qemu.pc \
-        src/libvirt-lxc.pc \
-        libvirt.spec mingw-libvirt.spec \
+        libvirt.pc libvirt.spec mingw-libvirt.spec \
        po/Makefile.in \
        include/libvirt/Makefile include/libvirt/libvirt.h \
        daemon/Makefile \
@@ -2798,14 +2738,10 @@ AC_CONFIG_FILES([\
        examples/domsuspend/Makefile \
        examples/dominfo/Makefile \
        examples/dommigrate/Makefile \
-        examples/domtop/Makefile \
        examples/openauth/Makefile \
        examples/hellolibvirt/Makefile \
-        examples/rename/Makefile \
        examples/systemtap/Makefile \
        examples/xml/nwfilter/Makefile \
-        examples/lxcconvert/Makefile \
-        examples/polkit/Makefile \
        tools/wireshark/Makefile \
        tools/wireshark/src/Makefile])
 AC_OUTPUT
@@ -2828,7 +2764,7 @@ AC_MSG_NOTICE([      LXC: $with_lxc])
 AC_MSG_NOTICE([     PHYP: $with_phyp])
 AC_MSG_NOTICE([      ESX: $with_esx])
 AC_MSG_NOTICE([  Hyper-V: $with_hyperv])
-LIBVIRT_DRIVER_RESULT_VZ
+AC_MSG_NOTICE([Parallels: $with_parallels])
 LIBVIRT_DRIVER_RESULT_BHYVE
 AC_MSG_NOTICE([     Test: $with_test])
 AC_MSG_NOTICE([   Remote: $with_remote])
@@ -2851,7 +2787,6 @@ AC_MSG_NOTICE([    Disk: $with_storage_disk])
 AC_MSG_NOTICE([     RBD: $with_storage_rbd])
 AC_MSG_NOTICE([Sheepdog: $with_storage_sheepdog])
 AC_MSG_NOTICE([ Gluster: $with_storage_gluster])
-AC_MSG_NOTICE([     ZFS: $with_storage_zfs])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Security Drivers])
 AC_MSG_NOTICE([])
@@ -2890,7 +2825,6 @@ LIBVIRT_RESULT_SELINUX
 LIBVIRT_RESULT_SSH2
 LIBVIRT_RESULT_SYSTEMD_DAEMON
 LIBVIRT_RESULT_UDEV
-LIBVIRT_RESULT_WIRESHARK
 LIBVIRT_RESULT_YAJL
 AC_MSG_NOTICE([  libxml: $LIBXML_CFLAGS $LIBXML_LIBS])
 AC_MSG_NOTICE([  dlopen: $DLOPEN_LIBS])
@@ -2959,8 +2893,8 @@ AC_MSG_NOTICE([pm-utils: $with_pm_utils])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Test suite])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([         Coverage: $enable_coverage])
-AC_MSG_NOTICE([        Alloc OOM: $enable_oom])
+AC_MSG_NOTICE([   Coverage: $enable_coverage])
+AC_MSG_NOTICE([  Alloc OOM: $enable_oom])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Miscellaneous])
 AC_MSG_NOTICE([])
@@ -2972,8 +2906,6 @@ AC_MSG_NOTICE([            numad: $with_numad])
 AC_MSG_NOTICE([      XML Catalog: $XML_CATALOG_FILE])
 AC_MSG_NOTICE([      Init script: $with_init_script])
 AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files])
-AC_MSG_NOTICE([   Default Editor: $DEFAULT_EDITOR])
-AC_MSG_NOTICE([     Loader/NVRAM: $with_loader_nvram])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Developer Tools])
 AC_MSG_NOTICE([])
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in

-## Copyright (C) 2005-2015 Red Hat, Inc.
+## Copyright (C) 2005-2014 Red Hat, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,6 @@ INCLUDES = \
 	-I$(top_srcdir)/src/conf \
 	-I$(top_srcdir)/src/rpc \
 	-I$(top_srcdir)/src/remote \
-	-I$(top_srcdir)/src/admin \
 	-I$(top_srcdir)/src/access \
 	$(GETTEXT_CPPFLAGS)

@@ -35,7 +34,6 @@ DAEMON_GENERATED =			\
 		remote_dispatch.h	\
 		lxc_dispatch.h		\
 		qemu_dispatch.h		\
-		admin_dispatch.h	\
 		$(NULL)

 DAEMON_SOURCES =					\
@@ -51,22 +49,18 @@ EXTRA_DIST =						\
 	remote_dispatch.h				\
 	lxc_dispatch.h					\
 	qemu_dispatch.h					\
-	admin_dispatch.h				\
 	libvirtd.conf					\
 	libvirtd.init.in				\
 	libvirtd.upstart				\
 	libvirtd.policy.in				\
-	libvirt.rules					\
 	libvirtd.sasl					\
 	libvirtd.service.in				\
-	libvirtd.socket.in				\
 	libvirtd.sysconf				\
 	libvirtd.sysctl					\
 	libvirtd.aug                                    \
 	libvirtd.logrotate.in                           \
 	libvirtd.qemu.logrotate.in                      \
 	libvirtd.lxc.logrotate.in                       \
-	libvirtd.libxl.logrotate.in                     \
 	libvirtd.uml.logrotate.in                       \
 	test_libvirtd.aug.in                             \
 	THREADS.txt					\
@@ -81,32 +75,25 @@ BUILT_SOURCES =
 REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
 LXC_PROTOCOL = $(top_srcdir)/src/remote/lxc_protocol.x
 QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
-ADMIN_PROTOCOL = $(top_srcdir)/src/admin/admin_protocol.x

-remote_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+remote_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
 		$(REMOTE_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
 	  --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
 	  > $(srcdir)/remote_dispatch.h

-lxc_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+lxc_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
 		$(LXC_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
 	  --mode=server lxc LXC $(LXC_PROTOCOL) \
 	  > $(srcdir)/lxc_dispatch.h

-qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
+qemu_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
 		$(QEMU_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
+	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
 	  --mode=server qemu QEMU $(QEMU_PROTOCOL) \
 	  > $(srcdir)/qemu_dispatch.h

-admin_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
-		$(ADMIN_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
-	  --mode=server admin ADMIN $(ADMIN_PROTOCOL) \
-	  > $(srcdir)/admin_dispatch.h
-
 if WITH_LIBVIRTD

 # Build a convenience library, for reuse in tests/libvirtdconftest
@@ -126,27 +113,6 @@ libvirtd_conf_la_LDFLAGS =				\
 	$(NULL)
 libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)

-noinst_LTLIBRARIES += libvirtd_admin.la
-libvirtd_admin_la_SOURCES = \
-		admin_server.c admin_server.h
-
-libvirtd_admin_la_CFLAGS = \
-		$(AM_CFLAGS)		\
-		$(XDR_CFLAGS)		\
-		$(PIE_CFLAGS)		\
-		$(WARN_CFLAGS)		\
-		$(LIBXML_CFLAGS)	\
-		$(COVERAGE_CFLAGS)	\
-		$(NULL)
-libvirtd_admin_la_LDFLAGS = \
-		$(PIE_LDFLAGS)		\
-		$(RELRO_LDFLAGS)	\
-		$(COVERAGE_LDFLAGS)	\
-		$(NO_INDIRECT_LDFLAGS)  \
-		$(NULL)
-libvirtd_admin_la_LIBADD =	\
-		../src/libvirt-admin.la
-
 man8_MANS = libvirtd.8

 sbin_PROGRAMS = libvirtd
@@ -174,7 +140,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES)
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
 libvirtd_CFLAGS = \
 	$(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \
-	$(XDR_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
+	$(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \
 	$(WARN_CFLAGS) $(PIE_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
@@ -191,6 +157,7 @@ libvirtd_LDADD =					\
 	$(GNUTLS_LIBS)					\
 	$(SASL_LIBS)					\
 	$(DBUS_LIBS)					\
+	$(POLKIT_LIBS)					\
 	$(LIBNL_LIBS)

 if WITH_DTRACE_PROBES
@@ -199,7 +166,6 @@ endif WITH_DTRACE_PROBES

 libvirtd_LDADD += \
 	libvirtd_conf.la \
-	libvirtd_admin.la \
 	../src/libvirt-lxc.la \
 	../src/libvirt-qemu.la \
 	../src/libvirt_driver_remote.la \
@@ -267,8 +233,6 @@ policyauth = auth_admin_keep_session
 else ! WITH_POLKIT0
 policydir = $(datadir)/polkit-1/actions
 policyauth = auth_admin_keep
-rulesdir = $(datadir)/polkit-1/rules.d
-rulesfile = libvirt.rules
 endif ! WITH_POLKIT0
 endif WITH_POLKIT

@@ -299,19 +263,9 @@ if WITH_POLKIT
 install-data-polkit::
 	$(MKDIR_P) $(DESTDIR)$(policydir)
 	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-if ! WITH_POLKIT0
-	$(MKDIR_P) $(DESTDIR)$(rulesdir)
-	$(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules
-endif ! WITH_POLKIT0
-
 uninstall-data-polkit::
 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
 	rmdir $(DESTDIR)$(policydir) || :
-if ! WITH_POLKIT0
-	rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules
-	rmdir $(DESTDIR)$(rulesdir) || :
-endif ! WITH_POLKIT0
-
 else ! WITH_POLKIT
 install-data-polkit::
 uninstall-data-polkit::
@@ -319,11 +273,9 @@ endif ! WITH_POLKIT

 remote.c: $(DAEMON_GENERATED)
 remote.h: $(DAEMON_GENERATED)
-admin_server.c: $(DAEMON_GENERATED)

 LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
-		  libvirtd.libxl.logrotate libvirtd.uml.logrotate \
-		  libvirtd.logrotate
+		  libvirtd.uml.logrotate libvirtd.logrotate

 BUILT_SOURCES += $(LOGROTATE_CONFS)

@@ -345,12 +297,6 @@ libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
 	    < $< > $@-t &&					\
 	    mv $@-t $@

-libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
-	    mv $@-t $@
-
 libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
 	$(AM_V_GEN)sed						\
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
@@ -368,8 +314,6 @@ install-logrotate: $(LOGROTATE_CONFS)
 		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu
 	$(INSTALL_DATA) libvirtd.lxc.logrotate \
 		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc
-	$(INSTALL_DATA) libvirtd.libxl.logrotate \
-		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl
 	$(INSTALL_DATA) libvirtd.uml.logrotate \
 		$(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml

@@ -377,7 +321,6 @@ uninstall-logrotate:
 	rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \
 	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu \
 	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc \
-	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl \
 	      $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml
 	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || :
 	rmdir $(DESTDIR)$(localstatedir)/log/libvirt/lxc || :
@@ -398,10 +341,10 @@ if WITH_SYSCTL
 install-sysctl:
 	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
 	$(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
-	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+	  $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf

 uninstall-sysctl:
-	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+	rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/libvirtd.conf
 	rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
 else ! WITH_SYSCTL
 install-sysctl:
@@ -445,18 +388,15 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
 if LIBVIRT_INIT_SCRIPT_SYSTEMD

 SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
-BUILT_SOURCES += libvirtd.service libvirtd.socket
+BUILT_SOURCES += libvirtd.service

-install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket
+install-init-systemd: install-sysconfig libvirtd.service
 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
 	$(INSTALL_DATA) libvirtd.service \
 	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
-	$(INSTALL_DATA) libvirtd.socket \
-	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket

 uninstall-init-systemd: uninstall-sysconfig
 	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
-	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket
 	rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
 else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
 install-init-systemd:
@@ -480,12 +420,6 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
 	    < $< > $@-t &&					\
 	    mv $@-t $@

-libvirtd.socket: libvirtd.socket.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]runstatedir[@]|$(runstatedir)|g'		\
-	    < $< > $@-t &&					\
-	    mv $@-t $@
-

 check-local: check-augeas

--- a/daemon/admin_server.c
+++ b/daemon/admin_server.c
@@ -1,117 +0,0 @@
-/*
- * admin_server.c:
- *
- * Copyright (C) 2014-2015 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
- */
-
-#include <config.h>
-
-#include "internal.h"
-#include "libvirtd.h"
-#include "libvirt_internal.h"
-
-#include "admin_protocol.h"
-#include "admin_server.h"
-#include "datatypes.h"
-#include "viralloc.h"
-#include "virerror.h"
-#include "virlog.h"
-#include "virnetdaemon.h"
-#include "virnetserver.h"
-#include "virstring.h"
-#include "virthreadjob.h"
-
-#define VIR_FROM_THIS VIR_FROM_ADMIN
-
-VIR_LOG_INIT("daemon.admin");
-
-
-void
-remoteAdmClientFreeFunc(void *data)
-{
-    struct daemonAdmClientPrivate *priv = data;
-
-    virMutexDestroy(&priv->lock);
-    virObjectUnref(priv->dmn);
-    VIR_FREE(priv);
-}
-
-void *
-remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                        void *opaque)
-{
-    struct daemonAdmClientPrivate *priv;
-
-    if (VIR_ALLOC(priv) < 0)
-        return NULL;
-
-    if (virMutexInit(&priv->lock) < 0) {
-        VIR_FREE(priv);
-        virReportSystemError(errno, "%s", _("unable to init mutex"));
-        return NULL;
-    }
-
-    /*
-     * We don't necessarily need to ref this object right now as there
-     * must be one ref being held throughout the life of the daemon,
-     * but let's just be safe for future.
-     */
-    priv->dmn = virObjectRef(opaque);
-
-    return priv;
-}
-
-/* Functions */
-static int
-adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
-                         virNetServerClientPtr client,
-                         virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                         virNetMessageErrorPtr rerr,
-                         struct admin_connect_open_args *args)
-{
-    unsigned int flags;
-    struct daemonAdmClientPrivate *priv =
-        virNetServerClientGetPrivateData(client);
-    int ret = -1;
-
-    VIR_DEBUG("priv=%p dmn=%p", priv, priv->dmn);
-    virMutexLock(&priv->lock);
-
-    flags = args->flags;
-    virCheckFlagsGoto(0, cleanup);
-
-    ret = 0;
- cleanup:
-    if (ret < 0)
-        virNetMessageSaveError(rerr);
-    virMutexUnlock(&priv->lock);
-    return ret;
-}
-
-static int
-adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,
-                          virNetServerClientPtr client,
-                          virNetMessagePtr msg ATTRIBUTE_UNUSED,
-                          virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
-{
-    virNetServerClientDelayedClose(client);
-    return 0;
-}
-
-#include "admin_dispatch.h"
--- a/daemon/admin_server.h
+++ b/daemon/admin_server.h
@@ -1,36 +0,0 @@
-/*
- * admin_server.h
- *
- * Copyright (C) 2014 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: Martin Kletzander <mkletzan@redhat.com>
- */
-
-#ifndef __LIBVIRTD_ADMIN_H__
-# define __LIBVIRTD_ADMIN_H__
-
-# include "rpc/virnetserverprogram.h"
-# include "rpc/virnetserverclient.h"
-
-
-extern virNetServerProgramProc adminProcs[];
-extern size_t adminNProcs;
-
-void remoteAdmClientFreeFunc(void *data);
-void *remoteAdmClientInitHook(virNetServerClientPtr client, void *opaque);
-
-#endif /* __ADMIN_REMOTE_H__ */
--- a/daemon/libvirt.rules
+++ b/daemon/libvirt.rules
@@ -1,9 +0,0 @@
-// Allow any user in the 'libvirt' group to connect to system libvirtd
-// without entering a password.
-
-polkit.addRule(function(action, subject) {
-    if (action.id == "org.libvirt.unix.manage" &&
-        subject.isInGroup("libvirt")) {
-        return polkit.Result.YES;
-    }
-});
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -1,7 +1,7 @@
 /*
 * libvirtd-config.c: daemon start of day, guest process & i/o management
 *
- * Copyright (C) 2006-2012, 2014, 2015 Red Hat, Inc.
+ * Copyright (C) 2006-2012, 2014 Red Hat, Inc.
 * Copyright (C) 2006 Daniel P. Berrange
 *
 * This library is free software; you can redistribute it and/or
@@ -123,8 +123,8 @@ checkType(virConfValuePtr p, const char *filename,
        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                       _("remoteReadConfigFile: %s: %s: invalid type:"
                         " got %s; expected %s"), filename, key,
-                       virConfTypeToString(p->type),
-                       virConfTypeToString(required_type));
+                       virConfTypeName(p->type),
+                       virConfTypeName(required_type));
        return -1;
    }
    return 0;
@@ -146,30 +146,17 @@ checkType(virConfValuePtr p, const char *filename,
        }                                                               \
    } while (0)

-/* Like GET_CONF_STR, but for signed integral values.  */
+/* Like GET_CONF_STR, but for integral values.  */
 #define GET_CONF_INT(conf, filename, var_name)                          \
    do {                                                                \
        virConfValuePtr p = virConfGetValue(conf, #var_name);           \
        if (p) {                                                        \
-            if (p->type != VIR_CONF_ULONG &&                            \
-                checkType(p, filename, #var_name, VIR_CONF_LONG) < 0)   \
+            if (checkType(p, filename, #var_name, VIR_CONF_LONG) < 0)   \
                goto error;                                             \
            data->var_name = p->l;                                      \
        }                                                               \
    } while (0)

-/* Like GET_CONF_STR, but for unsigned integral values.  */
-#define GET_CONF_UINT(conf, filename, var_name)                         \
-    do {                                                                \
-        virConfValuePtr p = virConfGetValue(conf, #var_name);           \
-        if (p) {                                                        \
-            if (checkType(p, filename, #var_name, VIR_CONF_ULONG) < 0)  \
-                goto error;                                             \
-            data->var_name = p->l;                                      \
-        }                                                               \
-    } while (0)
-
-

 static int
 remoteConfigGetAuth(virConfPtr conf,
@@ -264,8 +251,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)

    if (VIR_STRDUP(data->unix_sock_rw_perms,
                   data->auth_unix_rw == REMOTE_AUTH_POLKIT ? "0777" : "0700") < 0 ||
-        VIR_STRDUP(data->unix_sock_ro_perms, "0777") < 0 ||
-        VIR_STRDUP(data->unix_sock_admin_perms, "0700") < 0)
+        VIR_STRDUP(data->unix_sock_ro_perms, "0777") < 0)
        goto error;

 #if WITH_SASL
@@ -292,15 +278,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)

    data->keepalive_interval = 5;
    data->keepalive_count = 5;
-
-    data->admin_min_workers = 5;
-    data->admin_max_workers = 20;
-    data->admin_max_clients = 5000;
-    data->admin_max_queued_clients = 20;
-    data->admin_max_client_requests = 5;
-
-    data->admin_keepalive_interval = 5;
-    data->admin_keepalive_count = 5;
+    data->keepalive_required = 0;

    localhost = virGetHostname();
    if (localhost == NULL) {
@@ -346,7 +324,6 @@ daemonConfigFree(struct daemonConfig *data)
    }
    VIR_FREE(data->access_drivers);

-    VIR_FREE(data->unix_sock_admin_perms);
    VIR_FREE(data->unix_sock_ro_perms);
    VIR_FREE(data->unix_sock_rw_perms);
    VIR_FREE(data->unix_sock_group);
@@ -384,8 +361,8 @@ daemonConfigLoadOptions(struct daemonConfig *data,
                        const char *filename,
                        virConfPtr conf)
 {
-    GET_CONF_UINT(conf, filename, listen_tcp);
-    GET_CONF_UINT(conf, filename, listen_tls);
+    GET_CONF_INT(conf, filename, listen_tcp);
+    GET_CONF_INT(conf, filename, listen_tls);
    GET_CONF_STR(conf, filename, tls_port);
    GET_CONF_STR(conf, filename, tcp_port);
    GET_CONF_STR(conf, filename, listen_addr);
@@ -414,17 +391,16 @@ daemonConfigLoadOptions(struct daemonConfig *data,
        goto error;

    GET_CONF_STR(conf, filename, unix_sock_group);
-    GET_CONF_STR(conf, filename, unix_sock_admin_perms);
    GET_CONF_STR(conf, filename, unix_sock_ro_perms);
    GET_CONF_STR(conf, filename, unix_sock_rw_perms);

    GET_CONF_STR(conf, filename, unix_sock_dir);

-    GET_CONF_UINT(conf, filename, mdns_adv);
+    GET_CONF_INT(conf, filename, mdns_adv);
    GET_CONF_STR(conf, filename, mdns_name);

-    GET_CONF_UINT(conf, filename, tls_no_sanity_certificate);
-    GET_CONF_UINT(conf, filename, tls_no_verify_certificate);
+    GET_CONF_INT(conf, filename, tls_no_sanity_certificate);
+    GET_CONF_INT(conf, filename, tls_no_verify_certificate);

    GET_CONF_STR(conf, filename, key_file);
    GET_CONF_STR(conf, filename, cert_file);
@@ -441,37 +417,29 @@ daemonConfigLoadOptions(struct daemonConfig *data,
        goto error;


-    GET_CONF_UINT(conf, filename, min_workers);
-    GET_CONF_UINT(conf, filename, max_workers);
-    GET_CONF_UINT(conf, filename, max_clients);
-    GET_CONF_UINT(conf, filename, max_queued_clients);
-    GET_CONF_UINT(conf, filename, max_anonymous_clients);
+    GET_CONF_INT(conf, filename, min_workers);
+    GET_CONF_INT(conf, filename, max_workers);
+    GET_CONF_INT(conf, filename, max_clients);
+    GET_CONF_INT(conf, filename, max_queued_clients);
+    GET_CONF_INT(conf, filename, max_anonymous_clients);

-    GET_CONF_UINT(conf, filename, prio_workers);
+    GET_CONF_INT(conf, filename, prio_workers);

    GET_CONF_INT(conf, filename, max_requests);
-    GET_CONF_UINT(conf, filename, max_client_requests);
+    GET_CONF_INT(conf, filename, max_client_requests);

-    GET_CONF_UINT(conf, filename, admin_min_workers);
-    GET_CONF_UINT(conf, filename, admin_max_workers);
-    GET_CONF_UINT(conf, filename, admin_max_clients);
-    GET_CONF_UINT(conf, filename, admin_max_queued_clients);
-    GET_CONF_UINT(conf, filename, admin_max_client_requests);
-
-    GET_CONF_UINT(conf, filename, audit_level);
-    GET_CONF_UINT(conf, filename, audit_logging);
+    GET_CONF_INT(conf, filename, audit_level);
+    GET_CONF_INT(conf, filename, audit_logging);

    GET_CONF_STR(conf, filename, host_uuid);

-    GET_CONF_UINT(conf, filename, log_level);
+    GET_CONF_INT(conf, filename, log_level);
    GET_CONF_STR(conf, filename, log_filters);
    GET_CONF_STR(conf, filename, log_outputs);

    GET_CONF_INT(conf, filename, keepalive_interval);
-    GET_CONF_UINT(conf, filename, keepalive_count);
-
-    GET_CONF_INT(conf, filename, admin_keepalive_interval);
-    GET_CONF_UINT(conf, filename, admin_keepalive_count);
+    GET_CONF_INT(conf, filename, keepalive_count);
+    GET_CONF_INT(conf, filename, keepalive_required);

    return 0;

--- a/daemon/libvirtd-config.h
+++ b/daemon/libvirtd-config.h
@@ -1,7 +1,7 @@
 /*
 * libvirtd-config.h: daemon start of day, guest process & i/o management
 *
- * Copyright (C) 2006-2012, 2015 Red Hat, Inc.
+ * Copyright (C) 2006-2012 Red Hat, Inc.
 * Copyright (C) 2006 Daniel P. Berrange
 *
 * This library is free software; you can redistribute it and/or
@@ -35,7 +35,6 @@ struct daemonConfig {
    char *tls_port;
    char *tcp_port;

-    char *unix_sock_admin_perms;
    char *unix_sock_ro_perms;
    char *unix_sock_rw_perms;
    char *unix_sock_group;
@@ -81,15 +80,7 @@ struct daemonConfig {

    int keepalive_interval;
    unsigned int keepalive_count;
-
-    int admin_min_workers;
-    int admin_max_workers;
-    int admin_max_clients;
-    int admin_max_queued_clients;
-    int admin_max_client_requests;
-
-    int admin_keepalive_interval;
-    unsigned int admin_keepalive_count;
+    int keepalive_required;
 };


--- a/daemon/libvirtd.aug
+++ b/daemon/libvirtd.aug
@@ -35,7 +35,6 @@ module Libvirtd =
   let sock_acl_entry = str_entry "unix_sock_group"
                      | str_entry "unix_sock_ro_perms"
                      | str_entry "unix_sock_rw_perms"
-                      | str_entry "unix_sock_admin_perms"
                      | str_entry "unix_sock_dir"

   let authentication_entry = str_entry "auth_unix_ro"
@@ -63,12 +62,6 @@ module Libvirtd =
                        | int_entry "max_client_requests"
                        | int_entry "prio_workers"

-   let admin_processing_entry = int_entry "admin_min_workers"
-                              | int_entry "admin_max_workers"
-                              | int_entry "admin_max_clients"
-                              | int_entry "admin_max_queued_clients"
-                              | int_entry "admin_max_client_requests"
-
   let logging_entry = int_entry "log_level"
                     | str_entry "log_filters"
                     | str_entry "log_outputs"
@@ -81,10 +74,6 @@ module Libvirtd =
                       | int_entry "keepalive_count"
                       | bool_entry "keepalive_required"

-   let admin_keepalive_entry = int_entry "admin_keepalive_interval"
-                             | int_entry "admin_keepalive_count"
-                             | bool_entry "admin_keepalive_required"
-
   let misc_entry = str_entry "host_uuid"

   (* Each enty in the config is one of the following three ... *)
@@ -94,11 +83,9 @@ module Libvirtd =
             | certificate_entry
             | authorization_entry
             | processing_entry
-             | admin_processing_entry
             | logging_entry
             | auditing_entry
             | keepalive_entry
-             | admin_keepalive_entry
             | misc_entry
   let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
   let empty = [ label "#empty" . eol ]
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1,7 +1,7 @@
 /*
 * libvirtd.c: daemon start of day, guest process & i/o management
 *
- * Copyright (C) 2006-2015 Red Hat, Inc.
+ * Copyright (C) 2006-2014 Red Hat, Inc.
 * Copyright (C) 2006 Daniel P. Berrange
 *
 * This library is free software; you can redistribute it and/or
@@ -44,20 +44,18 @@
 #include "libvirtd.h"
 #include "libvirtd-config.h"

-#include "admin_server.h"
 #include "viruuid.h"
 #include "remote_driver.h"
 #include "viralloc.h"
 #include "virconf.h"
 #include "virnetlink.h"
-#include "virnetdaemon.h"
+#include "virnetserver.h"
 #include "remote.h"
 #include "virhook.h"
 #include "viraudit.h"
 #include "virstring.h"
 #include "locking/lock_manager.h"
 #include "viraccessmanager.h"
-#include "virutil.h"

 #ifdef WITH_DRIVER_MODULES
 # include "driver.h"
@@ -106,6 +104,7 @@
 #include "configmake.h"

 #include "virdbus.h"
+#include "cpu/cpu_map.h"

 VIR_LOG_INIT("daemon.libvirtd");

@@ -113,7 +112,6 @@ VIR_LOG_INIT("daemon.libvirtd");
 virNetSASLContextPtr saslCtxt = NULL;
 #endif
 virNetServerProgramPtr remoteProgram = NULL;
-virNetServerProgramPtr adminProgram = NULL;
 virNetServerProgramPtr qemuProgram = NULL;
 virNetServerProgramPtr lxcProgram = NULL;

@@ -164,9 +162,9 @@ static int daemonForkIntoBackground(const char *argv0)

            VIR_FORCE_CLOSE(statuspipe[0]);

-            if ((stdinfd = open("/dev/null", O_RDONLY)) <= STDERR_FILENO)
+            if ((stdinfd = open("/dev/null", O_RDONLY)) < 0)
                goto cleanup;
-            if ((stdoutfd = open("/dev/null", O_WRONLY)) <= STDERR_FILENO)
+            if ((stdoutfd = open("/dev/null", O_WRONLY)) < 0)
                goto cleanup;
            if (dup2(stdinfd, STDIN_FILENO) != STDIN_FILENO)
                goto cleanup;
@@ -174,9 +172,9 @@ static int daemonForkIntoBackground(const char *argv0)
                goto cleanup;
            if (dup2(stdoutfd, STDERR_FILENO) != STDERR_FILENO)
                goto cleanup;
-            if (VIR_CLOSE(stdinfd) < 0)
+            if (stdinfd > STDERR_FILENO && VIR_CLOSE(stdinfd) < 0)
                goto cleanup;
-            if (VIR_CLOSE(stdoutfd) < 0)
+            if (stdoutfd > STDERR_FILENO && VIR_CLOSE(stdoutfd) < 0)
                goto cleanup;

            if (setsid() < 0)
@@ -251,28 +249,57 @@ static int daemonForkIntoBackground(const char *argv0)
 }


+static int
+daemonPidFilePath(bool privileged,
+                  char **pidfile)
+{
+    if (privileged) {
+        if (VIR_STRDUP(*pidfile, LOCALSTATEDIR "/run/libvirtd.pid") < 0)
+            goto error;
+    } else {
+        char *rundir = NULL;
+        mode_t old_umask;
+
+        if (!(rundir = virGetUserRuntimeDirectory()))
+            goto error;
+
+        old_umask = umask(077);
+        if (virFileMakePath(rundir) < 0) {
+            umask(old_umask);
+            goto error;
+        }
+        umask(old_umask);
+
+        if (virAsprintf(pidfile, "%s/libvirtd.pid", rundir) < 0) {
+            VIR_FREE(rundir);
+            goto error;
+        }
+
+        VIR_FREE(rundir);
+    }
+
+    return 0;
+
+ error:
+    return -1;
+}
+
 static int
 daemonUnixSocketPaths(struct daemonConfig *config,
                      bool privileged,
                      char **sockfile,
-                      char **rosockfile,
-                      char **admsockfile)
+                      char **rosockfile)
 {
    if (config->unix_sock_dir) {
        if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir) < 0)
            goto error;
-
-        if (privileged) {
-            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;
-        }
+        if (privileged &&
+            virAsprintf(rosockfile, "%s/libvirt-sock-ro", 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)
+                VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro") < 0)
                goto error;
        } else {
            char *rundir = NULL;
@@ -288,8 +315,7 @@ daemonUnixSocketPaths(struct daemonConfig *config,
            }
            umask(old_umask);

-            if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) {
+            if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0) {
                VIR_FREE(rundir);
                goto error;
            }
@@ -329,7 +355,6 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority)
    case VIR_ERR_NO_SECRET:
    case VIR_ERR_NO_DOMAIN_SNAPSHOT:
    case VIR_ERR_OPERATION_INVALID:
-    case VIR_ERR_NO_DOMAIN_METADATA:
        return VIR_LOG_DEBUG;
    }

@@ -340,10 +365,10 @@ static void daemonInitialize(void)
 {
    /*
     * Note that the order is important: the first ones have a higher
-     * priority when calling virStateInitialize. We must register the
-     * network, storage and nodedev drivers before any stateful domain
-     * driver, since their resources must be auto-started before any
-     * domains can be auto-started.
+     * priority when calling virStateInitialize. We must register
+     * the network, storage and nodedev drivers before any domain
+     * drivers, since their resources must be auto-started before
+     * any domains can be auto-started.
     */
 #ifdef WITH_DRIVER_MODULES
    /* We don't care if any of these fail, because the whole point
@@ -354,9 +379,6 @@ static void daemonInitialize(void)
 # ifdef WITH_NETWORK
    virDriverLoadModule("network");
 # endif
-# ifdef WITH_INTERFACE
-    virDriverLoadModule("interface");
-# endif
 # ifdef WITH_STORAGE
    virDriverLoadModule("storage");
 # endif
@@ -369,6 +391,9 @@ static void daemonInitialize(void)
 # ifdef WITH_NWFILTER
    virDriverLoadModule("nwfilter");
 # endif
+# ifdef WITH_INTERFACE
+    virDriverLoadModule("interface");
+# endif
 # ifdef WITH_XEN
    virDriverLoadModule("xen");
 # endif
@@ -434,18 +459,14 @@ static void daemonInitialize(void)
 }


-static int ATTRIBUTE_NONNULL(3)
-daemonSetupNetworking(virNetServerPtr srv,
-                      virNetServerPtr srvAdm,
-                      struct daemonConfig *config,
-                      const char *sock_path,
-                      const char *sock_path_ro,
-                      const char *sock_path_adm,
-                      bool ipsock,
-                      bool privileged)
+static int daemonSetupNetworking(virNetServerPtr srv,
+                                 struct daemonConfig *config,
+                                 const char *sock_path,
+                                 const char *sock_path_ro,
+                                 bool ipsock,
+                                 bool privileged)
 {
    virNetServerServicePtr svc = NULL;
-    virNetServerServicePtr svcAdm = NULL;
    virNetServerServicePtr svcRO = NULL;
    virNetServerServicePtr svcTCP = NULL;
 #if WITH_GNUTLS
@@ -454,92 +475,58 @@ daemonSetupNetworking(virNetServerPtr srv,
    gid_t unix_sock_gid = 0;
    int unix_sock_ro_mask = 0;
    int unix_sock_rw_mask = 0;
-    int unix_sock_adm_mask = 0;
-    int ret = -1;
-
-    unsigned int cur_fd = STDERR_FILENO + 1;
-    unsigned int nfds = virGetListenFDs();

    if (config->unix_sock_group) {
        if (virGetGroupID(config->unix_sock_group, &unix_sock_gid) < 0)
-            return ret;
-    }
-
-    if (nfds > (sock_path_ro ? 2 : 1)) {
-        VIR_ERROR(_("Too many (%u) FDs passed from caller"), nfds);
-        return ret;
+            return -1;
    }

    if (virStrToLong_i(config->unix_sock_ro_perms, NULL, 8, &unix_sock_ro_mask) != 0) {
        VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_ro_perms);
-        goto cleanup;
-    }
-
-    if (virStrToLong_i(config->unix_sock_admin_perms, NULL, 8, &unix_sock_adm_mask) != 0) {
-        VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_admin_perms);
-        goto cleanup;
+        goto error;
    }

    if (virStrToLong_i(config->unix_sock_rw_perms, NULL, 8, &unix_sock_rw_mask) != 0) {
        VIR_ERROR(_("Failed to parse mode '%s'"), config->unix_sock_rw_perms);
-        goto cleanup;
+        goto error;
    }

-    if (!(svc = virNetServerServiceNewFDOrUNIX(sock_path,
-                                               unix_sock_rw_mask,
-                                               unix_sock_gid,
-                                               config->auth_unix_rw,
+    VIR_DEBUG("Registering unix socket %s", sock_path);
+    if (!(svc = virNetServerServiceNewUNIX(sock_path,
+                                           unix_sock_rw_mask,
+                                           unix_sock_gid,
+                                           config->auth_unix_rw,
 #if WITH_GNUTLS
-                                               NULL,
+                                           NULL,
 #endif
-                                               false,
-                                               config->max_queued_clients,
-                                               config->max_client_requests,
-                                               nfds, &cur_fd)))
-        goto cleanup;
+                                           false,
+                                           config->max_queued_clients,
+                                           config->max_client_requests)))
+        goto error;
    if (sock_path_ro) {
-        if (!(svcRO = virNetServerServiceNewFDOrUNIX(sock_path_ro,
-                                                     unix_sock_ro_mask,
-                                                     unix_sock_gid,
-                                                     config->auth_unix_ro,
+        VIR_DEBUG("Registering unix socket %s", sock_path_ro);
+        if (!(svcRO = virNetServerServiceNewUNIX(sock_path_ro,
+                                                 unix_sock_ro_mask,
+                                                 unix_sock_gid,
+                                                 config->auth_unix_ro,
 #if WITH_GNUTLS
-                                                     NULL,
+                                                 NULL,
 #endif
-                                                     true,
-                                                     config->max_queued_clients,
-                                                     config->max_client_requests,
-                                                     nfds, &cur_fd)))
-            goto cleanup;
+                                                 true,
+                                                 config->max_queued_clients,
+                                                 config->max_client_requests)))
+            goto error;
    }

    if (virNetServerAddService(srv, svc,
                               config->mdns_adv && !ipsock ?
                               "_libvirt._tcp" :
                               NULL) < 0)
-        goto cleanup;
+        goto error;

    if (svcRO &&
        virNetServerAddService(srv, svcRO, NULL) < 0)
-        goto cleanup;
-
-    /* Temporarily disabled */
-    if (sock_path_adm && false) {
-        VIR_DEBUG("Registering unix socket %s", sock_path_adm);
-        if (!(svcAdm = virNetServerServiceNewUNIX(sock_path_adm,
-                                                  unix_sock_adm_mask,
-                                                  unix_sock_gid,
-                                                  REMOTE_AUTH_NONE,
-#if WITH_GNUTLS
-                                                  NULL,
-#endif
-                                                  true,
-                                                  config->admin_max_queued_clients,
-                                                  config->admin_max_client_requests)))
-            goto cleanup;
-
-        if (virNetServerAddService(srvAdm, svcAdm, NULL) < 0)
-            goto cleanup;
-    }
+        goto error;

    if (ipsock) {
        if (config->listen_tcp) {
@@ -547,7 +534,6 @@ daemonSetupNetworking(virNetServerPtr srv,
                      config->listen_addr, config->tcp_port);
            if (!(svcTCP = virNetServerServiceNewTCP(config->listen_addr,
                                                     config->tcp_port,
-                                                     AF_UNSPEC,
                                                     config->auth_tcp,
 #if WITH_GNUTLS
                                                     NULL,
@@ -555,11 +541,11 @@ daemonSetupNetworking(virNetServerPtr srv,
                                                     false,
                                                     config->max_queued_clients,
                                                     config->max_client_requests)))
-                goto cleanup;
+                goto error;

            if (virNetServerAddService(srv, svcTCP,
                                       config->mdns_adv ? "_libvirt._tcp" : NULL) < 0)
-                goto cleanup;
+                goto error;
        }

 #if WITH_GNUTLS
@@ -576,14 +562,14 @@ daemonSetupNetworking(virNetServerPtr srv,
                                                       (const char *const*)config->tls_allowed_dn_list,
                                                       config->tls_no_sanity_certificate ? false : true,
                                                       config->tls_no_verify_certificate ? false : true)))
-                    goto cleanup;
+                    goto error;
            } else {
                if (!(ctxt = virNetTLSContextNewServerPath(NULL,
                                                           !privileged,
                                                           (const char *const*)config->tls_allowed_dn_list,
                                                           config->tls_no_sanity_certificate ? false : true,
                                                           config->tls_no_verify_certificate ? false : true)))
-                    goto cleanup;
+                    goto error;
            }

            VIR_DEBUG("Registering TLS socket %s:%s",
@@ -591,19 +577,18 @@ daemonSetupNetworking(virNetServerPtr srv,
            if (!(svcTLS =
                  virNetServerServiceNewTCP(config->listen_addr,
                                            config->tls_port,
-                                            AF_UNSPEC,
                                            config->auth_tls,
                                            ctxt,
                                            false,
                                            config->max_queued_clients,
                                            config->max_client_requests))) {
                virObjectUnref(ctxt);
-                goto cleanup;
+                goto error;
            }
            if (virNetServerAddService(srv, svcTLS,
                                       config->mdns_adv &&
                                       !config->listen_tcp ? "_libvirt._tcp" : NULL) < 0)
-                goto cleanup;
+                goto error;

            virObjectUnref(ctxt);
        }
@@ -612,7 +597,7 @@ daemonSetupNetworking(virNetServerPtr srv,
        if (config->listen_tls) {
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                           _("This libvirtd build does not support TLS"));
-            goto cleanup;
+            goto error;
        }
 #endif
    }
@@ -627,21 +612,20 @@ daemonSetupNetworking(virNetServerPtr srv,
        saslCtxt = virNetSASLContextNewServer(
            (const char *const*)config->sasl_allowed_username_list);
        if (!saslCtxt)
-            goto cleanup;
+            goto error;
    }
 #endif

-    ret = 0;
+    return 0;

- cleanup:
+ error:
 #if WITH_GNUTLS
    virObjectUnref(svcTLS);
 #endif
    virObjectUnref(svcTCP);
-    virObjectUnref(svcRO);
-    virObjectUnref(svcAdm);
    virObjectUnref(svc);
-    return ret;
+    virObjectUnref(svcRO);
+    return -1;
 }


@@ -684,12 +668,6 @@ daemonSetupLogging(struct daemonConfig *config,
    if (virLogGetNbOutputs() == 0)
        virLogParseOutputs(config->log_outputs);

-    /*
-     * Command line override for --verbose
-     */
-    if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
-        virLogSetDefaultPriority(VIR_LOG_INFO);
-
    /*
     * If no defined outputs, and either running
     * as daemon or not on a tty, then first try
@@ -700,14 +678,7 @@ daemonSetupLogging(struct daemonConfig *config,
        (godaemon || !isatty(STDIN_FILENO))) {
        char *tmp;
        if (access("/run/systemd/journal/socket", W_OK) >= 0) {
-            virLogPriority priority = virLogGetDefaultPriority();
-
-            /* By default we don't want to log too much stuff into journald as
-             * it may employ rate limiting and thus block libvirt execution. */
-            if (priority == VIR_LOG_DEBUG)
-                priority = VIR_LOG_INFO;
-
-            if (virAsprintf(&tmp, "%d:journald", priority) < 0)
+            if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0)
                goto error;
            virLogParseOutputs(tmp);
            VIR_FREE(tmp);
@@ -756,6 +727,12 @@ daemonSetupLogging(struct daemonConfig *config,
        VIR_FREE(tmp);
    }

+    /*
+     * Command line override for --verbose
+     */
+    if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO))
+        virLogSetDefaultPriority(VIR_LOG_INFO);
+
    return 0;

 error:
@@ -768,13 +745,13 @@ daemonSetupAccessManager(struct daemonConfig *config)
 {
    virAccessManagerPtr mgr;
    const char *none[] = { "none", NULL };
-    const char **drv = (const char **)config->access_drivers;
+    const char **driver = (const char **)config->access_drivers;

-    if (!drv ||
-        !drv[0])
-        drv = none;
+    if (!driver ||
+        !driver[0])
+        driver = none;

-    if (!(mgr = virAccessManagerNewStack(drv)))
+    if (!(mgr = virAccessManagerNewStack(driver)))
        return -1;

    virAccessManagerSetDefault(mgr);
@@ -815,38 +792,33 @@ daemonSetupPrivs(void)
 #endif


-static void daemonShutdownHandler(virNetDaemonPtr dmn,
+static void daemonShutdownHandler(virNetServerPtr srv,
                                  siginfo_t *sig ATTRIBUTE_UNUSED,
                                  void *opaque ATTRIBUTE_UNUSED)
 {
-    virNetDaemonQuit(dmn);
+    virNetServerQuit(srv);
 }

-static void daemonReloadHandler(virNetDaemonPtr dmn ATTRIBUTE_UNUSED,
+static void daemonReloadHandler(virNetServerPtr srv ATTRIBUTE_UNUSED,
                                siginfo_t *sig ATTRIBUTE_UNUSED,
                                void *opaque ATTRIBUTE_UNUSED)
 {
-    if (!driversInitialized) {
-        VIR_WARN("Drivers are not initialized, reload ignored");
-        return;
-    }
-
-    VIR_INFO("Reloading configuration on SIGHUP");
-    virHookCall(VIR_HOOK_DRIVER_DAEMON, "-",
-                VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL);
-    if (virStateReload() < 0)
-        VIR_WARN("Error while reloading drivers");
+        VIR_INFO("Reloading configuration on SIGHUP");
+        virHookCall(VIR_HOOK_DRIVER_DAEMON, "-",
+                    VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL);
+        if (virStateReload() < 0)
+            VIR_WARN("Error while reloading drivers");
 }

-static int daemonSetupSignals(virNetDaemonPtr dmn)
+static int daemonSetupSignals(virNetServerPtr srv)
 {
-    if (virNetDaemonAddSignalHandler(dmn, SIGINT, daemonShutdownHandler, NULL) < 0)
+    if (virNetServerAddSignalHandler(srv, SIGINT, daemonShutdownHandler, NULL) < 0)
        return -1;
-    if (virNetDaemonAddSignalHandler(dmn, SIGQUIT, daemonShutdownHandler, NULL) < 0)
+    if (virNetServerAddSignalHandler(srv, SIGQUIT, daemonShutdownHandler, NULL) < 0)
        return -1;
-    if (virNetDaemonAddSignalHandler(dmn, SIGTERM, daemonShutdownHandler, NULL) < 0)
+    if (virNetServerAddSignalHandler(srv, SIGTERM, daemonShutdownHandler, NULL) < 0)
        return -1;
-    if (virNetDaemonAddSignalHandler(dmn, SIGHUP, daemonReloadHandler, NULL) < 0)
+    if (virNetServerAddSignalHandler(srv, SIGHUP, daemonReloadHandler, NULL) < 0)
        return -1;
    return 0;
 }
@@ -854,12 +826,12 @@ static int daemonSetupSignals(virNetDaemonPtr dmn)

 static void daemonInhibitCallback(bool inhibit, void *opaque)
 {
-    virNetDaemonPtr dmn = opaque;
+    virNetServerPtr srv = opaque;

    if (inhibit)
-        virNetDaemonAddShutdownInhibition(dmn);
+        virNetServerAddShutdownInhibition(srv);
    else
-        virNetDaemonRemoveShutdownInhibition(dmn);
+        virNetServerRemoveShutdownInhibition(srv);
 }


@@ -869,26 +841,26 @@ static DBusConnection *systemBus;

 static void daemonStopWorker(void *opaque)
 {
-    virNetDaemonPtr dmn = opaque;
+    virNetServerPtr srv = opaque;

-    VIR_DEBUG("Begin stop dmn=%p", dmn);
+    VIR_DEBUG("Begin stop srv=%p", srv);

    ignore_value(virStateStop());

-    VIR_DEBUG("Completed stop dmn=%p", dmn);
+    VIR_DEBUG("Completed stop srv=%p", srv);

    /* Exit libvirtd cleanly */
-    virNetDaemonQuit(dmn);
+    virNetServerQuit(srv);
 }


 /* We do this in a thread to not block the main loop */
-static void daemonStop(virNetDaemonPtr dmn)
+static void daemonStop(virNetServerPtr srv)
 {
    virThread thr;
-    virObjectRef(dmn);
-    if (virThreadCreate(&thr, false, daemonStopWorker, dmn) < 0)
-        virObjectUnref(dmn);
+    virObjectRef(srv);
+    if (virThreadCreate(&thr, false, daemonStopWorker, srv) < 0)
+        virObjectUnref(srv);
 }


@@ -897,14 +869,14 @@ handleSessionMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED,
                         DBusMessage *message,
                         void *opaque)
 {
-    virNetDaemonPtr dmn = opaque;
+    virNetServerPtr srv = opaque;

-    VIR_DEBUG("dmn=%p", dmn);
+    VIR_DEBUG("srv=%p", srv);

    if (dbus_message_is_signal(message,
                               DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
-        daemonStop(dmn);
+        daemonStop(srv);

    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
@@ -915,14 +887,14 @@ handleSystemMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED,
                        DBusMessage *message,
                        void *opaque)
 {
-    virNetDaemonPtr dmn = opaque;
+    virNetServerPtr srv = opaque;

-    VIR_DEBUG("dmn=%p", dmn);
+    VIR_DEBUG("srv=%p", srv);

    if (dbus_message_is_signal(message,
                               "org.freedesktop.login1.Manager",
                               "PrepareForShutdown"))
-        daemonStop(dmn);
+        daemonStop(srv);

    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
@@ -931,22 +903,22 @@ handleSystemMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED,

 static void daemonRunStateInit(void *opaque)
 {
-    virNetDaemonPtr dmn = opaque;
+    virNetServerPtr srv = opaque;
    virIdentityPtr sysident = virIdentityGetSystem();

    virIdentitySetCurrent(sysident);

    /* Since driver initialization can take time inhibit daemon shutdown until
       we're done so clients get a chance to connect */
-    daemonInhibitCallback(true, dmn);
+    daemonInhibitCallback(true, srv);

    /* Start the stateful HV drivers
     * This is deliberately done after telling the parent process
     * we're ready, since it can take a long time and this will
     * seriously delay OS bootup process */
-    if (virStateInitialize(virNetDaemonIsPrivileged(dmn),
+    if (virStateInitialize(virNetServerIsPrivileged(srv),
                           daemonInhibitCallback,
-                           dmn) < 0) {
+                           srv) < 0) {
        VIR_ERROR(_("Driver state initialization failed"));
        /* Ensure the main event loop quits */
        kill(getpid(), SIGTERM);
@@ -956,18 +928,18 @@ static void daemonRunStateInit(void *opaque)
    driversInitialized = true;

 #ifdef HAVE_DBUS
-    /* Tie the non-privileged libvirtd to the session/shutdown lifecycle */
-    if (!virNetDaemonIsPrivileged(dmn)) {
+    /* Tie the non-priviledged libvirtd to the session/shutdown lifecycle */
+    if (!virNetServerIsPrivileged(srv)) {

        sessionBus = virDBusGetSessionBus();
        if (sessionBus != NULL)
            dbus_connection_add_filter(sessionBus,
-                                       handleSessionMessageFunc, dmn, NULL);
+                                       handleSessionMessageFunc, srv, NULL);

        systemBus = virDBusGetSystemBus();
        if (systemBus != NULL) {
            dbus_connection_add_filter(systemBus,
-                                       handleSystemMessageFunc, dmn, NULL);
+                                       handleSystemMessageFunc, srv, NULL);
            dbus_bus_add_match(systemBus,
                               "type='signal',sender='org.freedesktop.login1', interface='org.freedesktop.login1.Manager'",
                               NULL);
@@ -975,20 +947,20 @@ static void daemonRunStateInit(void *opaque)
    }
 #endif
    /* Only now accept clients from network */
-    virNetDaemonUpdateServices(dmn, true);
+    virNetServerUpdateServices(srv, true);
 cleanup:
-    daemonInhibitCallback(false, dmn);
-    virObjectUnref(dmn);
+    daemonInhibitCallback(false, srv);
+    virObjectUnref(srv);
    virObjectUnref(sysident);
    virIdentitySetCurrent(NULL);
 }

-static int daemonStateInit(virNetDaemonPtr dmn)
+static int daemonStateInit(virNetServerPtr srv)
 {
    virThread thr;
-    virObjectRef(dmn);
-    if (virThreadCreate(&thr, false, daemonRunStateInit, dmn) < 0) {
-        virObjectUnref(dmn);
+    virObjectRef(srv);
+    if (virThreadCreate(&thr, false, daemonRunStateInit, srv) < 0) {
+        virObjectUnref(srv);
        return -1;
    }
    return 0;
@@ -1010,8 +982,9 @@ static int migrateProfile(void)
    if (!(home = virGetUserDirectory()))
        goto cleanup;

-    if (virAsprintf(&old_base, "%s/.libvirt", home) < 0)
+    if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) {
        goto cleanup;
+    }

    /* if the new directory is there or the old one is not: do nothing */
    if (!(config_dir = virGetUserConfigDirectory()))
@@ -1026,18 +999,21 @@ static int migrateProfile(void)
    }

    /* test if we already attempted to migrate first */
-    if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0)
+    if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) {
        goto cleanup;
-    if (virFileExists(updated))
+    }
+    if (virFileExists(updated)) {
        goto cleanup;
+    }

    config_home = virGetEnvBlockSUID("XDG_CONFIG_HOME");
    if (config_home && config_home[0] != '\0') {
        if (VIR_STRDUP(xdg_dir, config_home) < 0)
            goto cleanup;
    } else {
-        if (virAsprintf(&xdg_dir, "%s/.config", home) < 0)
+        if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) {
            goto cleanup;
+        }
    }

    old_umask = umask(077);
@@ -1138,10 +1114,9 @@ daemonUsage(const char *argv0, bool privileged)
    }
 }

+#define MAX_LISTEN 5
 int main(int argc, char **argv) {
-    virNetDaemonPtr dmn = NULL;
    virNetServerPtr srv = NULL;
-    virNetServerPtr srvAdm = NULL;
    char *remote_config_file = NULL;
    int statuswrite = -1;
    int ret = 1;
@@ -1149,7 +1124,6 @@ int main(int argc, char **argv) {
    char *pid_file = NULL;
    char *sock_file = NULL;
    char *sock_file_ro = NULL;
-    char *sock_file_adm = NULL;
    int timeout = -1;        /* -t: Shutdown timeout */
    int verbose = 0;
    int godaemon = 0;
@@ -1191,8 +1165,9 @@ int main(int argc, char **argv) {

        c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);

-        if (c == -1)
+        if (c == -1) {
            break;
+        }

        switch (c) {
        case 0:
@@ -1305,10 +1280,8 @@ int main(int argc, char **argv) {
    }

    if (!pid_file &&
-        virPidFileConstructPath(privileged,
-                                LOCALSTATEDIR,
-                                "libvirtd",
-                                &pid_file) < 0) {
+        daemonPidFilePath(privileged,
+                          &pid_file) < 0) {
        VIR_ERROR(_("Can't determine pid file path."));
        exit(EXIT_FAILURE);
    }
@@ -1317,15 +1290,12 @@ int main(int argc, char **argv) {
    if (daemonUnixSocketPaths(config,
                              privileged,
                              &sock_file,
-                              &sock_file_ro,
-                              &sock_file_adm) < 0) {
+                              &sock_file_ro) < 0) {
        VIR_ERROR(_("Can't determine socket paths"));
        exit(EXIT_FAILURE);
    }
-    VIR_DEBUG("Decided on socket paths '%s', '%s' and '%s'",
-              sock_file,
-              NULLSTR(sock_file_ro),
-              NULLSTR(sock_file_adm));
+    VIR_DEBUG("Decided on socket paths '%s' and '%s'",
+              sock_file, NULLSTR(sock_file_ro));

    if (godaemon) {
        char ebuf[1024];
@@ -1389,6 +1359,7 @@ int main(int argc, char **argv) {
                                config->max_anonymous_clients,
                                config->keepalive_interval,
                                config->keepalive_count,
+                                !!config->keepalive_required,
                                config->mdns_adv ? config->mdns_name : NULL,
                                remoteClientInitHook,
                                NULL,
@@ -1398,12 +1369,6 @@ int main(int argc, char **argv) {
        goto cleanup;
    }

-    if (!(dmn = virNetDaemonNew()) ||
-        virNetDaemonAddServer(dmn, srv) < 0) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-
    /* Beyond this point, nothing should rely on using
     * getuid/geteuid() == 0, for privilege level checks.
     */
@@ -1456,45 +1421,13 @@ int main(int argc, char **argv) {
        goto cleanup;
    }

-    if (!(srvAdm = virNetServerNew(config->admin_min_workers,
-                                   config->admin_max_workers,
-                                   0,
-                                   config->admin_max_clients,
-                                   0,
-                                   config->admin_keepalive_interval,
-                                   config->admin_keepalive_count,
-                                   NULL,
-                                   remoteAdmClientInitHook,
-                                   NULL,
-                                   remoteAdmClientFreeFunc,
-                                   dmn))) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-
-    if (virNetDaemonAddServer(dmn, srvAdm) < 0) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-
-    if (!(adminProgram = virNetServerProgramNew(ADMIN_PROGRAM,
-                                                ADMIN_PROTOCOL_VERSION,
-                                                adminProcs,
-                                                adminNProcs))) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-    if (virNetServerAddProgram(srvAdm, adminProgram) < 0) {
-        ret = VIR_DAEMON_ERR_INIT;
-        goto cleanup;
-    }
-
    if (timeout != -1) {
        VIR_DEBUG("Registering shutdown timeout %d", timeout);
-        virNetDaemonAutoShutdown(dmn, timeout);
+        virNetServerAutoShutdown(srv,
+                                 timeout);
    }

-    if ((daemonSetupSignals(dmn)) < 0) {
+    if ((daemonSetupSignals(srv)) < 0) {
        ret = VIR_DAEMON_ERR_SIGNAL;
        goto cleanup;
    }
@@ -1509,7 +1442,7 @@ int main(int argc, char **argv) {
            VIR_DEBUG("Proceeding without auditing");
        }
    }
-    virAuditLog(config->audit_logging > 0);
+    virAuditLog(config->audit_logging);

    /* setup the hooks if any */
    if (virHookInitialize() < 0) {
@@ -1529,11 +1462,8 @@ int main(int argc, char **argv) {
    virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_START,
                0, "start", NULL, NULL);

-    if (daemonSetupNetworking(srv, srvAdm,
-                              config,
-                              sock_file,
-                              sock_file_ro,
-                              sock_file_adm,
+    if (daemonSetupNetworking(srv, config,
+                              sock_file, sock_file_ro,
                              ipsock, privileged) < 0) {
        ret = VIR_DAEMON_ERR_NETWORK;
        goto cleanup;
@@ -1552,7 +1482,7 @@ int main(int argc, char **argv) {
    }

    /* Initialize drivers & then start accepting new clients from network */
-    if (daemonStateInit(dmn) < 0) {
+    if (daemonStateInit(srv) < 0) {
        ret = VIR_DAEMON_ERR_INIT;
        goto cleanup;
    }
@@ -1574,7 +1504,7 @@ int main(int argc, char **argv) {
 #endif

    /* Run event loop. */
-    virNetDaemonRun(dmn);
+    virNetServerRun(srv);

    ret = 0;

@@ -1586,11 +1516,8 @@ int main(int argc, char **argv) {
    virObjectUnref(remoteProgram);
    virObjectUnref(lxcProgram);
    virObjectUnref(qemuProgram);
-    virObjectUnref(adminProgram);
-    virNetDaemonClose(dmn);
-    virObjectUnref(dmn);
+    virNetServerClose(srv);
    virObjectUnref(srv);
-    virObjectUnref(srvAdm);
    virNetlinkShutdown();
    if (statuswrite != -1) {
        if (ret != 0) {
@@ -1607,17 +1534,14 @@ int main(int argc, char **argv) {

    VIR_FREE(sock_file);
    VIR_FREE(sock_file_ro);
-    VIR_FREE(sock_file_adm);
    VIR_FREE(pid_file);
    VIR_FREE(remote_config_file);
    VIR_FREE(run_dir);

    daemonConfigFree(config);

-    if (driversInitialized) {
-        driversInitialized = false;
+    if (driversInitialized)
        virStateCleanup();
-    }

    return ret;
 }
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -48,10 +48,6 @@
 # Override the default configuration which binds to all network
 # interfaces. This can be a numeric IPv4/6 address, or hostname
 #
-# If the libvirtd service is started in parallel with network
-# startup (e.g. with systemd), binding to addresses other than
-# the wildcards (0.0.0.0/::) might not be available yet.
-#
 #listen_addr = "192.168.0.1"


@@ -77,11 +73,6 @@
 # UNIX socket access controls
 #

-# Beware that if you are changing *any* of these options, and you use
-# socket activation with systemd, you need to adjust the settings in
-# the libvirtd.socket file as well since it could impose a security
-# risk if you rely on file permission checking only.
-
 # Set the UNIX domain socket group ownership. This can be used to
 # allow a 'trusted' set of users access to management capabilities
 # without becoming root.
@@ -106,17 +97,9 @@
 # control, then you may want to relax this too.
 #unix_sock_rw_perms = "0770"

-# Set the UNIX socket permissions for the admin interface socket.
-#
-# Default allows only owner (root), do not change it unless you are
-# sure to whom you are exposing the access to.
-#unix_sock_admin_perms = "0700"
-
 # Set the name of the directory in which sockets will be found/created.
 #unix_sock_dir = "/var/run/libvirt"

-
-
 #################################################################
 #
 # Authentication.
@@ -280,7 +263,7 @@
 # connection succeeds.
 #max_queued_clients = 1000

-# The maximum length of queue of accepted but not yet
+# The maximum length of queue of accepted but not yet not
 # authenticated clients. The default value is zero, meaning
 # the feature is disabled.
 #max_anonymous_clients = 20
@@ -315,16 +298,6 @@
 # and max_workers parameter
 #max_client_requests = 5

-# Same processing controls, but this time for the admin interface.
-# For description of each option, be so kind to scroll few lines
-# upwards.
-
-#admin_min_workers = 1
-#admin_max_workers = 5
-#admin_max_clients = 5
-#admin_max_queued_clients = 5
-#admin_max_client_requests = 5
-
 #################################################################
 #
 # Logging controls
@@ -332,10 +305,6 @@

 # Logging level: 4 errors, 3 warnings, 2 information, 1 debug
 # basically 1 will log everything possible
-# Note: Journald may employ rate limiting of the messages logged
-# and thus lock up the libvirt daemon. To use the debug level with
-# journald you have to specify it explicitly in 'log_outputs', otherwise
-# only information level messages will be logged.
 #log_level = 3

 # Logging filters:
@@ -369,8 +338,6 @@
 #      use syslog for the output and use the given name as the ident
 #    x:file:file_path
 #      output to a file, with the given filepath
-#    x:journald
-#      output to journald logging system
 # In all case the x prefix is the minimal level, acting as a filter
 #    1: DEBUG
 #    2: INFO
@@ -440,15 +407,8 @@
 #
 #keepalive_interval = 5
 #keepalive_count = 5
-
 #
-# These configuration options are no longer used.  There is no way to
-# restrict such clients from connecting since they first need to
-# connect in order to ask for keepalive.
+# If set to 1, libvirtd will refuse to talk to clients that do not
+# support keepalive protocol.  Defaults to 0.
 #
 #keepalive_required = 1
-#admin_keepalive_required = 1
-
-# Keepalive settings for the admin interface
-#admin_keepalive_interval = 5
-#admin_keepalive_count = 5
--- a/daemon/libvirtd.h
+++ b/daemon/libvirtd.h
@@ -1,7 +1,7 @@
 /*
 * libvirtd.h: daemon data structure definitions
 *
- * Copyright (C) 2006-2015 Red Hat, Inc.
+ * Copyright (C) 2006-2014 Red Hat, Inc.
 * Copyright (C) 2006 Daniel P. Berrange
 *
 * This library is free software; you can redistribute it and/or
@@ -30,11 +30,9 @@
 # include <rpc/types.h>
 # include <rpc/xdr.h>
 # include "remote_protocol.h"
-# include "admin_protocol.h"
 # include "lxc_protocol.h"
 # include "qemu_protocol.h"
 # include "virthread.h"
-
 # if WITH_SASL
 #  include "virnetsaslcontext.h"
 # endif
@@ -44,8 +42,6 @@ typedef struct daemonClientStream daemonClientStream;
 typedef daemonClientStream *daemonClientStreamPtr;
 typedef struct daemonClientPrivate daemonClientPrivate;
 typedef daemonClientPrivate *daemonClientPrivatePtr;
-typedef struct daemonAdmClientPrivate daemonAdmClientPrivate;
-typedef daemonAdmClientPrivate *daemonAdmClientPrivatePtr;
 typedef struct daemonClientEventCallback daemonClientEventCallback;
 typedef daemonClientEventCallback *daemonClientEventCallbackPtr;

@@ -72,14 +68,7 @@ struct daemonClientPrivate {
    virConnectPtr conn;

    daemonClientStreamPtr streams;
-};
-
-/* Separate private data for admin connection */
-struct daemonAdmClientPrivate {
-    /* Just a placeholder, not that there is anything to be locked */
-    virMutex lock;
-
-    virNetDaemonPtr dmn;
+    bool keepalive_supported;
 };

 # if WITH_SASL
--- a/daemon/libvirtd.libxl.logrotate.in
+++ b/daemon/libvirtd.libxl.logrotate.in
@@ -1,9 +0,0 @@
-@localstatedir@/log/libvirt/libxl/*.log {
-        weekly
-        missingok
-        rotate 4
-        compress
-        delaycompress
-        copytruncate
-        minsize 100k
-}
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
@@ -1,3 +1,8 @@
+# NB we don't use socket activation. When libvirtd starts it will
+# spawn any virtual machines registered for autostart. We want this
+# to occur on every boot, regardless of whether any client connects
+# to a socket. Thus socket activation doesn't have any benefit
+
 [Unit]
 Description=Virtualization daemon
 Before=libvirt-guests.service
@@ -5,8 +10,6 @@ After=network.target
 After=dbus.service
 After=iscsid.service
 After=apparmor.service
-After=local-fs.target
-After=remote-fs.target
 Documentation=man:libvirtd(8)
 Documentation=http://libvirt.org

--- a/daemon/libvirtd.socket.in
+++ b/daemon/libvirtd.socket.in
@@ -1,11 +0,0 @@
-[Socket]
-ListenStream=@runstatedir@/libvirt/libvirt-sock
-ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
-
-; The following settings must match libvirtd.conf file in order to
-; work as expected because libvirtd can't change them later.
-; SocketMode=0777 is safe only if authentication on the socket is set
-; up.  For further information, please see the libvirtd.conf file.
-SocketMode=0777
-SocketUser=root
-SocketGroup=root
--- a/daemon/remote.c
+++ b/daemon/remote.c
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -1,7 +1,7 @@
 /*
 * stream.c: APIs for managing client streams
 *
- * Copyright (C) 2009-2014 Red Hat, Inc.
+ * Copyright (C) 2009, 2011 Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -383,7 +383,7 @@ int daemonFreeClientStream(virNetServerClientPtr client,
        msg = tmp;
    }

-    virObjectUnref(stream->st);
+    virStreamFree(stream->st);
    VIR_FREE(stream);

    return ret;
@@ -612,10 +612,10 @@ daemonStreamHandleAbort(virNetServerClientPtr client,
    virStreamEventRemoveCallback(stream->st);
    virStreamAbort(stream->st);

-    if (msg->header.status == VIR_NET_ERROR) {
+    if (msg->header.status == VIR_NET_ERROR)
        virReportError(VIR_ERR_RPC,
                       "%s", _("stream aborted at client request"));
-    } else {
+    else {
        VIR_WARN("unexpected stream status %d", msg->header.status);
        virReportError(VIR_ERR_RPC,
                       _("stream aborted with unexpected status %d"),
--- a/daemon/test_libvirtd.aug.in
+++ b/daemon/test_libvirtd.aug.in
@@ -12,7 +12,6 @@ module Test_libvirtd =
        { "unix_sock_group" = "libvirt" }
        { "unix_sock_ro_perms" = "0777" }
        { "unix_sock_rw_perms" = "0770" }
-        { "unix_sock_admin_perms" = "0700" }
        { "unix_sock_dir" = "/var/run/libvirt" }
        { "auth_unix_ro" = "none" }
        { "auth_unix_rw" = "none" }
@@ -43,11 +42,6 @@ module Test_libvirtd =
        { "prio_workers" = "5" }
        { "max_requests" = "20" }
        { "max_client_requests" = "5" }
-        { "admin_min_workers" = "1" }
-        { "admin_max_workers" = "5" }
-        { "admin_max_clients" = "5" }
-        { "admin_max_queued_clients" = "5" }
-        { "admin_max_client_requests" = "5" }
        { "log_level" = "3" }
        { "log_filters" = "3:remote 4:event" }
        { "log_outputs" = "3:syslog:libvirtd" }
@@ -58,6 +52,3 @@ module Test_libvirtd =
        { "keepalive_interval" = "5" }
        { "keepalive_count" = "5" }
        { "keepalive_required" = "1" }
-        { "admin_keepalive_required" = "1" }
-        { "admin_keepalive_interval" = "5" }
-        { "admin_keepalive_count" = "5" }
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in

-## Copyright (C) 2005-2015 Red Hat, Inc.
+## Copyright (C) 2005-2013 Red Hat, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public
@@ -25,22 +25,9 @@ DOC_SOURCE_DIR=../src

 DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt

-apihtml =					\
-  html/index.html				\
-  $(apihtml_generated)
-
-apihtml_generated = \
-  html/libvirt-libvirt-domain.html		\
-  html/libvirt-libvirt-domain-snapshot.html	\
-  html/libvirt-libvirt-event.html		\
-  html/libvirt-libvirt-host.html		\
-  html/libvirt-libvirt-interface.html		\
-  html/libvirt-libvirt-network.html		\
-  html/libvirt-libvirt-nodedev.html		\
-  html/libvirt-libvirt-nwfilter.html		\
-  html/libvirt-libvirt-secret.html		\
-  html/libvirt-libvirt-storage.html		\
-  html/libvirt-libvirt-stream.html		\
+apihtml =			\
+  html/index.html		\
+  html/libvirt-libvirt.html	\
  html/libvirt-virterror.html

 apipng =	\
@@ -53,6 +40,7 @@ devhelphtml =			\
  devhelp/libvirt.devhelp	\
  devhelp/index.html		\
  devhelp/general.html		\
+  devhelp/libvirt-libvirt.html	\
  devhelp/libvirt-virterror.html

 css =         \
@@ -128,15 +116,8 @@ lxc_xml = \
  libvirt-lxc-api.xml \
  libvirt-lxc-refs.xml

-admin_xml = \
-  libvirt-admin-api.xml \
-  libvirt-admin-refs.xml
-
 apidir = $(pkgdatadir)/api
-api_DATA = \
-       libvirt-api.xml \
-       libvirt-qemu-api.xml \
-       libvirt-lxc-api.xml
+api_DATA = libvirt-api.xml libvirt-qemu-api.xml libvirt-lxc-api.xml

 fig = \
  libvirt-net-logical.fig \
@@ -162,7 +143,7 @@ EXTRA_DIST=					\
  sitemap.html.in aclperms.htmlinc \
  todo.pl hvsupport.pl todo.cfg-example

-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc

 $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
        $(srcdir)/genaclperms.pl Makefile.am
@@ -181,7 +162,6 @@ all-am: web
 api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml
 qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
 lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml
-admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml

 web: $(dot_html) $(internals_html) html/index.html devhelp/index.html \
  $(dot_php)
@@ -204,13 +184,13 @@ todo:
 	rm -f todo.html.in
 	$(MAKE) todo.html

-hvsupport.html: $(srcdir)/hvsupport.html.in
+hvsupport.html:: $(srcdir)/hvsupport.html.in

-$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
-		$(top_srcdir)/src/libvirt_public.syms \
-	$(top_srcdir)/src/libvirt_qemu.syms $(top_srcdir)/src/libvirt_lxc.syms \
-	$(top_srcdir)/src/driver.h
-	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \
+$(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl \
+		$(srcdir)/../src/libvirt_public.syms \
+	$(srcdir)/../src/libvirt_qemu.syms $(srcdir)/../src/libvirt_lxc.syms \
+	$(srcdir)/../src/driver.h
+	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(srcdir)/../src > $@ \
 		|| { rm $@ && exit 1; }

 .PHONY: todo
@@ -227,7 +207,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 	    $(top_srcdir)/docs/subsite.xsl $< > $@ \
 	    || { rm $@ && exit 1; }; fi

-%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
+%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
 	@if [ -x $(XSLTPROC) ] ; then \
 	  echo "Generating $@"; \
 	  name=`echo $@ | sed -e 's/.tmp//'`; \
@@ -243,7 +223,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 	  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
+	  else echo "missing XHTML1 DTD" ; fi ; fi

 %.php.tmp: %.php.in site.xsl page.xsl sitemap.html.in
 	@if [ -x $(XSLTPROC) ] ; then \
@@ -259,8 +239,6 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
 	    -e /php_placeholder/d < $@.tmp > $(srcdir)/$@ \
 	    || { rm $(srcdir)/$@ && exit 1; }; fi

-$(apihtml_generated): html/index.html
-
 html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
 	  $(XSLTPROC) --nonet -o $(srcdir)/ \
@@ -271,7 +249,7 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
 	    > /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
+	  else echo "missing XHTML1 DTD" ; fi ; fi

 $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)
 	$(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
@@ -280,9 +258,9 @@ $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl)


 python_generated_files = \
+		$(srcdir)/html/libvirt-libvirt.html \
 		$(srcdir)/html/libvirt-libvirt-lxc.html \
 		$(srcdir)/html/libvirt-libvirt-qemu.html \
-		$(srcdir)/html/libvirt-libvirt-admin.html \
 		$(srcdir)/html/libvirt-virterror.html \
 		$(srcdir)/libvirt-api.xml \
 		$(srcdir)/libvirt-refs.xml \
@@ -290,8 +268,6 @@ python_generated_files = \
 		$(srcdir)/libvirt-lxc-refs.xml \
 		$(srcdir)/libvirt-qemu-api.xml \
 		$(srcdir)/libvirt-qemu-refs.xml \
-		$(srcdir)/libvirt-admin-api.xml \
-		$(srcdir)/libvirt-admin-refs.xml \
 		$(NULL)

 APIBUILD=$(srcdir)/apibuild.py
@@ -301,29 +277,16 @@ EXTRA_DIST += $(APIBUILD_STAMP)
 $(python_generated_files): $(APIBUILD_STAMP)

 $(APIBUILD_STAMP): $(srcdir)/apibuild.py \
-		$(top_srcdir)/include/libvirt/libvirt.h.in \
-		$(top_srcdir)/include/libvirt/libvirt-domain-snapshot.h \
-		$(top_srcdir)/include/libvirt/libvirt-domain.h \
-		$(top_srcdir)/include/libvirt/libvirt-event.h \
-		$(top_srcdir)/include/libvirt/libvirt-host.h \
-		$(top_srcdir)/include/libvirt/libvirt-interface.h \
-		$(top_srcdir)/include/libvirt/libvirt-network.h \
-		$(top_srcdir)/include/libvirt/libvirt-nodedev.h \
-		$(top_srcdir)/include/libvirt/libvirt-nwfilter.h \
-		$(top_srcdir)/include/libvirt/libvirt-secret.h \
-		$(top_srcdir)/include/libvirt/libvirt-storage.h \
-		$(top_srcdir)/include/libvirt/libvirt-stream.h \
-		$(top_srcdir)/include/libvirt/libvirt-lxc.h \
-		$(top_srcdir)/include/libvirt/libvirt-qemu.h \
-		$(top_srcdir)/include/libvirt/libvirt-admin.h \
-		$(top_srcdir)/include/libvirt/virterror.h \
-		$(top_srcdir)/src/libvirt.c \
-		$(top_srcdir)/src/libvirt-lxc.c \
-		$(top_srcdir)/src/libvirt-qemu.c \
-		$(top_srcdir)/src/libvirt-admin.c \
-		$(top_srcdir)/src/util/virerror.c \
-		$(top_srcdir)/src/util/virevent.c \
-		$(top_srcdir)/src/util/virtypedparam.c
+		$(srcdir)/../include/libvirt/libvirt.h.in \
+		$(srcdir)/../include/libvirt/libvirt-lxc.h \
+		$(srcdir)/../include/libvirt/libvirt-qemu.h \
+		$(srcdir)/../include/libvirt/virterror.h \
+		$(srcdir)/../src/libvirt.c \
+		$(srcdir)/../src/libvirt-lxc.c \
+		$(srcdir)/../src/libvirt-qemu.c \
+		$(srcdir)/../src/util/virerror.c \
+		$(srcdir)/../src/util/virevent.c \
+		$(srcdir)/../src/util/virtypedparam.c
 	$(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(APIBUILD)
 	touch $@

@@ -339,10 +302,9 @@ maintainer-clean-local: clean-local
 		todo.html.in
 	rm -rf $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml
 	rm -rf $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml
-	rm -rf $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml
 	rm -rf $(APIBUILD_STAMP)

-rebuild: api qemu_api lxc_api admin_api all
+rebuild: api qemu_api lxc_api all

 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
--- a/docs/acl.html.in
+++ b/docs/acl.html.in
@@ -90,7 +90,7 @@
      types in its API. Each object type, in turn, has a set
      of permissions defined. To determine what permissions
      are checked for specific API call, consult the
-      <a href="html/index.html">API reference manual</a>
+      <a href="html/libvirt-libvirt.html">API reference manual</a>
      documentation for the API in question.
    </p>

--- a/docs/aclpolkit.html.in
+++ b/docs/aclpolkit.html.in
@@ -121,7 +121,7 @@
          <td>Name of the network interface, unique to the local host</td>
        </tr>
        <tr>
-          <td>interface_macaddr</td>
+          <td>interface_mac</td>
          <td>MAC address of the network interface, not unique</td>
        </tr>
      </tbody>
@@ -348,12 +348,6 @@
      <code>lookup</code> method.
    </p>

-    <p>
-    See
-    <a href="http://libvirt.org/git/?p=libvirt.git;a=tree;f=examples/polkit;hb=HEAD">source code</a>
-    for a more complex example.
-    </p>
-
    <h3><a name="exconnect">Example: restricting ability to connect to drivers</a></h3>

    <p>
--- a/docs/api.html.in
+++ b/docs/api.html.in
@@ -16,7 +16,7 @@
    manipulated through the API is the <code>virConnectPtr</code>, which
    represents the connection to a hypervisor. Any application using libvirt
    is likely to start using the
-    API by calling one of <a href="html/libvirt-libvirt-host.html#virConnectOpen"
+    API by calling one of <a href="html/libvirt-libvirt.html#virConnectOpen"
    >the virConnectOpen functions</a>. You will note that those functions take
    a name argument which is actually a <a href="uri.html">connection URI</a>
    to select the right hypervisor to open.
@@ -26,10 +26,7 @@
    name will default to a preselected hypervisor, but it's probably not a
    wise thing to do in most cases. See the <a href="uri.html">connection
    URI</a> page for a full descriptions of the values allowed.</p>
-    <p> OnDevice the application obtains a
-      <a href="/html/libvirt-libvirt-host.html#virConnectPtr">
-        <code>virConnectPtr</code>
-      </a>
+    <p> Once the application obtains a <code class='docref'>virConnectPtr</code>
    connection to the hypervisor it can then use it to manage the hypervisor's
    available domains and related virtualization
    resources, such as storage and networking. All those are
@@ -41,61 +38,33 @@
    </p>
    <p> The figure above shows the five main objects exported by the API:</p>
    <ul>
-      <li>
-        <a href="html/libvirt-libvirt-host.html#virConnectPtr">
-          <code>virConnectPtr</code>
-        </a>
+      <li><code class='docref'>virConnectPtr</code>
      <p>Represents the connection to a hypervisor. Use one of the
-      <a href="html/libvirt-libvirt-host.html#virConnectOpen">virConnectOpen</a>
+      <a href="html/libvirt-libvirt.html#virConnectOpen">virConnectOpen</a>
      functions to obtain connection to the hypervisor which is then used
      as a parameter to other connection API's.</p></li>
-      <li>
-        <a href="html/libvirt-libvirt-domain.html#virDomainPtr">
-          <code>virDomainPtr</code>
-        </a>
+      <li><code class='docref'>virDomainPtr</code>
      <p>Represents one domain either active or defined (i.e. existing as
      permanent config file and storage but not currently running on that
-      node). The function
-        <a href="html/libvirt-libvirt-domain.html#virConnectListAllDomains">
-          <code>virConnectListAllDomains</code>
-        </a>
+      node). The function <code class='docref'>virConnectListAllDomains</code>
      lists all the domains for the hypervisor.</p></li>
-      <li>
-        <a href="html/libvirt-libvirt-network.html#virNetworkPtr">
-          <code>virNetworkPtr</code>
-        </a>
+      <li><code class='docref'>virNetworkPtr</code>
      <p>Represents one network either active or defined (i.e. existing
      as permanent config file and storage but not currently activated).
-      The function
-        <a href="html/libvirt-libvirt-network.html#virConnectListAllNetworks">
-          <code>virConnectListAllNetworks</code>
-        </a>
+      The function <code class='docref'>virConnectListAllNetworks</code>
      lists all the virtualization networks for the hypervisor.</p></li>
-      <li>
-        <a href="html/libvirt-libvirt-storage.html#virStorageVolPtr">
-          <code>virStorageVolPtr</code>
-        </a>
+      <li><code class='docref'>virStorageVolPtr</code>
      <p>Represents one storage volume generally used
      as a block device available to one of the domains. The function
-        <a href="html/libvirt-libvirt-storage.html#virStorageVolLookupByPath">
-          <code>virStorageVolLookupByPath</code>
-        </a>
-      finds the storage volume object based on its path on the node.</p></li>
-      <li>
-        <a href="html/libvirt-libvirt-storage.html#virStoragePoolPtr">
-          <code>virStoragePoolPtr</code>
-        </a>
+      <code class="docref">virStorageVolLookupByPath</code> finds
+      the storage volume object based on its path on the node.</p></li>
+      <li><code class='docref'>virStoragePoolPtr</code>
      <p>Represents a storage pool, which is a logical area
      used to allocate and store storage volumes. The function
-        <a href="html/libvirt-libvirt-storage.html#virConnectListAllStoragePools">
-          <code>virConnectListAllStoragePools</code>
-        </a>
-      lists all of the virtualization storage pools on the hypervisor.
-      The function
-        <a href="html/libvirt-libvirt-storage.html#virStoragePoolLookupByVolume">
-          <code>virStoragePoolLookupByVolume</code>
-        </a>
-      finds the storage pool containing a given storage volume.</p></li>
+      <code class='docref'>virConnectListAllStoragePools</code> lists
+      all of the virtualization storage pools on the hypervisor. The function
+      <code class="docref">virStoragePoolLookupByVolume</code> finds
+      the storage pool containing a given storage volume.</p></li>
    </ul>
    <p> Most objects manipulated by the library can also be represented using
      XML descriptions. This is used primarily to create those object, but is
@@ -132,114 +101,42 @@
      <p>Used to perform lookups on objects by some type of identifier,
      such as:</p>
          <ul>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virDomainLookupByID">
-                <code>virDomainLookupByID</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virDomainLookupByName">
-                <code>virDomainLookupByName</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virDomainLookupByUUID">
-                <code>virDomainLookupByUUID</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virDomainLookupByUUIDString">
-                <code>virDomainLookupByUUIDString</code>
-              </a>
-            </li>
+            <li><code class='docref'>virDomainLookupByID</code></li>
+            <li><code class='docref'>virDomainLookupByName</code></li>
+            <li><code class='docref'>virDomainLookupByUUID</code></li>
+            <li><code class='docref'>virDomainLookupByUUIDString</code></li>
          </ul>
      </li>
      <li><b>Enumeration</b> [virConnectList..., virConnectNumOf...]
      <p>Used to enumerate a set of object available to an given
      hypervisor connection such as:</p>
          <ul>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virConnectListDomains">
-                <code>virConnectListDomains</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-domain.html#virConnectNumOfDomains">
-                <code>virConnectNumOfDomains</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-network.html#virConnectListNetworks">
-                <code>virConnectListNetworks</code>
-              </a>
-            </li>
-            <li>
-              <a href="html/libvirt-libvirt-storage.html#virConnectListStoragePools">
-                <code>virConnectListStoragePools</code>
-              </a>
-            </li>
+            <li><code class='docref'>virConnectListDomains</code></li>
+            <li><code class='docref'>virConnectNumOfDomains</code></li>
+            <li><code class='docref'>virConnectListNetworks</code></li>
+            <li><code class='docref'>virConnectListStoragePools</code></li>
          </ul>
      </li>
      <li><b>Description</b> [...GetInfo]
      <p>Generic accessor providing a set of generic information about an
      object, such as: </p>
        <ul>
-          <li>
-            <a href="html/libvirt-libvirt-host.html#virNodeGetInfo">
-              <code>virNodeGetInfo</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainGetInfo">
-              <code>virDomainGetInfo</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-storage.html#virStoragePoolGetInfo">
-              <code>virStoragePoolGetInfo</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-storage.html#virStorageVolGetInfo">
-              <code>virStorageVolGetInfo</code>
-            </a>
-          </li>
+          <li><code class='docref'>virNodeGetInfo</code></li>
+          <li><code class='docref'>virDomainGetInfo</code></li>
+          <li><code class='docref'>virStoragePoolGetInfo</code></li>
+          <li><code class='docref'>virStorageVolGetInfo</code></li>
        </ul>
      </li>
      <li><b>Accessors</b> [...Get..., ...Set...]
      <p>Specific accessors used to query or modify data for the given object,
      such as: </p>
        <ul>
-          <li>
-            <a href="html/libvirt-libvirt-host.html#virConnectGetType">
-              <code>virConnectGetType</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainGetMaxMemory">
-              <code>virDomainGetMaxMemory</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainSetMemory">
-              <code>virDomainSetMemory</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainGetVcpus">
-              <code>virDomainGetVcpus</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-storage.html#virStoragePoolSetAutostart">
-              <code>virStoragePoolSetAutostart</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-network.html#virNetworkGetBridgeName">
-              <code>virNetworkGetBridgeName</code>
-            </a>
-          </li>
+          <li><code class='docref'>virConnectGetType</code></li>
+          <li><code class='docref'>virDomainGetMaxMemory</code></li>
+          <li><code class='docref'>virDomainSetMemory</code></li>
+          <li><code class='docref'>virDomainGetVcpus</code></li>
+          <li><code class='docref'>virStoragePoolSetAutostart</code></li>
+          <li><code class='docref'>virNetworkGetBridgeName</code></li>
        </ul>
      </li>
      <li><b>Creation</b> [...Create, ...CreateXML]
@@ -247,53 +144,21 @@
      the object based on an XML description, while the ...Create APIs will
      create the object based on existing object pointer, such as: </p>
        <ul>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainCreate">
-              <code>virDomainCreate</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainCreateXML">
-              <code>virDomainCreateXML</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-network.html#virNetworkCreate">
-              <code>virNetworkCreate</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-network.html#virNetworkCreateXML">
-              <code>virNetworkCreateXML</code>
-            </a>
-          </li>
+          <li><code class='docref'>virDomainCreate</code></li>
+          <li><code class='docref'>virDomainCreateXML</code></li>
+          <li><code class='docref'>virNetworkCreate</code></li>
+          <li><code class='docref'>virNetworkCreateXML</code></li>
        </ul>
      </li>
      <li><b>Destruction</b> [...Destroy]
      <p>Used to shutdown or deactivate and destroy objects, such as: </p>
        <ul>
-          <li>
-            <a href="html/libvirt-libvirt-domain.html#virDomainDestroy">
-              <code>virDomainDestroy</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-network.html#virNetworkDestroy">
-              <code>virNetworkDestroy</code>
-            </a>
-          </li>
-          <li>
-            <a href="html/libvirt-libvirt-storage.html#virStoragePoolDestroy">
-              <code>virStoragePoolDestroy</code>
-            </a>
-          </li>
+          <li><code class='docref'>virDomainDestroy</code></li>
+          <li><code class='docref'>virNetworkDestroy</code></li>
+          <li><code class='docref'>virStoragePoolDestroy</code></li>
        </ul>
      </li>
    </ul>
-    <p>Note: functions returning vir*Ptr (like the virDomainLookup functions)
-    allocate memory which needs to be freed by the caller by the corresponding
-    vir*Free function (e.g. virDomainFree for a virDomainPtr object).
-    </p>
    <p> For more in-depth details of the storage related APIs see
      <a href="storage.html">the storage management page</a>.
    </p>
@@ -301,11 +166,7 @@
    <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
-    part of the
-      <a href="html/libvirt-libvirt-host.html#virInitialize">
-        <code>virInitialize</code>
-      </a>
-    API. Each driver
+    part of the <code class='docref'>virInitialize</code> API. Each driver
    has a registration API which loads up the driver specific function
    references for the libvirt APIs to call. The following is a simplistic
    view of the hypervisor driver mechanism. Consider the stacked list of
@@ -330,14 +191,11 @@
    daemon through the <a href="remote.html">remote</a> driver via an
    <a href="internals/rpc.html">RPC</a>. Some hypervisors do support
    client-side connections and responses, such as Test, OpenVZ, VMware,
-    Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo.
+    Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Parallels.
    The libvirtd daemon service is started on the host at system boot
    time and can also be restarted at any time by a properly privileged
    user, such as root. The libvirtd daemon uses the same libvirt API
-    <a href="html/libvirt-libvirt-host.html#virInitialize">
-      <code>virInitialize</code>
-    </a>
-    sequence as applications
+    <code class='docref'>virInitialize</code> sequence as applications
    for client-side driver registrations, but then extends the registered
    driver list to encompass all known drivers supported for all driver
    types supported on the host. </p>
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -21,29 +21,9 @@ debugsym=None
 # C parser analysis code
 #
 included_files = {
-  "libvirt-domain.h": "header with general libvirt API definitions",
-  "libvirt-domain-snapshot.h": "header with general libvirt API definitions",
-  "libvirt-event.h": "header with general libvirt API definitions",
-  "libvirt-host.h": "header with general libvirt API definitions",
-  "libvirt-interface.h": "header with general libvirt API definitions",
-  "libvirt-network.h": "header with general libvirt API definitions",
-  "libvirt-nodedev.h": "header with general libvirt API definitions",
-  "libvirt-nwfilter.h": "header with general libvirt API definitions",
-  "libvirt-secret.h": "header with general libvirt API definitions",
-  "libvirt-storage.h": "header with general libvirt API definitions",
-  "libvirt-stream.h": "header with general libvirt API definitions",
+  "libvirt.h": "header with general libvirt API definitions",
  "virterror.h": "header with error specific API definitions",
  "libvirt.c": "Main interfaces for the libvirt library",
-  "libvirt-domain.c": "Domain interfaces for the libvirt library",
-  "libvirt-domain-snapshot.c": "Domain snapshot interfaces for the libvirt library",
-  "libvirt-host.c": "Host interfaces for the libvirt library",
-  "libvirt-interface.c": "Interface interfaces for the libvirt library",
-  "libvirt-network.c": "Network interfaces for the libvirt library",
-  "libvirt-nodedev.c": "Node device interfaces for the libvirt library",
-  "libvirt-nwfilter.c": "NWFilter interfaces for the libvirt library",
-  "libvirt-secret.c": "Secret interfaces for the libvirt library",
-  "libvirt-storage.c": "Storage interfaces for the libvirt library",
-  "libvirt-stream.c": "Stream interfaces for the libvirt library",
  "virerror.c": "implements error handling and reporting code for libvirt",
  "virevent.c": "event loop for monitoring file handles",
  "virtypedparam.c": "virTypedParameters APIs",
@@ -59,11 +39,6 @@ lxc_included_files = {
  "libvirt-lxc.c": "Implementations for the LXC specific APIs",
 }

-admin_included_files = {
-  "libvirt-admin.h": "header with admin specific API definitions",
-  "libvirt-admin.c": "Implementations for the admin specific APIs",
-}
-
 ignored_words = {
  "ATTRIBUTE_UNUSED": (0, "macro keyword"),
  "ATTRIBUTE_SENTINEL": (0, "macro keyword"),
@@ -90,7 +65,6 @@ ignored_functions = {
  "virDomainMigratePrepareTunnel3": "private function for tunnelled migration",
  "DllMain": "specific function for Win32",
  "virTypedParamsValidate": "internal function in virtypedparam.c",
-  "virTypedParameterValidateSet": "internal function in virtypedparam.c",
  "virTypedParameterAssign": "internal function in virtypedparam.c",
  "virTypedParameterAssignFromStr": "internal function in virtypedparam.c",
  "virTypedParameterToString": "internal function in virtypedparam.c",
@@ -102,7 +76,6 @@ ignored_functions = {
  "virDomainMigratePrepare3Params": "private function for migration",
  "virDomainMigrateConfirm3Params": "private function for migration",
  "virDomainMigratePrepareTunnel3Params": "private function for tunnelled migration",
-  "virErrorCopyNew": "private",
 }

 ignored_macros = {
@@ -465,14 +438,6 @@ class CLexer:
            if line[0] == '#':
                self.tokens = map((lambda x: ('preproc', x)),
                                  string.split(line))
-
-                # We might have whitespace between the '#' and preproc
-                # macro name, so instead of having a single token element
-                # of '#define' we might end up with '#' and 'define'. This
-                # merges them back together
-                if self.tokens[0][1] == "#":
-                    self.tokens[0] = ('preproc', self.tokens[0][1] + self.tokens[1][1])
-                    self.tokens = self.tokens[:1] + self.tokens[2:]
                break
            l = len(line)
            if line[0] == '"' or line[0] == "'":
@@ -1034,12 +999,9 @@ class CParser:
                    name = string.split(name, '(') [0]
                except:
                    pass
-                strValue = None
-                if len(lst) == 1 and lst[0][0] == '"' and lst[0][-1] == '"':
-                    strValue = lst[0][1:-1]
-                (args, desc) = self.parseMacroComment(name, not self.is_header)
+                info = self.parseMacroComment(name, not self.is_header)
                self.index_add(name, self.filename, not self.is_header,
-                               "macro", (args, desc, strValue))
+                                "macro", info)
                return token

        #
@@ -1365,32 +1327,32 @@ class CParser:
                token = self.token()
                return token
            elif token[0] == "name":
-                self.cleanupComment()
-                if name is not None:
-                    if self.comment is not None:
-                        comment = string.strip(self.comment)
-                        self.comment = None
-                    self.enums.append((name, value, comment))
-                name = token[1]
-                comment = ""
-                token = self.token()
-                if token[0] == "op" and token[1][0] == "=":
-                    value = ""
-                    if len(token[1]) > 1:
-                        value = token[1][1:]
+                    self.cleanupComment()
+                    if name is not None:
+                        if self.comment is not None:
+                            comment = string.strip(self.comment)
+                            self.comment = None
+                        self.enums.append((name, value, comment))
+                    name = token[1]
+                    comment = ""
                    token = self.token()
-                    while token[0] != "sep" or (token[1] != ',' and
-                          token[1] != '}'):
-                        value = value + token[1]
+                    if token[0] == "op" and token[1][0] == "=":
+                        value = ""
+                        if len(token[1]) > 1:
+                            value = token[1][1:]
+                        token = self.token()
+                        while token[0] != "sep" or (token[1] != ',' and
+                              token[1] != '}'):
+                            value = value + token[1]
+                            token = self.token()
+                    else:
+                        try:
+                            value = "%d" % (int(value) + 1)
+                        except:
+                            self.warning("Failed to compute value of enum %s" % (name))
+                            value=""
+                    if token[0] == "sep" and token[1] == ",":
                        token = self.token()
-                else:
-                    try:
-                        value = "%d" % (int(value) + 1)
-                    except:
-                        self.warning("Failed to compute value of enum %s" % (name))
-                        value=""
-                if token[0] == "sep" and token[1] == ",":
-                    token = self.token()
            else:
                token = self.token()
        return token
@@ -2027,8 +1989,6 @@ class docBuilder:
            self.includes = includes + qemu_included_files.keys()
        elif name == "libvirt-lxc":
            self.includes = includes + lxc_included_files.keys()
-        elif name == "libvirt-admin":
-            self.includes = includes + admin_included_files.keys()
        self.modules = {}
        self.headers = {}
        self.idx = index()
@@ -2155,30 +2115,24 @@ class docBuilder:

    def serialize_macro(self, output, name):
        id = self.idx.macros[name]
-        output.write("    <macro name='%s' file='%s'" % (name,
+        output.write("    <macro name='%s' file='%s'>\n" % (name,
                     self.modulename_file(id.header)))
-        if id.info is None:
-            args = []
-            desc = None
-            strValue = None
-        else:
-            (args, desc, strValue) = id.info
-
-        if strValue is not None:
-            output.write(" string='%s'" % strValue)
-        output.write(">\n")
-
-        if desc is not None and desc != "":
-            output.write("      <info><![CDATA[%s]]></info>\n" % (desc))
-            self.indexString(name, desc)
-        for arg in args:
-            (name, desc) = arg
-            if desc is not None and desc != "":
-                output.write("      <arg name='%s' info='%s'/>\n" % (
-                             name, escape(desc)))
-                self.indexString(name, desc)
-            else:
-                output.write("      <arg name='%s'/>\n" % (name))
+        if id.info is not None:
+            try:
+                (args, desc) = id.info
+                if desc is not None and desc != "":
+                    output.write("      <info><![CDATA[%s]]></info>\n" % (desc))
+                    self.indexString(name, desc)
+                for arg in args:
+                    (name, desc) = arg
+                    if desc is not None and desc != "":
+                        output.write("      <arg name='%s' info='%s'/>\n" % (
+                                     name, escape(desc)))
+                        self.indexString(name, desc)
+                    else:
+                        output.write("      <arg name='%s'/>\n" % (name))
+            except:
+                pass
        output.write("    </macro>\n")

    def serialize_union(self, output, field, desc):
@@ -2568,7 +2522,7 @@ class docBuilder:


 def rebuild(name):
-    if name not in ["libvirt", "libvirt-qemu", "libvirt-lxc", "libvirt-admin"]:
+    if name not in ["libvirt", "libvirt-qemu", "libvirt-lxc"]:
        self.warning("rebuild() failed, unknown module %s") % name
        return None
    builder = None
@@ -2612,7 +2566,6 @@ if __name__ == "__main__":
        rebuild("libvirt")
        rebuild("libvirt-qemu")
        rebuild("libvirt-lxc")
-        rebuild("libvirt-admin")
    if warnings > 0:
        sys.exit(2)
    else:
--- a/docs/apps.html.in
+++ b/docs/apps.html.in
@@ -163,21 +163,25 @@
    <h2><a name="conversion">Conversion</a></h2>

    <dl>
-      <dt><a href="http://libguestfs.org/virt-p2v.1.html">virt-p2v</a></dt>
+      <dt><a href="https://rwmj.wordpress.com/2009/10/13/poor-mans-p2v/">Poor mans p2v</a></dt>
      <dd>
-        Convert a physical machine to run on KVM.  It is a LiveCD
-        which is booted on the machine to be converted.  It collects a
-        little information from the user, then copies the disks over
-        to a remote machine and defines the XML for a domain to run
-        the guest.  (Note this tool is included with libguestfs)
+        A simple approach for converting a physical machine to a virtual
+        machine, using a rescue CD.
      </dd>
-      <dt><a href="http://libguestfs.org/virt-v2v.1.html">virt-v2v</a></dt>
+      <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt>
      <dd>
-        virt-v2v converts guests from a foreign hypervisor to run on
-        KVM, managed by libvirt.  It can convert guests from VMware or
-        Xen to run on OpenStack, oVirt (RHEV-M), or local libvirt.  It
+        An older tool for converting a physical machine into a virtual
+        machine.  It is a LiveCD which is booted on the machine to be
+        converted.  It collects a little information from the user, then
+        copies the disks over to a remote machine and defines the XML for a
+        domain to run the guest.
+      </dd>
+      <dt><a href="http://git.fedorahosted.org/git/?p=virt-v2v.git;a=summary">virt-v2v</a></dt>
+      <dd>
+        virt-v2v converts guests from a foreign hypervisor to run on KVM,
+        managed by libvirt.  It can currently convert Red Hat Enterprise
+        Linux (RHEL) and Fedora guests running on Xen and VMware ESX.  It
        will enable VirtIO drivers in the converted guest if possible.
-        (Note this tool is included with libguestfs)
      </dd>
      <dd>
        For RHEL customers of Red Hat, conversion of Windows guests is also
@@ -262,16 +266,6 @@
        using a dashboard.  Compute part uses libvirt to manage VM
        life-cycle, monitoring and so on.
      </dd>
-
-      <dt><a href="https://github.com/gustavfranssonnyvell/cherrypop">Cherrypop</a></dt>
-      <dd>
-        A cloud software with no masters or central points. Nodes
-        autodetect other nodes and autodistribute virtual
-        machines and autodivide up the workload. Also there is no
-        minimum limit for hosts, well, one might be nice. It's
-        perfect for setting up low-end servers in a cloud or a
-        cloud where you want the most bang for the bucks.
-      </dd>
    </dl>

    <h2><a name="libraries">Libraries</a></h2>
@@ -331,12 +325,6 @@
        For a full description, please refer to the libvirt section in the
        collectd.conf(5) manual page.
      </dd>
-      <dt><a href="http://host-sflow.sourceforge.net/">Host sFlow</a></dt>
-      <dd>
-        Host sFlow is a lightweight agent running on KVM hypervisors that
-        links to libvirt library and exports standardized cpu, memory, network
-        and disk metrics for all virtual machines.
-      </dd>
      <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt>
      <dd>
        The plugins provided by Guido G&uuml;nther allow to monitor various things
@@ -420,14 +408,6 @@
        functions, such as live migration that allows for load
        balancing between cluster nodes, monitoring CPU, memory.
      </dd>
-      <dt><a href="http://mist.io/">mist.io</a></dt>
-      <dd>
-        Mist.io is an open source project and a service that can assist you in
-        managing your virtual machines on a unified way, providing a simple
-        interface for all of your infrastructure (multiple public cloud
-        providers, OpenStack based public/private clouds, Docker servers, bare
-        metal servers and now KVM hypervisors).
-      </dd>
    </dl>

    <h2><a name="mobile">Mobile applications</a></h2>
--- a/docs/auditlog.html.in
+++ b/docs/auditlog.html.in
@@ -285,41 +285,6 @@
      <dd>Updated path of the host entropy source for the RNG</dd>
    </dl>

-    <h4><a name="typeresourcechardev">console/serial/parallel/channel</a></h4>
-    <p>
-      The <code>msg</code> field will include the following sub-fields
-    </p>
-
-    <dl>
-      <dt>reason</dt>
-      <dd>The reason which caused the resource to be assigned to happen</dd>
-      <dt>resrc</dt>
-      <dd>The type of resource assigned. Set to <code>chardev</code></dd>
-      <dt>old-chardev</dt>
-      <dd>Original path of the backing character device for given emulated device</dd>
-      <dt>new-chardev</dt>
-      <dd>Updated path of the backing character device for given emulated device</dd>
-    </dl>
-
-    <h4><a name="typeresourcesmartcard">smartcard</a></h4>
-    <p>
-      The <code>msg</code> field will include the following sub-fields
-    </p>
-
-    <dl>
-      <dt>reason</dt>
-      <dd>The reason which caused the resource to be assigned to happen</dd>
-      <dt>resrc</dt>
-      <dd>The type of resource assigned. Set to <code>smartcard</code></dd>
-      <dt>old-smartcard</dt>
-      <dd>Original path of the backing character device, certificate store or
-          "nss-smartcard-device" for host smartcard passthrough.
-      </dd>
-      <dt>new-smartcard</dt>
-      <dd>Updated path of the backing character device, certificate store or
-          "nss-smartcard-device" for host smartcard passthrough.
-      </dd>
-    </dl>

    <h4><a name="typeresourceredir">Redirected device</a></h4>
    <p>
--- a/docs/bindings.html.in
+++ b/docs/bindings.html.in
@@ -44,10 +44,8 @@
      </li>
      <li>
        <p>
-          <strong>Python</strong>: Libvirt's python bindings are split to a
-          separate <a href="http://libvirt.org/git/?p=libvirt-python.git">package</a>
-          since version 1.2.0, older versions came with direct support for the
-          Python language.
+          <strong>Python</strong>: Libvirt comes with direct support for
+          the Python language.
        </p>
        <p>
          If your libvirt is installed as packages, rather than compiled
--- a/docs/bugs.html.in
+++ b/docs/bugs.html.in
@@ -11,7 +11,7 @@

    <p>
      If you think that an issue with libvirt may have security
-      implications, <strong>please do not</strong> publicly
+      implications, <strong>please do not</strong> publically
      report it in the bug tracker, mailing lists, or irc. Libvirt
      has <a href="securityprocess.html">a dedicated process for handling (potential) security issues</a>
      that should be used instead. So if your issue has security
--- a/docs/contact.html.in
+++ b/docs/contact.html.in
@@ -10,7 +10,7 @@

    <p>
      If you think that an issue with libvirt may have security
-      implications, <strong>please do not</strong> publicly
+      implications, <strong>please do not</strong> publically
      report it in the bug tracker, mailing lists, or irc. Libvirt
      has <a href="securityprocess.html">a dedicated process for handling (potential) security issues</a>
      that should be used instead. So if your issue has security
--- a/docs/devguide.html.in
+++ b/docs/devguide.html.in
@@ -2,41 +2,55 @@
 <!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>
+    <h1>libvirt Application Development Guide</h1>
+
+    <ul id="toc"></ul>

    <p>
-      The libvirt API is accessible from a number of programming languages.
-      At this time, there are application development guides available
-      which cover the C API and the Python API. Of the two, the Python guide
-      is currently the more comprehensive document.
+      The guide is both a learning tool for developing with libvirt and an
+      API reference document. It is a work in progress, composed by a
+      professional author from contributions written by members of the
+      libvirt team.
    </p>

+    <p>
+      Contributions to the guide are <b>VERY</b> welcome. If you'd like to get
+      your name on this and demonstrate your virtualisation prowess, a solid
+      contribution to the content here will do it. :)
+    </p>
+
+    <h2><a name="online">Browsable online</a></h2>
+
    <ul>
-      <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/html/">Application Development Guide (C language) HTML</a></li>
-      <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/pdf/">Application Development Guide (C language) PDF</a></li>
-      <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/">Application Development Guide (Python language) HTML</a></li>
-      <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/pdf/">Application Development Guide (Python language) PDF</a></li>
+      <li><a href="http://libvirt.org/guide/html/">
+        HTML format using multiple pages</a></li>
+      <li><a href="http://libvirt.org/guide/html-single/">
+        HTML format using one big page</a></li>
+      <li><a href="http://libvirt.org/guide/pdf/Application_Development_Guide.pdf">
+        PDF format</a></li>
+      <li><a href="http://libvirt.org/guide/libvirt-0.7.5-Application_Development_Guide-en-US.epub">
+        ePub format</a></li>
+      <li><a href="http://libvirt.org/guide/txt/Application_Development_Guide.txt">
+        Plain text format</a></li>
+      <li><a href="http://libvirt.org/guide/libvirt-Application_Development_Guide-0.7.5-web-en-US-1-9.el5.src.rpm">
+        Source RPM format</a></li>
    </ul>

-    <h2>Contributing content</h2>
+    <h2><a name="git">GIT source repository</a></h2>

    <p>
-      These guides are written in DocBook and published with the
-      publican tool, which is also used for Fedora and Red Hat
-      documentation. The original content is provided in GIT and
-      any contributions to the guide are welcome.
+      The source is in a git repository:
    </p>

    <pre>
-      # C language
-      $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a>
+      git clone git://libvirt.org/libvirt-appdev-guide.git</pre>

-      # Python language
-      $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a>
+    <p>
+      Browsable here:
+    </p>

-      # Publican Style/Theme
-      $ git clone <a href="http://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a>
-    </pre>
+    <pre>
+      <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">http://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary</a></pre>

  </body>
 </html>
--- a/docs/downloads.html.in
+++ b/docs/downloads.html.in
@@ -71,20 +71,6 @@
    <pre>
      <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a></pre>

-    <p>
-      In addition to this repository, there are the following read-only git
-      repositories which mirror the master one. Note that we currently do not
-      use the full set of features on these mirrors (e.g. pull requests on
-      GitHub, so please don't use them). All patch review and discussion only
-      occurs on the <a href="contact.html">libvir-list</a> mailing list. Also
-      note that some repositories listed below allow HTTP checkouts too.
-    </p>
-
-    <pre>
-      <a href="https://github.com/libvirt/libvirt">https://github.com/libvirt/libvirt</a>
-      <a href="http://repo.or.cz/w/libvirt.git">http://repo.or.cz/w/libvirt.git</a>
-      <a href="https://gitlab.com/libvirt/libvirt">https://gitlab.com/libvirt/libvirt</a></pre>
-
    <br />

    <h1>libvirt Application Development Guide</h1>
--- a/docs/drivers.html.in
+++ b/docs/drivers.html.in
@@ -32,7 +32,7 @@
      <li><strong><a href="drvxen.html">Xen</a></strong></li>
      <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li>
      <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li>
-      <li><strong><a href="drvvirtuozzo.html">Virtuozzo</a></strong></li>
+      <li><strong><a href="drvparallels.html">Parallels</a></strong></li>
      <li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li>
    </ul>

--- a/docs/drvbhyve.html.in
+++ b/docs/drvbhyve.html.in
@@ -37,31 +37,20 @@ bhyve+ssh://root@example.com/system (remote access, SSH tunnelled)
 <h3>Example config</h3>
 <p>
 The bhyve driver in libvirt is in its early stage and under active development. So it supports
-only limited number of features bhyve provides.
+only limited number of features bhyve provides. All the supported features could be found
+in this sample domain XML.
 </p>

 <p>
-Note: in older libvirt versions, only a single network device and a single
-disk device were supported per-domain. However,
-<span class="since">since 1.2.6</span> the libvirt bhyve driver supports
-up to 31 PCI devices.
-</p>
-
-<p>
-Note: the Bhyve driver in libvirt will boot whichever device is first. If you
-want to install from CD, put the CD device first. If not, put the root HDD
-first.
-</p>
-
-<p>
-Note: Only the SATA bus is supported. Only <code>cdrom</code>- and
-<code>disk</code>-type disks are supported.
+A limitation that is not obvious from this sample domain XML is that currently only a
+single network and a single disk device are supported for each domain (as PCI slot allocation code
+in libvirt bhyve driver is yet to be implemented).
 </p>

 <pre>
 &lt;domain type='bhyve'&gt;
-    &lt;name&gt;bhyve&lt;/name&gt;
-    &lt;uuid&gt;df3be7e7-a104-11e3-aeb0-50e5492bd3dc&lt;/uuid&gt;
+  &lt;name&gt;bhyve&lt;/name&gt;
+  &lt;uuid&gt;df3be7e7-a104-11e3-aeb0-50e5492bd3dc&lt;/uuid&gt;
    &lt;memory&gt;219136&lt;/memory&gt;
    &lt;currentMemory&gt;219136&lt;/currentMemory&gt;
    &lt;vcpu&gt;1&lt;/vcpu&gt;
@@ -82,12 +71,6 @@ Note: Only the SATA bus is supported. Only <code>cdrom</code>- and
        &lt;source file='/path/to/bhyve_freebsd.img'/&gt;
        &lt;target dev='hda' bus='sata'/&gt;
      &lt;/disk&gt;
-      &lt;disk type='file' device='cdrom'&gt;
-        &lt;driver name='file' type='raw'/&gt;
-        &lt;source file='/path/to/cdrom.iso'/&gt;
-        &lt;target dev='hdc' bus='sata'/&gt;
-        &lt;readonly/&gt;
-      &lt;/disk&gt;
      &lt;interface type='bridge'&gt;
        &lt;model type='virtio'/&gt;
        &lt;source bridge="virbr0"/&gt;
@@ -96,53 +79,6 @@ Note: Only the SATA bus is supported. Only <code>cdrom</code>- and
 &lt;/domain&gt;
 </pre>

-<p>(The &lt;disk&gt; sections may be swapped in order to install from
-<em>cdrom.iso</em>.)</p>
-
-<h3>Example config (Linux guest)</h3>
-
-<p>
-Note the addition of &lt;bootloader&gt;.
-</p>
-
-<pre>
-&lt;domain type='bhyve'&gt;
-    &lt;name&gt;linux_guest&lt;/name&gt;
-    &lt;uuid&gt;df3be7e7-a104-11e3-aeb0-50e5492bd3dc&lt;/uuid&gt;
-    &lt;memory&gt;131072&lt;/memory&gt;
-    &lt;currentMemory&gt;131072&lt;/currentMemory&gt;
-    &lt;vcpu&gt;1&lt;/vcpu&gt;
-    &lt;bootloader&gt;/usr/local/sbin/grub-bhyve&lt;/bootloader&gt;
-    &lt;os&gt;
-       &lt;type&gt;hvm&lt;/type&gt;
-    &lt;/os&gt;
-    &lt;features&gt;
-      &lt;apic/&gt;
-      &lt;acpi/&gt;
-    &lt;/features&gt;
-    &lt;clock offset='utc'/&gt;
-    &lt;on_poweroff&gt;destroy&lt;/on_poweroff&gt;
-    &lt;on_reboot&gt;restart&lt;/on_reboot&gt;
-    &lt;on_crash&gt;destroy&lt;/on_crash&gt;
-    &lt;devices&gt;
-      &lt;disk type='file' device='disk'&gt;
-        &lt;driver name='file' type='raw'/&gt;
-        &lt;source file='/path/to/guest_hdd.img'/&gt;
-        &lt;target dev='hda' bus='sata'/&gt;
-      &lt;/disk&gt;
-      &lt;disk type='file' device='cdrom'&gt;
-        &lt;driver name='file' type='raw'/&gt;
-        &lt;source file='/path/to/cdrom.iso'/&gt;
-        &lt;target dev='hdc' bus='sata'/&gt;
-        &lt;readonly/&gt;
-      &lt;/disk&gt;
-      &lt;interface type='bridge'&gt;
-        &lt;model type='virtio'/&gt;
-        &lt;source bridge="virbr0"/&gt;
-      &lt;/interface&gt;
-    &lt;/devices&gt;
-&lt;/domain&gt;
-</pre>

 <h2><a name="usage">Guest usage / management</a></h2>

@@ -177,20 +113,6 @@ to let a guest boot or start a guest using:</p>

 <pre>start --console domname</pre>

-<p><b>NB:</b> An bootloader configured to require user interaction will prevent
-the domain from starting (and thus <code>virsh console</code> or <code>start
--console</code> from functioning) until the user interacts with it manually on
-the VM host. Because users typically do not have access to the VM host,
-interactive bootloaders are unsupported by libvirt. <em>However,</em> if you happen to
-run into this scenario and also happen to have access to the Bhyve host
-machine, you may select a boot option and allow the domain to finish starting
-by using an alternative terminal client on the VM host to connect to the
-domain-configured null modem device. One example (assuming
-<code>/dev/nmdm0B</code> is configured as the slave end of the domain serial
-device) is:</p>
-
-<pre>cu -l /dev/nmdm0B</pre>
-
 <h3><a name="xmltonative">Converting from domain XML to Bhyve args</a></h3>

 <p>
@@ -211,71 +133,6 @@ tweak them.</p>
 # virsh -c "bhyve:///system"  domxml-to-native --format bhyve-argv --xml /path/to/bhyve.xml
 /usr/sbin/bhyveload -m 214 -d /home/user/vm1.img vm1
 /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 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>
-
-<pre>
-  ...
-  &lt;disk type='volume' device='disk'&gt;
-    &lt;source pool='zfspool' volume='vol1'/&gt;
-    &lt;target dev='vdb' bus='virtio'/&gt;
-  &lt;/disk&gt;
-  ...</pre>
-
-<p>Please refer to the <a href="storage.html">Storage documentation</a> for more details on storage
-management.</p>
-
-<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
-specified as well. If the bootloader is <code>grub-bhyve</code> and arguments
-are omitted, libvirt will try and infer boot ordering from user-supplied
-&lt;boot order='N'&gt; configuration in the domain. Failing that, it will boot
-the first disk in the domain (either <code>cdrom</code>- or
-<code>disk</code>-type devices). If the disk type is <code>disk</code>, it will
-attempt to boot from the first partition in the disk image.</p>
-
-<pre>
-  ...
-    &lt;bootloader&gt;/usr/local/sbin/grub-bhyve&lt;/bootloader&gt;
-    &lt;bootloader_args&gt;...&lt;/bootloader_args&gt;
-  ...
-</pre>
-
-<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 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
-in <a href="http://svnweb.freebsd.org/changeset/base/279225">r279225</a> for <i>-CURRENT</i>.
-It's possible to use this in libvirt <span class="since">since 1.2.18</span>, just place the
-following to domain XML:</p>
-
-<pre>
-&lt;domain type="bhyve"&gt;
-    ...
-    &lt;clock offset='utc'/&gt;
-    ...
-&lt;/domain&gt;
-</pre>
-
-<p>Please note that if you run the older bhyve version that doesn't support UTC time, you'll
-fail to start a domain. As UTC is used as a default when you do not specify clock settings,
-you'll need to explicitly specify 'localtime' in this case:</p>
-
-<pre>
-&lt;domain type="bhyve"&gt;
-    ...
-    &lt;clock offset='localtime'/&gt;
-    ...
-&lt;/domain&gt;
 </pre>

  </body>
--- a/docs/drvlxc.html.in
+++ b/docs/drvlxc.html.in
@@ -88,8 +88,6 @@ to be provided by all container technologies on Linux.
 <dd>The fixed string <code>/bin:/usr/bin</code></dd>
 <dt>TERM</dt>
 <dd>The fixed string <code>linux</code></dd>
-<dt>HOME</dt>
-<dd>The fixed string <code>/</code></dd>
 </dl>

 <p>
@@ -167,7 +165,7 @@ numbered incrementally from there.

 <p>
 Since /dev/ttyN and /dev/console are linked to the pts devices. The
-tty device of login program is pts device. The pam module securetty
+tty device of login program is pts device. the pam module securetty
 may prevent root user from logging in container. If you want root
 user to log in container successfully, add the pts device to the file
 /etc/securetty of container.
@@ -542,74 +540,6 @@ debootstrap, whatever) under /opt/vm-1-root:
 &lt;/domain&gt;
 </pre>

-<h2><a name="capabilities">Altering the available capabilities</a></h2>
-
-<p>
-By default the libvirt LXC driver drops some capabilities among which CAP_MKNOD.
-However <span class="since">since 1.2.6</span> libvirt can be told to keep or
-drop some capabilities using a domain configuration like the following:
-</p>
-<pre>
-...
-&lt;features&gt;
-  &lt;capabilities policy='default'&gt;
-    &lt;mknod state='on'/&gt;
-    &lt;sys_chroot state='off'/&gt;
-  &lt;/capabilities&gt;
-&lt;/features&gt;
-...
-</pre>
-<p>
-The capabilities children elements are named after the capabilities as defined in
-<code>man 7 capabilities</code>. An <code>off</code> state tells libvirt to drop the
-capability, while an <code>on</code> state will force to keep the capability even though
-this one is dropped by default.
-</p>
-<p>
-The <code>policy</code> attribute can be one of <code>default</code>, <code>allow</code>
-or <code>deny</code>. It defines the default rules for capabilities: either keep the
-default behavior that is dropping a few selected capabilities, or keep all capabilities
-or drop all capabilities. The interest of <code>allow</code> and <code>deny</code> is that
-they guarantee that all capabilities will be kept (or removed) even if new ones are added
-later.
-</p>
-<p>
-The following example, drops all capabilities but CAP_MKNOD:
-</p>
-<pre>
-...
-&lt;features&gt;
-  &lt;capabilities policy='deny'&gt;
-    &lt;mknod state='on'/&gt;
-  &lt;/capabilities&gt;
-&lt;/features&gt;
-...
-</pre>
-<p>
-Note that allowing capabilities that are normally dropped by default can seriously
-affect the security of the container and the host.
-</p>
-
-<h2><a name="share">Inherit namespaces</a></h2>
-
-<p>
-Libvirt allows you to inherit the namespace from container/process just like lxc tools
-or docker provides to share the network namespace. The following can be used to share
-required namespaces. If we want to share only one then the other namespaces can be ignored.
-The netns option is specific to sharenet. It can be used in cases we want to use existing network namespace
-rather than creating new network namespace for the container. In this case privnet option will be
-ignored.
-</p>
-<pre>
-&lt;domain type='lxc' xmlns:lxc='http://libvirt.org/schemas/domain/lxc/1.0'&gt;
-...
-&lt;lxc:namespace&gt;
-  &lt;lxc:sharenet type='netns' value='red'/&gt;
-  &lt;lxc:shareuts type='name' value='container1'/&gt;
-  &lt;lxc:shareipc type='pid' value='12345'/&gt;
-&lt;/lxc:namespace&gt;
-&lt;/domain&gt;
-</pre>

 <h2><a name="usage">Container usage / management</a></h2>

--- a/docs/drvparallels.html.in
+++ b/docs/drvparallels.html.in
@@ -2,43 +2,43 @@
 <!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>
+    <h1>Parallels Cloud Server driver</h1>
    <ul id="toc"></ul>
    <p>
-        The libvirt vz driver can manage Virtuozzo starting from version 6.0.
+        The libvirt Parallels driver can manage Parallels Cloud Server starting from version 6.0.
    </p>


    <h2><a name="project">Project Links</a></h2>
    <ul>
      <li>
-        The <a href="http://www.odin.com/products/virtuozzo/">Virtuozzo</a> Solution.
+        The <a href="http://www.parallels.com/products/server/baremetal/sp/">Parallels Cloud Server</a> Virtualization Solution.
      </li>
    </ul>


-    <h2><a name="uri">Connections to the Virtuozzo driver</a></h2>
+    <h2><a name="uri">Connections to the Parallels Cloud Server 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:
+        The libvirt Parallels driver is a single-instance privileged driver, with a driver name of 'parallels'. Some example connection URIs for the libvirt driver are:
    </p>
 <pre>
-vz:///system                     (local access)
-vz+unix:///system                (local access)
-vz://example.com/system          (remote access, TLS/x509)
-vz+tcp://example.com/system      (remote access, SASl/Kerberos)
-vz+ssh://root@example.com/system (remote access, SSH tunnelled)
+parallels:///system                     (local access)
+parallels+unix:///system                (local access)
+parallels://example.com/system          (remote access, TLS/x509)
+parallels+tcp://example.com/system      (remote access, SASl/Kerberos)
+parallels+ssh://root@example.com/system (remote access, SSH tunnelled)
 </pre>

    <h2><a name="example">Example guest domain XML configuration</a></h2>

    <p>
-    Virtuozzo driver require at least one hard disk for new domains
+    Parallels driver require at least one hard disk for new domains
    at this time. It is used for defining directory, where VM should
    be created.
    </p>

 <pre>
-&lt;domain type='vz'&gt;
+&lt;domain type='parallels'&gt;
  &lt;name&gt;demo&lt;/name&gt;
  &lt;uuid&gt;54cdecad-4492-4e31-a209-33cc21d64057&lt;/uuid&gt;
  &lt;description&gt;some description&lt;/description&gt;
--- a/docs/errors.html.in
+++ b/docs/errors.html.in
@@ -46,9 +46,9 @@ following fields:</p>
      <li>level: the error level, usually VIR_ERR_ERROR, though there is room for
    warnings like VIR_ERR_WARNING</li>
      <li>message: the full human-readable formatted string of the error</li>
-      <li>conn: if available a pointer to the <a href="html/libvirt-libvirt-host.html#virConnectPtr">virConnectPtr</a>
+      <li>conn: if available a pointer to the <a href="html/libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>
    connection to the hypervisor where this happened</li>
-      <li>dom: if available a pointer to the <a href="html/libvirt-libvirt-domain.html#virDomainPtr">virDomainPtr</a> domain
+      <li>dom: if available a pointer to the <a href="html/libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain
    targeted in the operation</li>
    </ul>
    <p>and then extra raw information about the error which may be initialized
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -4,147 +4,19 @@
  <body>
    <h1>Driver capabilities XML format</h1>

-    <ul id="toc"></ul>
-
-    <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
-    interface has been added in 0.2.1 allowing to list the set of supported
-    virtualization capabilities on the host:</p>
-
-    <pre>    char * virConnectGetCapabilities (virConnectPtr conn);</pre>
-
-    <p>The value returned is an XML document listing the virtualization
-    capabilities of the host and virtualization engine to which
-    <code>@conn</code> is connected. One can test it using <code>virsh</code>
-    command line tool command '<code>capabilities</code>', it dumps the XML
-    associated to the current connection. </p>
-
-    <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 name="elementHost">Host capabilities</a></h3>
-
-    <p>The <code>&lt;host/&gt;</code> element consists of the following child
-    elements:</p>
-    <dl>
-      <dt><code>uuid</code></dt>
-      <dd>The host UUID.</dd>
-
-      <dt><code>cpu</code></dt>
-      <dd>The host CPU architecture and features.</dd>
-
-      <dt><code>power_management</code></dt>
-      <dd>whether host is capable of memory suspend, disk hibernation, or
-      hybrid suspend.</dd>
-
-      <dt><code>migration</code></dt>
-      <dd>This element exposes information on the hypervisor's migration
-      capabilities, like live migration, supported URI transports, and so
-      on.</dd>
-
-      <dt><code>topology</code></dt>
-      <dd>This element embodies the host internal topology. Management
-      applications may want to learn this information when orchestrating new
-      guests - e.g. due to reduce inter-NUMA node transfers.</dd>
-
-      <dt><code>secmodel</code></dt>
-      <dd>To find out default security labels for different security models you
-      need to parse this element. In contrast with the former elements, this is
-      repeated for each security model the libvirt daemon currently supports.
-      </dd>
-    </dl>
-
-
-    <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
-    using a given hypervisor. The <code>&lt;guest/&gt;</code> element will
-    typically wrap up the following elements:</p>
-
-    <dl>
-        <dt><code>os_type</code></dt>
-        <dd>This expresses what kind of operating system the hypervisor
-        is able to run. Possible values are:
-        <dl>
-          <dt>xen</dt>
-          <dd>for XEN</dd>
-
-          <dt>linux</dt>
-          <dd>legacy alias for <code>xen</code></dd>
-
-          <dt>hvm</dt>
-          <dd>Unmodified operating system</dd>
-
-          <dt>exe</dt>
-          <dd>Container based virtualization</dd>
-
-          <dt>uml</dt>
-          <dd>User Mode Linux</dd>
-        </dl>
-        </dd>
-
-        <dt><code>arch</code></dt>
-        <dd>This element brings some information on supported guest architecture.</dd>
-
-        <dt><code>features</code></dt>
-        <dd>This optional element encases possible features that can be used
-          with a guest of described type.  Possible subelements are:
-          <dl>
-            <dt>pae</dt><dd>If present, 32-bit guests can use PAE
-              address space extensions, <span class="since">since
-              0.4.1</span></dd>
-            <dt>nonpae</dt><dd>If present, 32-bit guests can be run
-              without requiring PAE, <span class="since">since
-              0.4.1</span></dd>
-            <dt>ia64_be</dt><dd>If present, IA64 guests can be run in
-              big-endian mode, <span class="since">since 0.4.1</span></dd>
-            <dt>acpi</dt><dd>If this element is present,
-              the <code>default</code> attribute describes whether the
-              hypervisor exposes ACPI to the guest by default, and
-              the <code>toggle</code> attribute describes whether the
-              user can override this
-              default. <span class="since">Since 0.4.1</span></dd>
-            <dt>apic</dt><dd>If this element is present,
-              the <code>default</code> attribute describes whether the
-              hypervisor exposes APIC to the guest by default, and
-              the <code>toggle</code> attribute describes whether the
-              user can override this
-              default. <span class="since">Since 0.4.1</span></dd>
-            <dt>cpuselection</dt><dd>If this element is present, the
-              hypervisor supports the <code>&lt;cpu&gt;</code> element
-              within a domain definition for fine-grained control over
-              the CPU presented to the
-              guest. <span class="since">Since 0.7.5</span></dd>
-            <dt>deviceboot</dt><dd>If this element is present,
-              the <code>&lt;boot order='...'/&gt;</code> element can
-              be used inside devices, rather than the older boot
-              specification by category. <span class="since">Since
-              0.8.8</span></dd>
-            <dt>disksnapshot</dt><dd>If this element is present,
-              the <code>default</code> attribute describes whether
-              external disk snapshots are supported.  If absent,
-              external snapshots may still be supported, but it
-              requires attempting the API and checking for an error to
-              find out for sure. <span class="since">Since
-              1.2.3</span></dd>
-          </dl>
-        </dd>
-    </dl>
-
-    <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
-    BIOS you will see:</p>
-
-    <pre>&lt;capabilities&gt;
+        <p>As new virtualization engine support gets added to libvirt, and to handle
+cases like QEmu supporting a variety of emulations, a query interface has
+been added in 0.2.1 allowing to list the set of supported virtualization
+capabilities on the host:</p>
+        <pre>    char * virConnectGetCapabilities (virConnectPtr conn);</pre>
+        <p>The value returned is an XML document listing the virtualization
+capabilities of the host and virtualization engine to which
+<code>@conn</code> is connected. One can test it using <code>virsh</code>
+command line tool command '<code>capabilities</code>', it dumps the XML
+associated to the current connection. For example in the case of a 64 bits
+machine with hardware virtualization capabilities enabled in the chip and
+BIOS you will see</p>
+        <pre>&lt;capabilities&gt;
  <span style="color: #E50000">&lt;host&gt;
    &lt;cpu&gt;
      &lt;arch&gt;x86_64&lt;/arch&gt;
@@ -162,7 +34,7 @@
      &lt;suspend_mem/&gt;
      &lt;suspend_disk/&gt;
      &lt;suspend_hybrid/&gt;
-    &lt;/power_management&gt;
+    &lt;power_management/&gt;
  &lt;/host&gt;</span>

  &lt;!-- xen-3.0-x86_64 --&gt;
@@ -195,5 +67,30 @@
  &lt;/guest&gt;</span>
  ...
 &lt;/capabilities&gt;</pre>
+        <p>The first block (in red) indicates the host hardware
+          capabilities, such as CPU properties and the power
+          management features of the host platform.  CPU models are
+          shown as additional features relative to the closest base
+          model, within a feature block (the block is similar to what
+          you will find in a Xen fully virtualized domain
+          description). Further, the power management features
+          supported by the host are shown, such as Suspend-to-RAM (S3),
+          Suspend-to-Disk (S4) and Hybrid-Suspend (a combination of S3
+          and S4). In case the host does not support
+          any such feature, then an empty &lt;power_management/&gt;
+          tag will be shown. </p>
+        <p>The second block (in blue) indicates the paravirtualization
+          support of the Xen support, you will see the os_type of xen
+          to indicate a paravirtual kernel, then architecture
+          information and potential features.</p>
+        <p>The third block (in green) gives similar information but
+          when running a 32 bit OS fully virtualized with Xen using
+          the hvm support.</p>
+        <p>This section is likely to be updated and augmented in the
+          future,
+          see <a href="https://www.redhat.com/archives/libvir-list/2007-March/msg00215.html">the
+          discussion</a> which led to the capabilities format in the
+          mailing-list archives.</p>
+
  </body>
 </html>
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
--- a/docs/formatdomaincaps.html.in
+++ b/docs/formatdomaincaps.html.in
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 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
-    drivers is used. For example, when management application is considering the
-    mode for a host device's passthrough there are several options depending not
-    only on host, but on hypervisor in question too. If the hypervisor is qemu
-    then it needs to be more recent to support VFIO, while legacy KVM is
-    achievable just fine with older qemus.</p>
-
-    <p>The main difference between
-      <a href="/html/libvirt-libvirt-host.html#virConnectGetCapabilities">
-        <code>virConnectGetCapabilities</code>
-      </a>
-    and the emulator capabilities API is, the former one aims more on
-    the host capabilities (e.g.  NUMA topology, security models in
-    effect, etc.) while the latter one specializes on the hypervisor
-    capabilities.</p>
-
-    <p>While the <a href="formatcaps.html">Driver Capabilities</a> provides the
-    host capabilities (e.g NUMA topology, security models in effect, etc.), the
-    Domain Capabilities provides the hypervisor specific capabilities for
-    Management Applications to query and make decisions regarding what to
-    utilize.</p>
-
-    <p>The Domain Capabilities can provide information such as the correct
-    combination of devices and drivers that are supported. Knowing which host
-    and hypervisor specific options are available or supported would allow the
-    management application to choose an appropriate mode for a pass-through
-    host device as well as which adapter to utilize.</p>
-
-    <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
-    1.2.7</span>):</p>
-
-<pre>
-<a href="/html/libvirt-libvirt-domain.html#virConnectGetDomainCapabilities">virConnectGetDomainCapabilities</a>
-</pre>
-
-    <p>The root element that emulator capability XML document starts with has
-    name <code>domainCapabilities</code>. It contains at least four direct
-    child elements:</p>
-
-<pre>
-&lt;domainCapabilities&gt;
-  &lt;path&gt;/usr/bin/qemu-system-x86_64&lt;/path&gt;
-  &lt;domain&gt;kvm&lt;/domain&gt;
-  &lt;machine&gt;pc-i440fx-2.1&lt;/machine&gt;
-  &lt;arch&gt;x86_64&lt;/arch&gt;
-  ...
-&lt;/domainCapabilities&gt;
-</pre>
-    <dl>
-      <dt>path</dt>
-      <dd>The full path to the emulator binary.</dd>
-
-      <dt>domain</dt>
-      <dd>Describes the <a href="formatdomain.html#elements">virtualization
-          type</a> (or so called domain type).</dd>
-
-      <dt>machine</dt>
-      <dd>The domain's <a href="formatdomain.html#elementsOSBIOS">machine
-          type</a>.</dd>
-
-      <dt>arch</dt>
-      <dd>The domain's <a href="formatdomain.html#elementsOSBIOS">
-          architecture</a>.</dd>
-
-    </dl>
-
-    <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>
-
-<pre>
-&lt;domainCapabilities&gt;
-  ...
-  &lt;vcpu max='255'/&gt;
-  ...
-&lt;/domainCapabilities&gt;
-</pre>
-
-    <dl>
-      <dt>vcpu</dt>
-      <dd>The maximum number of supported virtual CPUs</dd>
-    </dl>
-
-    <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
-    href="formatdomain.html#elementsOSBIOS"><code>os</code></a>
-    element exposes what values can be passed to its children.</p>
-
-<pre>
-&lt;domainCapabilities&gt;
-  ...
-  &lt;os supported='yes'&gt;
-    &lt;loader supported='yes'&gt;
-      &lt;value&gt;/usr/share/OVMF/OVMF_CODE.fd&lt;/value&gt;
-      &lt;enum name='type'&gt;
-        &lt;value&gt;rom&lt;/value&gt;
-        &lt;value&gt;pflash&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='readonly'&gt;
-        &lt;value&gt;yes&lt;/value&gt;
-        &lt;value&gt;no&lt;/value&gt;
-      &lt;/enum&gt;
-    &lt;/loader&gt;
-  &lt;/os&gt;
-  ...
-&lt;domainCapabilities&gt;
-</pre>
-
-    <p>For the <code>loader</code> element, the following can occur:</p>
-
-    <dl>
-      <dt>value</dt>
-      <dd>List of known loader paths. Currently this is only used
-      to advertise known locations of OVMF binaries for qemu. Binaries
-      will only be listed if they actually exist on disk.</dd>
-
-      <dt>type</dt>
-      <dd>Whether loader is a typical BIOS (<code>rom</code>) or
-      an UEFI binary (<code>pflash</code>). This refers to
-      <code>type</code> attribute of the &lt;loader/&gt;
-      element.</dd>
-
-      <dt>readonly</dt>
-      <dd>Options for the <code>readonly</code> attribute of the
-      &lt;loader/&gt; element.</dd>
-    </dl>
-
-    <h3><a name="elementsDevices">Devices</a></h3>
-
-    <p>
-      The final set of XML elements describe the supported devices and their
-      capabilities. All devices occur as children of the main
-      <code>devices</code> element.
-    </p>
-
-<pre>
-&lt;domainCapabilities&gt;
-  ...
-  &lt;devices&gt;
-    &lt;disk supported='yes'&gt;
-      &lt;enum name='diskDevice'&gt;
-        &lt;value&gt;disk&lt;/value&gt;
-        &lt;value&gt;cdrom&lt;/value&gt;
-        &lt;value&gt;floppy&lt;/value&gt;
-        &lt;value&gt;lun&lt;/value&gt;
-      &lt;/enum&gt;
-      ...
-    &lt;/disk&gt;
-    &lt;hostdev supported='no'/&gt;
-  &lt;/devices&gt;
-&lt;/domainCapabilities&gt;
-</pre>
-
-    <p>Reported capabilities are expressed as an enumerated list of available
-    options for each of the element or attribute.  For example, the
-    &lt;disk/&gt; element has an attribute <code>device</code> which can
-    support the values <code>disk</code>, <code>cdrom</code>,
-    <code>floppy</code>, or <code>lun</code>.</p>
-
-    <h4><a name="elementsDisks">Hard drives, floppy disks, CDROMs</a></h4>
-    <p>Disk capabilities are exposed under <code>disk</code> element. For
-    instance:</p>
-
-<pre>
-&lt;domainCapabilities&gt;
-  ...
-  &lt;devices&gt;
-    &lt;disk supported='yes'&gt;
-      &lt;enum name='diskDevice'&gt;
-        &lt;value&gt;disk&lt;/value&gt;
-        &lt;value&gt;cdrom&lt;/value&gt;
-        &lt;value&gt;floppy&lt;/value&gt;
-        &lt;value&gt;lun&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='bus'&gt;
-        &lt;value&gt;ide&lt;/value&gt;
-        &lt;value&gt;fdc&lt;/value&gt;
-        &lt;value&gt;scsi&lt;/value&gt;
-        &lt;value&gt;virtio&lt;/value&gt;
-        &lt;value&gt;xen&lt;/value&gt;
-        &lt;value&gt;usb&lt;/value&gt;
-        &lt;value&gt;uml&lt;/value&gt;
-        &lt;value&gt;sata&lt;/value&gt;
-        &lt;value&gt;sd&lt;/value&gt;
-      &lt;/enum&gt;
-    &lt;/disk&gt;
-    ...
-  &lt;/devices&gt;
-&lt;/domainCapabilities&gt;
-</pre>
-
-    <dl>
-      <dt>diskDevice</dt>
-      <dd>Options for the <code>device</code> attribute of the &lt;disk/&gt;
-      element.</dd>
-
-      <dt>bus</dt>
-      <dd>Options for the <code>bus</code> attribute of the &lt;target/&gt;
-      element for a &lt;disk/&gt;.</dd>
-    </dl>
-
-    <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>
-
-<pre>
-&lt;domainCapabilities&gt;
-  ...
-  &lt;devices&gt;
-    &lt;hostdev supported='yes'&gt;
-      &lt;enum name='mode'&gt;
-        &lt;value&gt;subsystem&lt;/value&gt;
-        &lt;value&gt;capabilities&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='startupPolicy'&gt;
-        &lt;value&gt;default&lt;/value&gt;
-        &lt;value&gt;mandatory&lt;/value&gt;
-        &lt;value&gt;requisite&lt;/value&gt;
-        &lt;value&gt;optional&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='subsysType'&gt;
-        &lt;value&gt;usb&lt;/value&gt;
-        &lt;value&gt;pci&lt;/value&gt;
-        &lt;value&gt;scsi&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='capsType'&gt;
-        &lt;value&gt;storage&lt;/value&gt;
-        &lt;value&gt;misc&lt;/value&gt;
-        &lt;value&gt;net&lt;/value&gt;
-      &lt;/enum&gt;
-      &lt;enum name='pciBackend'&gt;
-        &lt;value&gt;default&lt;/value&gt;
-        &lt;value&gt;kvm&lt;/value&gt;
-        &lt;value&gt;vfio&lt;/value&gt;
-        &lt;value&gt;xen&lt;/value&gt;
-      &lt;/enum&gt;
-    &lt;/hostdev&gt;
-  &lt;/devices&gt;
-&lt;/domainCapabilities&gt;
-</pre>
-
-    <dl>
-      <dt>mode</dt>
-      <dd>Options for the <code>mode</code> attribute of the &lt;hostdev/&gt;
-      element.</dd>
-
-      <dt>startupPolicy</dt>
-      <dd>Options for the <code>startupPolicy</code> attribute of the
-      &lt;hostdev/&gt; element.</dd>
-
-      <dt>subsysType</dt>
-      <dd>Options for the <code>type</code> attribute of the &lt;hostdev/&gt;
-      element in case of <code>mode="subsystem"</code>.</dd>
-
-      <dt>capsType</dt>
-      <dd>Options for the <code>type</code> attribute of the &lt;hostdev/&gt;
-      element in case of <code>mode="capabilities"</code>.</dd>
-
-      <dt>pciBackend</dt>
-      <dd>Options for the <code>name</code> attribute of the &lt;driver/&gt;
-      element.</dd>
-    </dl>
-  </body>
-</html>
--- a/docs/formatnetwork.html.in
+++ b/docs/formatnetwork.html.in
@@ -35,7 +35,7 @@
    </p>

    <pre>
-      &lt;network ipv6='yes' trustGuestRxFilters='no'&gt;
+      &lt;network ipv6='yes'&gt;
        &lt;name&gt;default&lt;/name&gt;
        &lt;uuid&gt;3e3fce45-4f53-4fa7-bb32-11f34168b82b&lt;/uuid&gt;
        ...</pre>
@@ -60,16 +60,6 @@
        to have guest-to-guest communications.  For further information,
        see the example below for the example with no gateway addresses.
        <span class="since">Since 1.0.1</span></dd>
-      <dt><code>trustGuestRxFilters='yes'</code></dt>
-      <dd>The optional parameter <code>trustGuestRxFilters</code> can
-        be used to set that attribute of the same name for each domain
-        interface connected to this network (<span class="since">since
-        1.2.10</span>). See
-        the <a href="formatdomain.html#elementSNICS">Network
-        interfaces</a> section of the domain XML documentation for
-        more details. Note that an explicit setting of this attribute
-        in a portgroup or the individual domain interface will
-        override the setting in the network.</dd>
    </dl>

    <h3><a name="elementsConnect">Connectivity</a></h3>
@@ -81,8 +71,8 @@

    <pre>
        ...
-        &lt;bridge name="virbr0" stp="on" delay="5" macTableManager="libvirt"/&gt;
-        &lt;domain name="example.com" localOnly="no"/&gt;
+        &lt;bridge name="virbr0" stp="on" delay="5"/&gt;
+        &lt;domain name="example.com"/&gt;
        &lt;forward mode="nat" dev="eth0"/&gt;
        ...</pre>

@@ -92,56 +82,18 @@
        defines the name of a bridge device which will be used to construct
        the virtual network. The virtual machines will be connected to this
        bridge device allowing them to talk to each other. The bridge device
-        may also be connected to the LAN. When defining
+        may also be connected to the LAN. It is recommended that bridge
+        device names started with the prefix <code>vir</code>, but the name
+        <code>virbr0</code> is reserved for the "default" virtual
+        network.  This element should always be provided when defining
        a new network with a <code>&lt;forward&gt;</code> mode of
-
        "nat" or "route" (or an isolated network with
-        no <code>&lt;forward&gt;</code> element), libvirt will
-        automatically generate a unique name for the bridge device if
-        none is given, and this name will be permanently stored in the
-        network configuration so that that the same name will be used
-        every time the network is started. For these types of networks
-        (nat, routed, and isolated), a bridge name beginning with the
-        prefix "virbr" is recommended (and that is what is
-        auto-generated), but not enforced.
+        no <code>&lt;forward&gt;</code> element).
        Attribute <code>stp</code> specifies if Spanning Tree Protocol
        is 'on' or 'off' (default is
        'on'). Attribute <code>delay</code> sets the bridge's forward
        delay value in seconds (default is 0).
        <span class="since">Since 0.3.0</span>
-
-        <p>
-          The <code>macTableManager</code> attribute of the bridge
-          element is used to tell libvirt how the bridge's MAC address
-          table (used to determine the correct egress port for packets
-          based on destination MAC address) will be managed. In the
-          default <code>kernel</code> setting, the kernel
-          automatically adds and removes entries, typically using
-          learning, flooding, and promiscuous mode on the bridge's
-          ports in order to determine the proper egress port for
-          packets.  When <code>macTableManager</code> is set
-          to <code>libvirt</code>, libvirt disables kernel management
-          of the MAC table (in the case of the Linux host bridge, this
-          means enabling vlan_filtering on the bridge, and disabling
-          learning and unicast_filter for all bridge ports), and
-          explicitly adds/removes entries to the table according to
-          the MAC addresses in the domain interface configurations.
-          Allowing libvirt to manage the MAC table can improve
-          performance - with a Linux host bridge, for example, turning
-          off learning and unicast_flood on ports has its own
-          performance advantage, and can also lead to an additional
-          boost by permitting the kernel to automatically turn off
-          promiscuous mode on some ports of the bridge (in particular,
-          the port attaching the bridge to the physical
-          network). However, it can also cause some networking setups
-          to stop working (e.g. vlan tagging, multicast,
-          guest-initiated changes to MAC address) and is not supported
-          by older kernels.
-          <span class="since">Since 1.2.11, requires kernel 3.17 or
-          newer</span>
-        </p>
-
-
      </dd>
      <dt><code>domain</code></dt>
      <dd>
@@ -151,16 +103,6 @@
        a <code>&lt;forward&gt;</code> mode of "nat" or "route" (or an
        isolated network with no <code>&lt;forward&gt;</code>
        element). <span class="since">Since 0.4.5</span>
-
-        <p>
-          If the optional <code>localOnly</code> attribute on the
-          <code>domain</code> element is "yes", then DNS requests under
-          this domain will only be resolved by the virtual network's own
-          DNS server - they will not be forwarded to the host's upstream
-          DNS server.  If <code>localOnly</code> is "no", and by
-          default, unresolved requests <b>will</b> be forwarded.
-          <span class="since">Since 1.2.12</span>
-        </p>
      </dd>
      <dt><code>forward</code></dt>
      <dd>Inclusion of the <code>forward</code> element indicates that
@@ -200,8 +142,6 @@
            <p><span class="since">Since 1.0.3</span> it is possible to
            specify a public IPv4 address and port range to be used for
            the NAT by using the <code>&lt;nat&gt;</code> subelement.
-            Note that all addresses from the range are used, not just those
-            that are in use on the host.
            The address range is set with the <code>&lt;address&gt;</code>
            subelements and <code>start</code> and <code>stop</code>
            attributes:
@@ -338,7 +278,7 @@
            (Single Root I/O Virtualization) virtual function (VF)
            devices can be assigned in this manner; to assign a
            standard single-port PCI or PCIe ethernet card to a guest,
-            use the traditional <code>&lt;hostdev&gt;</code> device
+            use the traditional <code>&lt; hostdev&gt;</code> device
            definition. <span class="since"> Since 0.10.0</span>

            <p>
@@ -362,9 +302,9 @@

            <p>Note that this "intelligent passthrough" of network
            devices is very similar to the functionality of a
-            standard <code>&lt;hostdev&gt;</code> device, the
+            standard <code>&lt; hostdev&gt;</code> device, the
            difference being that this method allows specifying a MAC
-            address, vlan tag, and <code>&lt;virtualport&gt;</code>
+            address, vlan tag, and <code>&lt;virtualport &gt;</code>
            for the passed-through device. If these capabilities are
            not required, if you have a standard single-port PCI,
            PCIe, or USB network card that doesn't support SR-IOV (and
@@ -433,9 +373,9 @@
          <span class="since">since 0.10.0</span> When using forward
          mode 'hostdev', the interface pool is specified with a list
          of <code>&lt;address&gt;</code> elements, each of which has
-          <code>&lt;type&gt;</code> (must always be <code>'pci'</code>),
+          <code>&lt; type&gt;</code> (must always be <code>'pci'</code>,
          <code>&lt;domain&gt;</code>, <code>&lt;bus&gt;</code>,
-          <code>&lt;slot&gt;</code>and <code>&lt;function&gt;</code>
+          <code>&lt;slot&gt;</code>, and <code>&lt;function&gt;</code>
          attributes.
        </p>
        <pre>
@@ -666,7 +606,7 @@
      &lt;outbound average='1000' peak='5000' burst='5120'/&gt;
    &lt;/bandwidth&gt;
  &lt;/portgroup&gt;</b>
-  <b>&lt;portgroup name='sales' trustGuestRxFilters='no'&gt;
+  <b>&lt;portgroup name='sales'&gt;
    &lt;virtualport type='802.1Qbh'&gt;
      &lt;parameters profileid='salestest'/&gt;
    &lt;/virtualport&gt;
@@ -686,7 +626,7 @@
      network can have multiple portgroup elements (and one of those
      can optionally be designated as the 'default' portgroup for the
      network), and each portgroup has a name, as well as various
-      attributes and subelements associated with it. The currently supported
+      subelements associated with it. The currently supported
      subelements are <code>&lt;bandwidth&gt;</code>
      (described <a href="formatnetwork.html#elementQoS">here</a>)
      and <code>&lt;virtualport&gt;</code>
@@ -710,19 +650,6 @@
      considered an error, and will prevent the interface from
      starting.
    </p>
-    <p>
-      portgroups also support the optional
-      parameter <code>trustGuestRxFilters</code> which can be used to
-      set that attribute of the same name for each domain interface
-      using this portgroup (<span class="since">since
-      1.2.10</span>). See
-      the <a href="formatdomain.html#elementSNICS">Network
-      interfaces</a> section of the domain XML documentation for more
-      details. Note that an explicit setting of this attribute in the
-      portgroup overrides the network-wide setting, and an explicit
-      setting in the individual domain interface will override the
-      setting in the portgroup.
-    </p>

    <h5><a name="elementsStaticroute">Static Routes</a></h5>
    <p>
--- a/docs/formatnode.html.in
+++ b/docs/formatnode.html.in
@@ -110,28 +110,6 @@
                have a list of <code>address</code> subelements, one
                for each VF on this PF.
              </dd>
-              <dt><code>numa</code></dt>
-              <dd>
-                This optional element contains information on the PCI device
-                with respect to NUMA. For example, the optional
-                <code>node</code> attribute tells which NUMA node is the PCI
-                device associated with.
-              </dd>
-              <dt><code>pci-express</code></dt>
-              <dd>
-              This optional element contains information on PCI Express part of
-              the device. For example, it can contain a child element
-              <code>link</code> which addresses the PCI Express device's link.
-              While a device has its own capabilities
-              (<code>validity='cap'</code>), the actual run time capabilities
-              are negotiated on the device initialization
-              (<code>validity='sta'</code>). The <code>link</code> element then
-              contains three attributes: <code>port</code> which says in which
-              port is the device plugged in, <code>speed</code> (in
-              GigaTransfers per second) and <code>width</code> for the number
-              of lanes used. Since the port can't be negotiated, it's not
-              exposed in <code>./pci-express/link/[@validity='sta']</code>.
-              </dd>
            </dl>
          </dd>
          <dt><code>usb_device</code></dt>
@@ -176,33 +154,6 @@
              <dd>The interface name tied to this device.</dd>
              <dt><code>address</code></dt>
              <dd>If present, the MAC address of the device.</dd>
-              <dt><code>link</code></dt>
-              <dd>Optional to reflect the status of the link. It has
-                two optional attributes: <code>speed</code> in Mbits per
-                second and <code>state</code> to tell the state of the
-                link. So far, the whole element is just for output,
-                not setting.
-              </dd>
-              <dt><code>feature</code></dt>
-              <dd>If present, the hw offloads supported by this network
-                interface. Possible features are:
-                <dl>
-                    <dt><code>rx</code></dt><dd>rx-checksumming</dd>
-                    <dt><code>tx</code></dt><dd>tx-checksumming</dd>
-                    <dt><code>sg</code></dt><dd>scatter-gather</dd>
-                    <dt><code>tso</code></dt><dd>tcp-segmentation-offload</dd>
-                    <dt><code>ufo</code></dt><dd>udp-fragmentation-offload</dd>
-                    <dt><code>gso</code></dt><dd>generic-segmentation-offload</dd>
-                    <dt><code>gro</code></dt><dd>generic-receive-offload</dd>
-                    <dt><code>lro</code></dt><dd>large-receive-offload</dd>
-                    <dt><code>rxvlan</code></dt><dd>rx-vlan-offload</dd>
-                    <dt><code>txvlan</code></dt><dd>tx-vlan-offload</dd>
-                    <dt><code>ntuple</code></dt><dd>ntuple-filters</dd>
-                    <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>
-                </dl>
-              </dd>
              <dt><code>capability</code></dt>
              <dd>A network protocol exposed by the device, where the
                attribute <code>type</code> can be "80203" for IEEE
@@ -215,17 +166,6 @@
            <dl>
              <dt><code>host</code></dt>
              <dd>The SCSI host number.</dd>
-              <dt><code>unique_id</code></dt>
-              <dd>On input, this optionally provides the value from the
-                'unique_id' file found in the scsi_host's directory. To
-                view the values of all 'unique_id' files, use <code>find -H
-                /sys/class/scsi_host/host{0..9}/unique_id |
-                xargs grep '[0-9]'</code>. On output, if the unique_id
-                file exists, the value from the file will be displayed.
-                This can be used in order to help uniquely identify the
-                scsi_host adapter in a <a href="formatstorage.html">
-                Storage Pool</a>. <span class="since">Since 1.2.7</span>
-              </dd>
              <dt><code>capability</code></dt>
              <dd>Current capabilities include "vports_ops" (indicates
                vport operations are supported) and "fc_host". "vport_ops"
@@ -351,10 +291,6 @@
      &lt;address domain='0x0000' bus='0x02' slot='0x00' function='0x0'/&gt;
      &lt;address domain='0x0000' bus='0x02' slot='0x00' function='0x1'/&gt;
    &lt;/iommuGroup&gt;
-    &lt;pci-express&gt;
-      &lt;link validity='cap' port='1' speed='2.5' width='1'/&gt;
-      &lt;link validity='sta' speed='2.5' width='1'/&gt;
-    &lt;/pci-express&gt;
  &lt;/capability&gt;
 &lt;/device&gt;
    </pre>
--- a/docs/formatnwfilter.html.in
+++ b/docs/formatnwfilter.html.in
@@ -765,7 +765,7 @@
         <td>Mask applied to MAC address of destination</td>
       </tr>
       <tr>
-         <td>vlanid</td>
+         <td>vlan-id</td>
         <td>UINT16 (0x0-0xfff, 0 - 4095)</td>
         <td>VLAN ID</td>
       </tr>
@@ -1100,11 +1100,6 @@
         <td>UINT16</td>
         <td>End of range of valid destination ports; requires <code>protocol</code></td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1196,26 +1191,6 @@
         <td>UINT16</td>
         <td>End of range of valid destination ports; requires <code>protocol</code></td>
       </tr>
-       <tr>
-         <td>type<span class="since">(Since 1.2.12)</span></td>
-         <td>UINT8</td>
-         <td>ICMPv6 type; requires <code>protocol</code> to be set to <code>icmpv6</code></td>
-       </tr>
-       <tr>
-         <td>typeend<span class="since">(Since 1.2.12)</span></td>
-         <td>UINT8</td>
-         <td>ICMPv6 type end of range; requires <code>protocol</code> to be set to <code>icmpv6</code></td>
-       </tr>
-       <tr>
-         <td>code<span class="since">(Since 1.2.12)</span></td>
-         <td>UINT8</td>
-         <td>ICMPv6 code; requires <code>protocol</code> to be set to <code>icmpv6</code></td>
-       </tr>
-       <tr>
-         <td>code<span class="since">(Since 1.2.12)</span></td>
-         <td>UINT8</td>
-         <td>ICMPv6 code end of range; requires <code>protocol</code> to be set to <code>icmpv6</code></td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1308,11 +1283,6 @@
         <td>UINT16</td>
         <td>End of range of valid destination ports</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1428,11 +1398,6 @@
         <td>UINT16</td>
         <td>ICMP code</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1532,11 +1497,6 @@
         <td>IP_ADDR</td>
         <td>End of range of destination IP address</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1643,11 +1603,6 @@
         <td>UINT16</td>
         <td>End of range of valid destination ports</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1749,11 +1704,6 @@
         <td>UINT16</td>
         <td>ICMPv6 code</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
@@ -1838,11 +1788,6 @@
         <td>IPV6_ADDR</td>
         <td>End of range of destination IP address</td>
       </tr>
-       <tr>
-         <td>dscp</td>
-         <td>UINT8 (0x0-0x3f, 0 - 63)</td>
-         <td>Differentiated Services Code Point</td>
-       </tr>
       <tr>
         <td>comment <span class="since">(Since 0.8.5)</span></td>
         <td>STRING</td>
--- a/docs/formatsnapshot.html.in
+++ b/docs/formatsnapshot.html.in
@@ -156,31 +156,20 @@
            require that if specified, the snapshot mode must not
            override any snapshot mode attached to the corresponding
            domain disk, while others like qemu allow this field to
-            override the domain default.
-
-            <dl>
-              <dt><code>source</code></dt>
-              <dd>If the snapshot mode is external (whether specified
-              or inherited), then there is an optional sub-element
-              <code>source</code>, with an attribute <code>file</code>
-              giving the name of the new file.
-              If <code>source</code> is not
-              given and the disk is backed by a local image file (not
-              a block device or remote storage), a file name is
-              generated that consists of the existing file name
-              with anything after the trailing dot replaced by the
-              snapshot name.  Remember that with external
-              snapshots, the original file name becomes the read-only
-              snapshot, and the new file name contains the read-write
-              delta of all disk changes since the snapshot.
-              </dd>
-              <dt><code>driver</code></dt>
-              <dd>An optional sub-element <code>driver</code>,
-              with an attribute <code>type</code> giving the driver type (such
-              as qcow2), of the new file created by the external
-              snapshot of the new file.
-              </dd>
-            </dl>
+            override the domain default.  If the snapshot mode is
+            external (whether specified or inherited), then there is
+            an optional sub-element <code>source</code>, with an
+            attribute <code>file</code> giving the name, and an
+            optional sub-element <code>driver</code>, with an
+            attribute <code>type</code> giving the driver type (such
+            as qcow2), of the new file created by the external
+            snapshot of the new file.  If <code>source</code> is not
+            given, a file name is generated that consists of the
+            existing file name with anything after the trailing dot
+            replaced by the snapshot name.  Remember that with external
+            snapshots, the original file name becomes the read-only
+            snapshot, and the new file name contains the read-write
+            delta of all disk changes since the snapshot.

            <span class="since">Since 1.2.2</span> the <code>disk</code> element
            supports an optional attribute <code>type</code> if the
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -23,9 +23,8 @@
      (<span class="since">since 0.7.1</span>), <code>rbd</code>
      (<span class="since">since 0.9.13</span>), <code>sheepdog</code>
      (<span class="since">since 0.10.0</span>),
-      <code>gluster</code> (<span class="since">since
-      1.2.0</span>) or <code>zfs</code> (<span class="since">since
-      1.2.8</span>). This corresponds to the
+      or <code>gluster</code> (<span class="since">since
+      1.2.0</span>). This corresponds to the
      storage backend drivers listed further along in this document.
    </p>
    <h3><a name="StoragePoolFirst">General metadata</a></h3>
@@ -78,33 +77,15 @@
        ...
        &lt;source&gt;
          &lt;host name="iscsi.example.com"/&gt;
-          &lt;device path="iqn.2013-06.com.example:iscsi-pool"/&gt;
+          &lt;device path="demo-target"/&gt;
          &lt;auth type='chap' username='myname'&gt;
-            &lt;secret usage='mycluster_myname'/&gt;
+            &lt;secret type='iscsi' usage='mycluster_myname'/&gt;
          &lt;/auth&gt;
          &lt;vendor name="Acme"/&gt;
          &lt;product name="model"/&gt;
        &lt;/source&gt;
        ...</pre>

-    <pre>
-        ...
-        &lt;source&gt;
-          &lt;adapter type='scsi_host' name='scsi_host1'/&gt;
-        &lt;/source&gt;
-        ...</pre>
-
-    <pre>
-        ...
-        &lt;source&gt;
-          &lt;adapter type='scsi_host'&gt;
-            &lt;parentaddr unique_id='1'&gt;
-              &lt;address domain='0x0000' bus='0x00' slot='0x1f' addr='0x2'/&gt;
-            &lt;/parentaddr&gt;
-          &lt;/adapter&gt;
-        &lt;/source&gt;
-        ...</pre>
-
    <pre>
        ...
        &lt;source&gt;
@@ -116,179 +97,39 @@
      <dt><code>device</code></dt>
      <dd>Provides the source for pools backed by physical devices
        (pool types <code>fs</code>, <code>logical</code>, <code>disk</code>,
-        <code>iscsi</code>, <code>zfs</code>).
+        <code>iscsi</code>).
        May be repeated multiple times depending on backend driver. Contains
-        a single attribute <code>path</code> which is either the fully
-        qualified path to the block device node or for <code>iscsi</code>
-        the iSCSI Qualified Name (IQN).
-        <span class="since">Since 0.4.1</span></dd>
+        a single attribute <code>path</code> which is the fully qualified
+        path to the block device node. <span class="since">Since 0.4.1</span></dd>
      <dt><code>dir</code></dt>
      <dd>Provides the source for pools backed by directories (pool
-        types <code>dir</code>, <code>netfs</code>, <code>gluster</code>),
-        or optionally to select a subdirectory
+        type <code>dir</code>), or optionally to select a subdirectory
        within a pool that resembles a filesystem (pool
        type <code>gluster</code>). May
        only occur once. Contains a single attribute <code>path</code>
-        which is the fully qualified path to the backing directory or
-        for a <code>netfs</code> pool type using <code>format</code>
-        type "cifs", the path to the Samba share without the leading slash.
+        which is the fully qualified path to the backing directory.
        <span class="since">Since 0.4.1</span></dd>
      <dt><code>adapter</code></dt>
      <dd>Provides the source for pools backed by SCSI adapters (pool
-        type <code>scsi</code>). May only occur once.
-        <dl>
-          <dt><code>name</code></dt>
-          <dd>The SCSI adapter name (e.g. "scsi_host1", although a name
-            such as "host1" is still supported for backwards compatibility,
-            it is not recommended). The scsi_host name to be used can be
-            determined from the output of a <code>virsh nodedev-list
-            scsi_host</code> command followed by a combination of
-            <code>lspci</code> and <code>virsh nodedev-dumpxml
-            scsi_hostN</code> commands to find the <code>scsi_hostN</code>
-            to be used. <span class="since">Since 0.6.2</span>
-            <p>
-            It is further recommended to utilize the
-            <code>parentaddr</code> element since it's possible to have
-            the path to which the scsi_hostN uses change between system
-            reboots. <span class="since">Since 1.2.7</span>
-            </p>
-          </dd>
-        </dl>
-        <dl>
-          <dt><code>type</code></dt>
-          <dd>Specifies the adapter type. Valid values are "scsi_host" or
-            "fc_host". If omitted and the <code>name</code> attribute is
-            specified, then it defaults to "scsi_host". To keep backwards
-            compatibility, this attribute is optional <b>only</b> for the
-            "scsi_host" adapter, but is mandatory for the "fc_host" adapter.
-            <span class="since">Since 1.0.5</span>
-            A "fc_host" capable scsi_hostN can be determined by using
-            <code>virsh nodedev-list --cap fc_host</code>.
-            <span class="since">Since 1.2.8</span>
-            <p>
-            Note: Regardless of whether a "scsi_host" adapter type is defined
-            using a <code>name</code> or a <code>parentaddr</code>, it
-            should refer to a real scsi_host adapter as found through a
-            <code>virsh nodedev-list scsi_host</code> and <code>virsh
-            nodedev-dumpxml scsi_hostN</code> on one of the scsi_host's
-            displayed. It should not refer to a "fc_host" capable scsi_hostN
-            nor should it refer to the vHBA created for some "fc_host"
-            adapter. For a vHBA the <code>nodedev-dumpxml</code>
-            output parent setting will be the "fc_host" capable scsi_hostN
-            value. Additionally, do not refer to an iSCSI scsi_hostN for the
-            "scsi_host" source. An iSCSI scsi_hostN's
-            <code>nodedev-dumpxml</code> output parent field is generally
-            "computer". This is a libvirt created parent value indicating
-            no parent was defined for the node device.
-            </p>
-            </dd>
-        </dl>
-        <dl>
-          <dt><code>wwnn</code> and <code>wwpn</code></dt>
-          <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>
-        <dl>
-          <dt><code>parent</code></dt>
-          <dd>Used by the "fc_host" adapter type to optionally specify the
-            parent scsi_host device defined in the
-            <a href="formatnode.html">Node Device</a> database as the
-            <a href="http://wiki.libvirt.org/page/NPIV_in_libvirt">NPIV</a>
-            virtual Host Bus Adapter (vHBA). The value provided must be
-            a vport capable scsi_host. The value is not the scsi_host of
-            the vHBA created by 'virsh nodedev-create', rather it is
-            the parent of that vHBA. If the value is not provided, libvirt
-            will determine the parent based either finding the wwnn,wwpn
-            defined for an existing scsi_host or by creating a vHBA. Providing
-            the parent attribute is also useful for the duplicate pool
-            definition checks. This is more important in environments where
-            both the "fc_host" and "scsi_host" source adapter pools are being
-            used in order to ensure a new definition doesn't duplicate using
-            the scsi_hostN of some existing storage pool.
-            <span class="since">Since 1.0.4</span>
-          </dd>
-          <dt><code>managed</code></dt>
-          <dd>An optional attribute to instruct the SCSI storage backend to
-            manage destroying the vHBA when the pool is destroyed. For
-            configurations that do not provide an already created vHBA
-            from a 'virsh nodedev-create', libvirt will set this property
-            to "yes". For configurations that have already created a vHBA
-            via 'virsh nodedev-create' and are using the wwnn/wwpn from
-            that vHBA and optionally the scsi_host parent, setting this
-            attribute to "yes" will allow libvirt to destroy the node device
-            when the pool is destroyed. If this attribute is set to "no" or
-            not defined in the XML, then libvirt will not destroy the vHBA.
-            <span class="since">Since 1.2.11</span>
-          </dd>
-        </dl>
-        <dl>
-          <dt><code>parentaddr</code></dt>
-          <dd>Used by the "scsi_host" adapter type instead of the
-            <code>name</code> attribute to more uniquely identify the
-            SCSI host. Using a combination of the <code>unique_id</code>
-            attribute and the <code>address</code> element to formulate
-            a PCI address, a search will be performed of the
-            <code>/sys/class/scsi_host/hostNN</code> links for a
-            matching PCI address with a matching <code>unique_id</code>
-            value in the <code>/sys/class/scsi_host/hostNN/unique_id</code>
-            file. The value in the "unique_id" file will be unique enough
-            for the specific PCI address. The <code>hostNN</code> will be
-            used by libvirt as the basis to define which SCSI host is to
-            be used for the currently booted system.
-            <span class="since">Since 1.2.7</span>
-            <dl>
-              <dt><code>address</code></dt>
-              <dd>The PCI address of the scsi_host device to be used. Using
-                a PCI address provides consistent naming across system reboots
-                and kernel reloads. The address will have four attributes:
-                <code>domain</code> (a 2-byte hex integer, not currently used
-                by qemu), <code>bus</code> (a hex value between 0 and 0xff,
-                inclusive), <code>slot</code> (a hex value between 0x0 and
-                0x1f, inclusive), and <code>function</code> (a value between
-                0 and 7, inclusive). The PCI address can be determined by
-                listing the <code>/sys/bus/pci/devices</code> and the
-                <code>/sys/class/scsi_host</code> directories in order to
-                find the expected scsi_host device. The address will be
-                provided in a format such as "0000:00:1f:2" which can be
-                used to generate the expected PCI address
-                "domain='0x0000' bus='0x00' slot='0x1f' function='0x0'".
-                Optionally, using the combination of the commands 'virsh
-                nodedev-list scsi_host' and 'virsh nodedev-dumpxml' for a
-                specific list entry and converting the resulting
-                <code>path</code> element as the basis to formulate the
-                correctly formatted PCI address.
-              </dd>
-            </dl>
-            <dl>
-              <dt><code>unique_id</code></dt>
-              <dd>Required <code>parentaddr</code> attribute used to determine
-                which of the scsi_host adapters for the provided PCI address
-                should be used. The value is determine by contents of the
-                <code>unique_id</code> file for the specific scsi_host adapter.
-                For a PCI address of "0000:00:1f:2", the unique identifer files
-                can be found using the command
-                <code>find -H /sys/class/scsi_host/host*/unique_id |
-                xargs grep '[0-9]'</code>. Optionally, the
-                <code>virsh nodedev-dumpxml scsi_hostN</code>' of a
-                specific scsi_hostN list entry will list the
-                <code>unique_id</code> value.
-              </dd>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
+        type <code>scsi</code>). May
+        only occur once. Attribute <code>name</code> is the SCSI adapter
+        name (ex. "scsi_host1".  NB, although a name such as "host1" is
+        still supported for backwards compatibility, it is not recommended).
+        Attribute <code>type</code> (<span class="since">1.0.5</span>)
+        specifies the adapter type.  Valid values are "fc_host" and "scsi_host".
+        If omitted and the <code>name</code> attribute is specified, then it
+        defaults to "scsi_host". To keep backwards compatibility, the attribute
+        <code>type</code> is optional for the "scsi_host" adapter, but
+        mandatory for the "fc_host" adapter.  Attributes <code>wwnn</code>
+        (Word Wide Node Name) and <code>wwpn</code> (Word Wide Port Name)
+        (<span class="since">1.0.4</span>) 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 (See command 'virsh nodedev-dumpxml' to known how to get
+        wwnn/wwpn of a (v)HBA). The optional attribute <code>parent</code>
+        (<span class="since">1.0.4</span>) specifies the parent device for
+        the "fc_host" adapter.
+        <span class="since">Since 0.6.2</span></dd>
      <dt><code>host</code></dt>
      <dd>Provides the source for pools backed by storage from a
        remote server (pool types <code>netfs</code>, <code>iscsi</code>,
@@ -297,15 +138,7 @@
        or <code>device</code> element. Contains an attribute <code>name</code>
        which is the hostname or IP address of the server. May optionally
        contain a <code>port</code> attribute for the protocol specific
-        port number. Duplicate storage pool definition checks may perform
-        a cursory check that the same host name by string comparison in the
-        new pool does not match an existing pool's source host name when
-        combined with the <code>directory</code> or <code>device</code>
-        element. Name resolution of the provided hostname or IP address
-        is left to the storage driver backend interactions with the remote
-        server. See the <a href="storage.html">storage driver page</a> for
-        any restrictions for specific storage backends.
-        <span class="since">Since 0.4.1</span></dd>
+        port number. <span class="since">Since 0.4.1</span></dd>
      <dt><code>auth</code></dt>
      <dd>If present, the <code>auth</code> element provides the
        authentication credentials needed to access the source by the
@@ -392,36 +225,26 @@
    <dl>
      <dt><code>path</code></dt>
      <dd>Provides the location at which the pool will be mapped into
-        the local filesystem namespace, as an absolute path. For a
-        filesystem/directory based pool it will be a fully qualified name of
-        the directory in which volumes will be created. For device based pools
-        it will be a fully qualified name of the directory in which
+        the local filesystem namespace. For a filesystem/directory based
+        pool it will be the name of the directory in which volumes will
+        be created. For device based pools it will be the name of the directory in which
        devices nodes exist. For the latter <code>/dev/</code> may seem
        like the logical choice, however, devices nodes there are not
        guaranteed stable across reboots, since they are allocated on
        demand. It is preferable to use a stable location such as one
-        of the <code>/dev/disk/by-{path|id|uuid|label}</code> locations.
-        For a Multipath pool (type <code>mpath</code>), the provided
-        value is ignored and the default value of "/dev/mapper" is used.
+        of the <code>/dev/disk/by-{path,id,uuid,label</code> locations.
        <span class="since">Since 0.4.1</span>
      </dd>
      <dt><code>permissions</code></dt>
      <dd>This is currently only useful for directory or filesystem based
        pools, which are mapped as a directory into the local filesystem
        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 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
-        creating a directory, the values are inherited from the parent
-        directory. The <code>label</code> element contains the MAC (eg SELinux)
-        label string.
+        final directory when the pool is built. The
+        <code>mode</code> element contains the octal permission set. The
+        <code>owner</code> element contains the numeric user ID. The <code>group</code>
+        element contains the numeric group ID. The <code>label</code> element
+        contains the MAC (eg SELinux) label string.
        <span class="since">Since 0.4.1</span>
-        For running directory or filesystem based pools, these fields
-        will be filled with the values used by the existing directory.
-        <span class="since">Since 1.2.16</span>
      </dd>
      <dt><code>timestamps</code></dt>
      <dd>Provides timing information about the volume. Up to four
@@ -486,13 +309,7 @@
    <dl>
      <dt><code>name</code></dt>
      <dd>Providing a name for the volume which is unique to the pool.
-        This is mandatory when defining a volume. For a disk pool, the
-        name must be combination of the <code>source</code> device path
-        device and next partition number to be created. For example, if
-        the <code>source</code> device path is /dev/sdb and there are no
-        partitions on the disk, then the name must be sdb1 with the next
-        name being sdb2 and so on.
-        <span class="since">Since 0.4.1</span></dd>
+        This is mandatory when defining a volume.  <span class="since">Since 0.4.1</span></dd>
      <dt><code>key</code></dt>
      <dd>Providing an identifier for the volume which identifies a
          single volume. In some cases it's possible to have two distinct keys
@@ -568,7 +385,6 @@
            &lt;label&gt;virt_image_t&lt;/label&gt;
          &lt;/permissions&gt;
          &lt;compat&gt;1.1&lt;/compat&gt;
-          &lt;nocow/&gt;
          &lt;features&gt;
            &lt;lazy_refcounts/&gt;
          &lt;/features&gt;
@@ -582,34 +398,22 @@
        <span class="since">Since 0.4.1</span></dd>
      <dt><code>format</code></dt>
      <dd>Provides information about the pool specific volume format.
-        For disk pools it will provide the partition table format type, but is
-        not preserved after a pool refresh or libvirtd restart. Use extended
-        in order to create an extended disk extent partition. For filesystem
+        For disk pools it will provide the partition type. For filesystem
        or directory pools it will provide the file format type, eg cow,
        qcow, vmdk, raw. If omitted when creating a volume, the pool's
        default format will be used. The actual format is specified via
-        the <code>type</code> attribute. Consult the
-        <a href="storage.html">storage driver page</a> for the list of valid
-        volume format type values for each specific pool. The
-        <code>format</code> will be ignored on input for pools without a
-        volume format type value and the default pool format will be used.
-        <span class="since">Since 0.4.1</span></dd>
+        the <code>type</code> attribute. Consult the pool-specific docs for
+        the list of valid values. <span class="since">Since 0.4.1</span></dd>
      <dt><code>permissions</code></dt>
-      <dd>Provides information about the permissions to use
+      <dd>Provides information about the default permissions to use
        when creating volumes. This is currently only useful for directory
        or filesystem based pools, where the volumes allocated are simple
        files. For pools where the volumes are device nodes, the hotplug
-        scripts determine permissions. There are 4 child elements.
-        The <code>mode</code> element contains the octal permission set.
-        The <code>mode</code> defaults to 0600 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
-        creating a supported volume, the values are inherited from the parent
-        directory. The <code>label</code> element contains the MAC (eg SELinux)
-        label string.
-        For existing directory or filesystem based volumes, these fields
-        will be filled with the values used by the existing file.
+        scripts determine permissions. It contains 4 child elements. The
+        <code>mode</code> element contains the octal permission set. The
+        <code>owner</code> element contains the numeric user ID. The <code>group</code>
+        element contains the numeric group ID. The <code>label</code> element
+        contains the MAC (eg SELinux) label string.
        <span class="since">Since 0.4.1</span>
      </dd>
      <dt><code>compat</code></dt>
@@ -617,15 +421,8 @@
        <code>type='qcow2'</code> volumes. Valid values are <code>0.10</code>
        and <code>1.1</code> so far, specifying QEMU version the images should
        be compatible with. If the <code>feature</code> element is present,
-        1.1 is used.
-        <span class="since">Since 1.1.0</span> If omitted, 0.10 is used.
-        <span class="since">Since 1.1.2</span>
-      </dd>
-      <dt><code>nocow</code></dt>
-      <dd>Turn off COW of the newly created volume. So far, this is only valid
-        for a file image in btrfs file system. It will improve performance when
-        the file image is used in VM. To create non-raw file images, it
-        requires QEMU version since 2.1. <span class="since">Since 1.2.7</span>
+        1.1 is used. If omitted, qemu-img default is used.
+        <span class="since">Since 1.1.0</span>
      </dd>
      <dt><code>features</code></dt>
      <dd>Format-specific features. Only used for <code>qcow2</code> now.
@@ -677,8 +474,11 @@
        <span class="since">Since 0.6.0</span></dd>
      <dt><code>permissions</code></dt>
      <dd>Provides information about the permissions of the backing file.
-          See volume <code>permissions</code> documentation for explanation
-          of individual fields.
+        It contains 4 child elements. The
+        <code>mode</code> element contains the octal permission set. The
+        <code>owner</code> element contains the numeric user ID. The <code>group</code>
+        element contains the numeric group ID. The <code>label</code> element
+        contains the MAC (eg SELinux) label string.
        <span class="since">Since 0.6.0</span>
      </dd>
    </dl>
--- a/docs/formatstorageencryption.html.in
+++ b/docs/formatstorageencryption.html.in
@@ -35,7 +35,7 @@
    </p>
    <h3><a name="StorageEncryptionDefault">"default" format</a></h3>
    <p>
-      <code>&lt;encryption format="default"/&gt;</code> can be specified only
+      <code>&lt;encryption type="default"/&gt;</code> can be specified only
      when creating a volume.  If the volume is successfully created, the
      encryption formats, parameters and secrets will be auto-generated by
      libvirt and the attached <code>encryption</code> tag will be updated.
--- a/docs/generic.css
+++ b/docs/generic.css
@@ -1,3 +1,4 @@
+
 body {
  margin: 0em;
  padding: 0px;
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
@@ -11,18 +11,6 @@
      <li>Discuss any large changes on the mailing list first.  Post patches
        early and listen to feedback.</li>

-      <li>Official upstream repository is kept in git
-        (<code>git://libvirt.org/libvirt.git</code>) and is browsable
-        along with other libvirt-related repositories
-        (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</li>
-
-      <li>Patches to translations are maintained via
-        the <a href="https://fedora.zanata.org/">zanata project</a>.
-        If you want to fix a translation in a .po file, join the
-        appropriate language team. The libvirt release process
-        automatically pulls the latest version of each translation
-        file from zanata.</li>
-
      <li><p>Post patches in unified diff format, with git rename
        detection enabled.  You need a one-time setup of:</p>
 <pre>
@@ -72,7 +60,7 @@
        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
+        review comments), he is advised to note differences to previous
        versions after the <code>---</code> line in the patch so that it helps
        reviewers but doesn't become part of git history. Moreover, such patch
        needs to be prefixed correctly with
@@ -134,7 +122,7 @@
          Some tests are skipped by default in a development environment,
          based on the time they take in comparison to the likelihood
          that those tests will turn up problems during incremental builds.
-          These tests default to being run when building from a
+          These tests default to being run when when building from a
          tarball or with the configure option --enable-expensive-tests;
          you can also force a one-time toggle of these tests by
          setting VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in:
@@ -171,18 +159,6 @@
 <pre>
  ./qemuxml2xmltest
 </pre>
-
-        <p>
-          If you are adding new test cases, or making changes that alter
-          existing test output, you can use the environment variable
-          VIR_TEST_REGENERATE_OUTPUT to quickly update the saved test data.
-          Of course you still need to review the changes VERY CAREFULLY to
-          ensure they are correct.
-        </p>
-<pre>
-  VIR_TEST_REGENERATE_OUTPUT=1 ./qemuxml2argvtest
-</pre>
-
        <p>There is also a <code>./run</code> script at the top level,
          to make it easier to run programs that have not yet been
          installed, as well as to wrap invocations of various tests
@@ -284,7 +260,7 @@
    <p>
      There is more on this subject, including lots of links to background
      reading on the subject, on
-      <a href="http://people.redhat.com/rjones/how-to-supply-code-to-open-source-projects/">
+      <a href="http://et.redhat.com/~rjones/how-to-supply-code-to-open-source-projects/">
        Richard Jones' guide to working with open source projects</a>.
    </p>

@@ -481,30 +457,20 @@

    <p>
      Omit the curly braces around an <code>if</code>, <code>while</code>,
-      <code>for</code> etc. body only when both that body and the condition
-      itself occupy a single line.  In every other case we require
+      <code>for</code> etc. body only
+      when that body occupies a single line.  In every other case we require
      the braces.  This ensures that it is trivially easy to identify a
      single-<i>statement</i> loop: each has only one <i>line</i> in its body.
    </p>
+    <p>
+      Omitting braces with a single-line body is fine:
+    </p>

 <pre>
-  while (expr)             // single line body; {} is forbidden
+  while (expr) // one-line body -> omitting curly braces is ok
      single_line_stmt();
 </pre>

-<pre>
-  while (expr(arg1,
-              arg2))      // indentation makes it obvious it is single line,
-      single_line_stmt(); // {} is optional (not enforced either way)
-</pre>
-
-<pre>
-  while (expr1 &amp;&amp;
-         expr2) {         // multi-line, at same indentation, {} required
-      single_line_stmt();
-  }
-</pre>
-
    <p>
      However, the moment your loop/if/else body extends on to a second
      line, for whatever reason (even if it's just an added comment), then
@@ -627,37 +593,6 @@
  }
 </pre>

-    <p>Use hanging braces for compound statements: the opening brace
-      of a compound statement should be on the same line as the
-      condition being tested.  Only top-level function bodies, nested
-      scopes, and compound structure declarations should ever have {
-      on a line by itself.
-    </p>
-
-<pre>
-  void
-  foo(int a, int b)
-  {                          // correct - function body
-      int 2d[][] = {
-        {                    // correct - complex initialization
-          1, 2,
-        },
-      };
-      if (a)
-      {                      // BAD: compound brace on its own line
-          do_stuff();
-      }
-      {                      // correct - nested scope
-          int tmp;
-          if (a &lt; b) {       // correct - hanging brace
-              tmp = b;
-              b = a;
-              a = tmp;
-          }
-      }
-  }
-</pre>
-
    <h2><a name="preprocessor">Preprocessor</a></h2>

    <p>Macros defined with an ALL_CAPS name should generally be
@@ -679,7 +614,7 @@
    </p>
 <pre>
  #if defined(HAVE_POSIX_FALLOCATE) &amp;&amp; !defined(HAVE_FALLOCATE)
-  # define fallocate(a, ignored, b, c) posix_fallocate(a, b, c)
+  # define fallocate(a,ignored,b,c) posix_fallocate(a,b,c)
  #endif
 </pre>

@@ -1013,7 +948,7 @@
    <p>
      If there is a need for complex string concatenations, avoid using
      the usual sequence of malloc/strcpy/strcat/snprintf functions and
-      make use of the virBuffer API described in virbuffer.h
+      make use of the virBuffer API described in buf.h
    </p>

    <p>Typical usage is as follows:</p>
@@ -1033,8 +968,11 @@

     ...

-     if (virBufferCheckError(&amp;buf) &lt; 0)
+     if (virBufferError(&amp;buf)) {
+         virBufferFreeAndReset(&amp;buf);
+         virReportOOMError();
         return NULL;
+     }

     return virBufferContentAndReset(&amp;buf);
  }
--- a/docs/hooks.html.in
+++ b/docs/hooks.html.in
@@ -177,17 +177,6 @@
        script returns failure or the output XML is not valid, incoming
        migration will be canceled. This hook may be used, e.g., to change
        location of disk images for incoming domains.</li>
-      <li><span class="since">Since 1.2.9</span>, the qemu hook script is
-        also called when restoring a saved image either via the API or
-        automatically when restoring a managed save machine. It is called
-        as: <pre>/etc/libvirt/hooks/qemu guest_name restore begin -</pre>
-        with domain XML sent to standard input of the script. In this case,
-        the script acts as a filter and is supposed to modify the domain
-        XML and print it out on its standard output. Empty output is
-        identical to copying the input XML without changing it. In case the
-        script returns failure or the output XML is not valid, restore of the
-        image will be aborted. This hook may be used, e.g., to change
-        location of disk images for restored domains.</li>
      <li><span class="since">Since 0.9.13</span>, the qemu hook script
        is also called when the libvirtd daemon restarts and reconnects
        to previously running QEMU processes. If the script fails, the
--- a/docs/hvsupport.pl
+++ b/docs/hvsupport.pl
@@ -4,8 +4,6 @@ use strict;
 use warnings;

 use File::Find;
-use XML::XPath;
-use XML::XPath::XMLParser;

 die "syntax: $0 SRCDIR\n" unless int(@ARGV) == 1;

@@ -14,20 +12,10 @@ my $srcdir = shift @ARGV;
 my $symslibvirt = "$srcdir/libvirt_public.syms";
 my $symsqemu = "$srcdir/libvirt_qemu.syms";
 my $symslxc = "$srcdir/libvirt_lxc.syms";
-my @drivertable = (
-    "$srcdir/driver-hypervisor.h",
-    "$srcdir/driver-interface.h",
-    "$srcdir/driver-network.h",
-    "$srcdir/driver-nodedev.h",
-    "$srcdir/driver-nwfilter.h",
-    "$srcdir/driver-secret.h",
-    "$srcdir/driver-state.h",
-    "$srcdir/driver-storage.h",
-    "$srcdir/driver-stream.h",
-    );
+my $drivertable = "$srcdir/driver.h";

 my %groupheaders = (
-    "virHypervisorDriver" => "Hypervisor APIs",
+    "virDriver" => "Hypervisor APIs",
    "virNetworkDriver" => "Virtual Network APIs",
    "virInterfaceDriver" => "Host Interface APIs",
    "virNodeDeviceDriver" => "Host Device APIs",
@@ -40,7 +28,7 @@ my %groupheaders = (
 my @srcs;
 find({
    wanted => sub {
-        if (m!$srcdir/.*/\w+_(driver|common|tmpl|monitor|hal|udev)\.c$!) {
+        if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) {
            push @srcs, $_ if $_ !~ /vbox_driver\.c/;
        }
    }, no_chdir => 1}, $srcdir);
@@ -54,7 +42,6 @@ open FILE, "<$symslibvirt"

 my $vers;
 my $prevvers;
-my $apixpath = XML::XPath->new(filename => "$srcdir/../docs/libvirt-api.xml");
 while (defined($line = <FILE>)) {
    chomp $line;
    next if $line =~ /^\s*#/;
@@ -78,10 +65,7 @@ while (defined($line = <FILE>)) {
        $prevvers = $vers;
        $vers = undef;
    } elsif ($line =~ /\s*(\w+)\s*;\s*$/) {
-        my $file = $apixpath->find("/api/symbols/function[\@name='$1']/\@file");
-        $apis{$1} = {};
-        $apis{$1}->{vers} = $vers;
-        $apis{$1}->{file} = $file;
+        $apis{$1} = $vers;
    } else {
        die "unexpected data $line\n";
    }
@@ -97,7 +81,6 @@ open FILE, "<$symsqemu"

 $prevvers = undef;
 $vers = undef;
-$apixpath = XML::XPath->new(filename => "$srcdir/../docs/libvirt-qemu-api.xml");
 while (defined($line = <FILE>)) {
    chomp $line;
    next if $line =~ /^\s*#/;
@@ -121,10 +104,7 @@ while (defined($line = <FILE>)) {
        $prevvers = $vers;
        $vers = undef;
    } elsif ($line =~ /\s*(\w+)\s*;\s*$/) {
-        my $file = $apixpath->find("/api/symbols/function[\@name='$1']/\@file");
-        $apis{$1} = {};
-        $apis{$1}->{vers} = $vers;
-        $apis{$1}->{file} = $file;
+        $apis{$1} = $vers;
    } else {
        die "unexpected data $line\n";
    }
@@ -140,7 +120,6 @@ open FILE, "<$symslxc"

 $prevvers = undef;
 $vers = undef;
-$apixpath = XML::XPath->new(filename => "$srcdir/../docs/libvirt-lxc-api.xml");
 while (defined($line = <FILE>)) {
    chomp $line;
    next if $line =~ /^\s*#/;
@@ -164,10 +143,7 @@ while (defined($line = <FILE>)) {
        $prevvers = $vers;
        $vers = undef;
    } elsif ($line =~ /\s*(\w+)\s*;\s*$/) {
-        my $file = $apixpath->find("/api/symbols/function[\@name='$1']/\@file");
-        $apis{$1} = {};
-        $apis{$1}->{vers} = $vers;
-        $apis{$1}->{file} = $file;
+        $apis{$1} = $vers;
    } else {
        die "unexpected data $line\n";
    }
@@ -178,27 +154,27 @@ close FILE;

 # Some special things which aren't public APIs,
 # but we want to report
-$apis{virConnectSupportsFeature}->{vers} = "0.3.2";
-$apis{virDomainMigratePrepare}->{vers} = "0.3.2";
-$apis{virDomainMigratePerform}->{vers} = "0.3.2";
-$apis{virDomainMigrateFinish}->{vers} = "0.3.2";
-$apis{virDomainMigratePrepare2}->{vers} = "0.5.0";
-$apis{virDomainMigrateFinish2}->{vers} = "0.5.0";
-$apis{virDomainMigratePrepareTunnel}->{vers} = "0.7.2";
+$apis{virConnectSupportsFeature} = "0.3.2";
+$apis{virDomainMigratePrepare} = "0.3.2";
+$apis{virDomainMigratePerform} = "0.3.2";
+$apis{virDomainMigrateFinish} = "0.3.2";
+$apis{virDomainMigratePrepare2} = "0.5.0";
+$apis{virDomainMigrateFinish2} = "0.5.0";
+$apis{virDomainMigratePrepareTunnel} = "0.7.2";

-$apis{virDomainMigrateBegin3}->{vers} = "0.9.2";
-$apis{virDomainMigratePrepare3}->{vers} = "0.9.2";
-$apis{virDomainMigratePrepareTunnel3}->{vers} = "0.9.2";
-$apis{virDomainMigratePerform3}->{vers} = "0.9.2";
-$apis{virDomainMigrateFinish3}->{vers} = "0.9.2";
-$apis{virDomainMigrateConfirm3}->{vers} = "0.9.2";
+$apis{virDomainMigrateBegin3} = "0.9.2";
+$apis{virDomainMigratePrepare3} = "0.9.2";
+$apis{virDomainMigratePrepareTunnel3} = "0.9.2";
+$apis{virDomainMigratePerform3} = "0.9.2";
+$apis{virDomainMigrateFinish3} = "0.9.2";
+$apis{virDomainMigrateConfirm3} = "0.9.2";

-$apis{virDomainMigrateBegin3Params}->{vers} = "1.1.0";
-$apis{virDomainMigratePrepare3Params}->{vers} = "1.1.0";
-$apis{virDomainMigratePrepareTunnel3Params}->{vers} = "1.1.0";
-$apis{virDomainMigratePerform3Params}->{vers} = "1.1.0";
-$apis{virDomainMigrateFinish3Params}->{vers} = "1.1.0";
-$apis{virDomainMigrateConfirm3Params}->{vers} = "1.1.0";
+$apis{virDomainMigrateBegin3Params} = "1.1.0";
+$apis{virDomainMigratePrepare3Params} = "1.1.0";
+$apis{virDomainMigratePrepareTunnel3Params} = "1.1.0";
+$apis{virDomainMigratePerform3Params} = "1.1.0";
+$apis{virDomainMigrateFinish3Params} = "1.1.0";
+$apis{virDomainMigrateConfirm3Params} = "1.1.0";



@@ -206,44 +182,42 @@ $apis{virDomainMigrateConfirm3Params}->{vers} = "1.1.0";
 # and driver struct fields. This lets us later match
 # update the driver impls with the public APis.

+open FILE, "<$drivertable"
+    or die "cannot read $drivertable: $!";
+
 # Group name -> hash of APIs { fields -> api name }
 my %groups;
 my $ingrp;
-foreach my $drivertable (@drivertable) {
-    open FILE, "<$drivertable"
-        or die "cannot read $drivertable: $!";
+while (defined($line = <FILE>)) {
+    if ($line =~ /struct _(vir\w*Driver)/) {
+        my $grp = $1;
+        if ($grp ne "virStateDriver" &&
+            $grp ne "virStreamDriver") {
+            $ingrp = $grp;
+            $groups{$ingrp} = { apis => {}, drivers => {} };
+        }
+    } elsif ($ingrp) {
+        if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) {
+            my $field = $2;
+            my $name = $1;

-    while (defined($line = <FILE>)) {
-        if ($line =~ /struct _(vir\w*Driver)/) {
-            my $grp = $1;
-            if ($grp ne "virStateDriver" &&
-                $grp ne "virStreamDriver") {
-                $ingrp = $grp;
-                $groups{$ingrp} = { apis => {}, drivers => {} };
-            }
-        } elsif ($ingrp) {
-            if ($line =~ /^\s*vir(?:Drv)(\w+)\s+(\w+);\s*$/) {
-                my $field = $2;
-                my $name = $1;
-
-                my $api;
-                if (exists $apis{"vir$name"}) {
-                    $api = "vir$name";
-                } elsif ($name =~ /\w+(Open|Close)/) {
-                    next;
-                } else {
-                    die "driver $name does not have a public API";
-                }
-                $groups{$ingrp}->{apis}->{$field} = $api;
-            } elsif ($line =~ /};/) {
-                $ingrp = undef;
+            my $api;
+            if (exists $apis{"vir$name"}) {
+                $api = "vir$name";
+            } elsif ($name =~ /\w+(Open|Close)/) {
+                next;
+            } else {
+                die "driver $name does not have a public API";
            }
+            $groups{$ingrp}->{apis}->{$field} = $api;
+        } elsif ($line =~ /};/) {
+            $ingrp = undef;
        }
    }
-
-    close FILE;
 }

+close FILE;
+

 # Finally, we read all the primary driver files and extract
 # the driver API tables from each one.
@@ -316,43 +290,43 @@ foreach my $src (@srcs) {
 # have a bit of manual fixup todo with the per-driver versioning
 # and support matrix

-$groups{virHypervisorDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth";
-$groups{virHypervisorDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly";
-$groups{virHypervisorDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate";
+$groups{virDriver}->{apis}->{"openAuth"} = "virConnectOpenAuth";
+$groups{virDriver}->{apis}->{"openReadOnly"} = "virConnectOpenReadOnly";
+$groups{virDriver}->{apis}->{"domainMigrate"} = "virDomainMigrate";

 my $openAuthVers = (0 * 1000 * 1000) + (4 * 1000) + 0;

-foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) {
-    my $openVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"};
+foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) {
+    my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"};
    my $openVers;
    if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) {
        $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3;
    }

    # virConnectOpenReadOnly always matches virConnectOpen version
-    $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} =
-        $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpen"};
+    $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenReadOnly"} =
+        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpen"};

    # virConnectOpenAuth is always 0.4.0 if the driver existed
    # before this time, otherwise it matches the version of
    # the driver's virConnectOpen entry
    if ($openVersStr eq "Y" ||
        $openVers >= $openAuthVers) {
-        $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr;
+        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = $openVersStr;
    } else {
-        $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0";
+        $groups{"virDriver"}->{drivers}->{$drv}->{"connectOpenAuth"} = "0.4.0";
    }
 }


 # Another special case for the virDomainCreateLinux which was replaced
 # with virDomainCreateXML
-$groups{virHypervisorDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux";
+$groups{virDriver}->{apis}->{"domainCreateLinux"} = "virDomainCreateLinux";

 my $createAPIVers = (0 * 1000 * 1000) + (0 * 1000) + 3;

-foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) {
-    my $createVersStr = $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateXML"};
+foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) {
+    my $createVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateXML"};
    next unless defined $createVersStr;
    my $createVers;
    if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) {
@@ -364,9 +338,9 @@ foreach my $drv (keys %{$groups{"virHypervisorDriver"}->{drivers}}) {
    # the driver's virCreateXML entry
    if ($createVersStr eq "Y" ||
        $createVers >= $createAPIVers) {
-        $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr;
+        $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr;
    } else {
-        $groups{"virHypervisorDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3";
+        $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3";
    }
 }

@@ -393,7 +367,7 @@ in.

 EOF

-    foreach my $grp (sort { $a cmp $b } keys %groups) {
+foreach my $grp (sort { $a cmp $b } keys %groups) {
    print "<h2><a name=\"$grp\">", $groupheaders{$grp}, "</a></h2>\n";
    print <<EOF;
 <table class="top_table">
@@ -420,23 +394,10 @@ EOF
        $groups{$grp}->{apis}->{$b}
        } keys %{$groups{$grp}->{apis}}) {
        my $api = $groups{$grp}->{apis}->{$field};
-        my $vers = $apis{$api}->{vers};
-        my $htmlgrp = $apis{$api}->{file};
+        my $vers = $apis{$api};
        print <<EOF;
 <tr>
-<td>
-EOF
-
-        if (defined $htmlgrp) {
-            print <<EOF;
-<a href=\"html/libvirt-$htmlgrp.html#$api\">$api</a>
-EOF
-
-        } else {
-            print $api;
-        }
-        print <<EOF;
-</td>
+<td><a href=\"html/libvirt-libvirt.html#$api\">$api</a></td>
 <td>$vers</td>
 EOF

--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -72,7 +72,7 @@
        The <a href="http://libvirt.org/drvphyp.html">IBM PowerVM</a> hypervisor
      </li>
      <li>
-        The <a href="http://libvirt.org/drvvirtuozzo.html">Virtuozzo</a> hypervisor
+        The <a href="http://libvirt.org/drvparallels.html">Parallels</a> hypervisor
      </li>
      <li>
        The <a href="http://libvirt.org/drvbhyve.html">Bhyve</a> hypervisor
--- a/docs/internals.html.in
+++ b/docs/internals.html.in
@@ -82,9 +82,7 @@
          <ul>
              <li>Daemon Startup
              <p>The daemon initialization processing will declare itself
-              as a daemon via a virNetDaemonNew() call, then creates new server
-              using virNetServerNew() and adds that server to the main daemon
-              struct with virNetDaemonAddServer() call.  It will then use
+              as a server via a virNetServerNew() call, then use
              virDriverLoadModule() to find/load all known drivers,
              set up an RPC server program using the <code>remoteProcs[]</code>
              table via a virNetServerProgramNew() call. The table is the
--- a/docs/internals/command.html.in
+++ b/docs/internals/command.html.in
@@ -68,8 +68,8 @@
      There is now a high level API that provides a safe and
      flexible way to spawn commands, which prevents the most
      common errors &amp; is easy to code against.  This
-      code is provided in the <code>src/util/vircommand.h</code>
-      header which can be imported using <code>#include "vircommand.h"</code>
+      code is provided in the <code>src/util/command.h</code>
+      header which can be imported using <code>#include "command.h"</code>
    </p>

    <h3><a name="initial">Defining commands in libvirt</a></h3>
--- a/docs/internals/rpc.html.in
+++ b/docs/internals/rpc.html.in
@@ -532,13 +532,6 @@
        calls in parallel, with dispatch across multiple worker threads.
      </dd>

-      <dt><code>virNetDaemonPtr</code> (virnetdaemon.h)</dt>
-      <dd>The virNetDaemon APIs are used to manage a daemon process. A
-        deamon is a process that might expose one or more servers.  It
-        handles most process-related details, network-related should
-        be part of the underlying server.
-      </dd>
-
      <dt><code>virNetServerMDNSPtr</code> (virnetservermdns.h)</dt>
      <dd>The virNetServerMDNS APIs are used to advertise a server
        across the local network, enabling clients to automatically
@@ -604,7 +597,7 @@
    <h4><a name="apiclientdispatchex1">Example with buck passing</a></h4>

    <p>
-      In the first example, a second thread issues an API call
+      In the first example, a second thread issues a API call
      while the first thread holds the buck. The reply to the
      first call arrives first, so the buck is passed to the
      second thread.
--- a/docs/java.html.in
+++ b/docs/java.html.in
@@ -98,18 +98,18 @@ the code you can build the code with</p>
 <p>The bindings are articulated around a few
 classes in the <code>org/libvirt</code> package, notably the
 <code>Connect</code>, <code>Domain</code> and <code>Network</code>
-ones. Functions in the <a href="html/index.html">C API</a>
+ones. Functions in the <a href="html/libvirt-libvirt.html">C API</a>
 taking <code>virConnectPtr</code>, <code>virDomainPtr</code> or
 <code>virNetworkPtr</code> as their first argument usually become
 methods for the classes, their name is just stripped from the
 virConnect or virDomain(Get) prefix and the first letter gets converted to
 lower case, for example the C functions:</p>
    <p>
-      <code>int <a href="html/libvirt-libvirt-domain.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
+      <code>int <a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
 (virConnectPtr conn);</code>
    </p>
    <p>
-      <code>int <a href="html/libvirt-libvirt-domain.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a>
+      <code>int <a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a>
 (virDomainPtr domain, unsigned long memory);</code>
    </p>
    <p>become</p>
@@ -130,7 +130,7 @@ public class minitest {
        Connect conn=null;
        try{
            conn = new <span style="color: #0071FF; background-color: #FFFFFF">Connect</span>("test:///default", true);
-        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
+        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){
            System.out.println("exception caught:"+e);
            System.out.println(e.getError());
        }
@@ -139,7 +139,7 @@ public class minitest {
            System.out.println("Domain:" + testDomain.<span style="color: #E50073; background-color: #FFFFFF">getName</span>() + " id " +
                               testDomain.<span style="color: #E50073; background-color: #FFFFFF">getID</span>() + " running " +
                               testDomain.<span style="color: #E50073; background-color: #FFFFFF">getOSType</span>());
-        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e) {
+        } catch (<span style="color: #0071FF; background-color: #FFFFFF">LibvirtException</span> e){
            System.out.println("exception caught:"+e);
            System.out.println(e.getError());
        }
--- a/docs/libvirt.css
+++ b/docs/libvirt.css
@@ -1,3 +1,5 @@
+
+
 h1 {
    font-weight: normal;
    color: #3c857c;
--- a/docs/locking-lockd.html.in
+++ b/docs/locking-lockd.html.in
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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>Virtual machine lock manager, virtlockd plugin</h1>
-
-    <ul id="toc"></ul>
-
-    <p>
-      This page describes use of the <code>virtlockd</code>
-      service as a <a href="locking.html">lock driver</a>
-      plugin for virtual machine disk mutual exclusion.
-    </p>
-
-    <h2><a name="background">virtlockd background</a></h2>
-
-    <p>
-      The virtlockd daemon is a single purpose binary which
-      focuses exclusively on the task of acquiring and holding
-      locks on behalf of running virtual machines. It is
-      designed to offer a low overhead, portable locking
-      scheme can be used out of the box on virtualization
-      hosts with minimal configuration overheads. It makes
-      use of the POSIX fcntl advisory locking capability
-      to hold locks, which is supported by the majority of
-      commonly used filesystems.
-    </p>
-
-    <h2><a name="sanlock">virtlockd daemon setup</a></h2>
-
-    <p>
-      In most OS, the virtlockd daemon itself will not require
-      any upfront configuration work. It is installed by default
-      when libvirtd is present, and a systemd socket unit is
-      registered such that the daemon will be automatically
-      started when first required. With OS that predate systemd
-      though, it will be necessary to start it at boot time,
-      prior to libvirtd being started. On RHEL/Fedora distros,
-      this can be achieved as follows
-    </p>
-
-    <pre>
-      # chkconfig virtlockd on
-      # service virtlockd start
-    </pre>
-
-    <p>
-      The above instructions apply to the instance of virtlockd
-      that runs privileged, and is used by the libvirtd daemon
-      that runs privileged. If running libvirtd as an unprivileged
-      user, it will always automatically spawn an instance of
-      the virtlockd daemon unprivileged too. This requires no
-      setup at all.
-    </p>
-
-    <h2><a name="lockdplugin">libvirt lockd plugin configuration</a></h2>
-
-    <p>
-      Once the virtlockd daemon is running, or setup to autostart,
-      the next step is to configure the libvirt lockd plugin.
-      There is a separate configuration file for each libvirt
-      driver that is using virtlockd. For QEMU, we will edit
-      <code>/etc/libvirt/qemu-lockd.conf</code>
-    </p>
-
-    <p>
-      The default behaviour of the lockd plugin is to acquire locks
-      directly on the virtual disk images associated with the guest
-      &lt;disk&gt; elements. This ensures it can run out of the box
-      with no configuration, providing locking for disk images on
-      shared filesystems such as NFS. It does not provide any cross
-      host protection for storage that is backed by block devices,
-      since locks acquired on device nodes in /dev only apply within
-      the host. It may also be the case that the filesystem holding
-      the disk images is not capable of supporting fcntl locks.
-    </p>
-
-    <p>
-      To address these problems it is possible to tell lockd to
-      acquire locks on an indirect file. Essentially lockd will
-      calculate the SHA256 checksum of the fully qualified path,
-      and create a zero length file in a given directory whose
-      filename is the checksum. It will then acquire a lock on
-      that file. Assuming the block devices assigned to the guest
-      are using stable paths (eg /dev/disk/by-path/XXXXXXX) then
-      this will allow for locks to apply across hosts. This
-      feature can be enabled by setting a configuration setting
-      that specifies the directory in which to create the lock
-      files. The directory referred to should of course be
-      placed on a shared filesystem (eg NFS) that is accessible
-      to all hosts which can see the shared block devices.
-    </p>
-
-    <pre>
-      $ su - root
-      # augtool -s set \
-        /files/etc/libvirt/qemu-lockd.conf/file_lockspace_dir \
-        "/var/lib/libvirt/lockd/files"
-    </pre>
-
-    <p>
-      If the guests are using either LVM and SCSI block devices
-      for their virtual disks, there is a unique identifier
-      associated with each device. It is possible to tell lockd
-      to use this UUID as the basis for acquiring locks, rather
-      than the SHA256 sum of the filename. The benefit of this
-      is that the locking protection will work even if the file
-      paths to the given block device are different on each
-      host.
-    </p>
-
-    <pre>
-      $ su - root
-      # augtool -s set \
-        /files/etc/libvirt/qemu-lockd.conf/scsi_lockspace_dir \
-        "/var/lib/libvirt/lockd/scsi"
-      # augtool -s set \
-        /files/etc/libvirt/qemu-lockd.conf/lvm_lockspace_dir \
-        "/var/lib/libvirt/lockd/lvm"
-    </pre>
-
-    <p>
-      It is important to remember that the changes made to the
-      <code>/etc/libvirt/qemu-lockd.conf</code> file must be
-      propagated to all hosts before any virtual machines are
-      launched on them. This ensures that all hosts are using
-      the same locking mechanism
-    </p>
-
-    <h2><a name="qemuconfig">QEMU/KVM driver configuration</a></h2>
-
-    <p>
-      The QEMU driver is capable of using the virtlockd plugin
-      since the release <span>1.0.2</span>.
-      The out of the box configuration, however, currently
-      uses the <strong>nop</strong> lock manager plugin.
-      To get protection for disks, it is thus necessary
-      to reconfigure QEMU to activate the <strong>lockd</strong>
-      driver. This is achieved by editing the QEMU driver
-      configuration file (<code>/etc/libvirt/qemu.conf</code>)
-      and changing the <code>lock_manager</code> configuration
-      tunable.
-    </p>
-
-    <pre>
-      $ su - root
-      # augtool -s  set /files/etc/libvirt/qemu.conf/lock_manager lockd
-      # service libvirtd restart
-    </pre>
-
-    <p>
-      Every time you start a guest, the virtlockd daemon will acquire
-      locks on the disk files directly, or in one of the configured
-      lookaside directories based on SHA256 sum. To check that locks
-      are being acquired as expected, the <code>lslocks</code> tool
-      can be run.
-    </p>
-
-  </body>
-</html>
--- a/docs/locking-sanlock.html.in
+++ b/docs/locking-sanlock.html.in
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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>Virtual machine lock manager, sanlock plugin</h1>
-
-    <ul id="toc"></ul>
-
-    <p>
-      This page describes use of the
-      <a href="https://fedorahosted.org/sanlock/">sanlock</a>
-      service as a <a href="locking.html">lock driver</a>
-      plugin for virtual machine disk mutual exclusion.
-    </p>
-
-    <h2><a name="sanlock">Sanlock daemon setup</a></h2>
-
-    <p>
-      On many operating systems, the <strong>sanlock</strong> plugin
-      is distributed in a sub-package which needs to be installed
-      separately from the main libvirt RPM. On a Fedora/RHEL host
-      this can be done with the <code>yum</code> command
-    </p>
-
-    <pre>
-      $ su - root
-      # yum install libvirt-lock-sanlock
-    </pre>
-
-    <p>
-      The next step is to start the sanlock daemon. For maximum
-      safety sanlock prefers to have a connection to a watchdog
-      daemon. This will cause the entire host to be rebooted in
-      the event that sanlock crashes / terminates abnormally.
-      To start the watchdog daemon on a Fedora/RHEL host
-      the following commands can be run:
-    </p>
-
-    <pre>
-      $ su - root
-      # chkconfig wdmd on
-      # service wdmd start
-    </pre>
-
-    <p>
-      Once the watchdog is running, sanlock can be started
-      as follows
-    </p>
-
-    <pre>
-      # chkconfig sanlock on
-      # service sanlock start
-    </pre>
-
-    <p>
-      <em>Note:</em> if you wish to avoid the use of the
-      watchdog, add the following line to <code>/etc/sysconfig/sanlock</code>
-      before starting it
-    </p>
-
-    <pre>
-      SANLOCKOPTS="-w 0"
-    </pre>
-
-    <p>
-      The sanlock daemon must be started on every single host
-      that will be running virtual machines. So repeat these
-      steps as necessary.
-    </p>
-
-    <h2><a name="sanlockplugin">libvirt sanlock plugin configuration</a></h2>
-
-    <p>
-      Once the sanlock daemon is running, the next step is to
-      configure the libvirt sanlock plugin. There is a separate
-      configuration file for each libvirt driver that is using
-      sanlock. For QEMU, we will edit <code>/etc/libvirt/qemu-sanlock.conf</code>
-      There is one mandatory parameter that needs to be set,
-      the <code>host_id</code>. This is a integer between
-      1 and 2000, which must be set to a <strong>unique</strong>
-      value on each host running virtual machines.
-    </p>
-
-    <pre>
-      $ su - root
-      # augtool -s set /files/etc/libvirt/qemu-sanlock.conf/host_id 1
-    </pre>
-
-    <p>
-      Repeat this on every host, changing <strong>1</strong> to a
-      unique value for the host.
-    </p>
-
-    <h2><a name="sanlockstorage">libvirt sanlock storage configuration</a></h2>
-
-    <p>
-      The sanlock plugin needs to create leases in a directory
-      that is on a filesystem shared between all hosts running
-      virtual machines. Obvious choices for this include NFS
-      or GFS2. The libvirt sanlock plugin expects its lease
-      directory be at <code>/var/lib/libvirt/sanlock</code>
-      so update the host's <code>/etc/fstab</code> to mount
-      a suitable shared/cluster filesystem at that location
-    </p>
-
-    <pre>
-      $ su - root
-      # echo "some.nfs.server:/export/sanlock /var/lib/libvirt/sanlock nfs hard,nointr 0 0" >> /etc/fstab
-      # mount /var/lib/libvirt/sanlock
-    </pre>
-
-    <p>
-      If your sanlock daemon happen to run under non-root
-      privileges, you need to tell this to libvirt so it
-      chowns created files correctly. This can be done by
-      setting <code>user</code> and/or <code>group</code>
-      variables in the configuration file. Accepted values
-      range is specified in description to the same
-      variables in <code>/etc/libvirt/qemu.conf</code>. For
-      example:
-    </p>
-
-    <pre>
-      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock
-      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock
-    </pre>
-
-    <p>
-      But remember, that if this is NFS share, you need a
-      no_root_squash-ed one for chown (and chmod possibly)
-      to succeed.
-    </p>
-
-    <p>
-      In terms of storage requirements, if the filesystem
-      uses 512 byte sectors, you need to allow for <code>1MB</code>
-      of storage for each guest disk. So if you have a network
-      with 20 virtualization hosts, each running 50 virtual
-      machines and an average of 2 disks per guest, you will
-      need <code>20*50*2 == 2000 MB</code> of storage for
-      sanlock.
-    </p>
-
-
-    <p>
-      On one of the hosts on the network is it wise to setup
-      a cron job which runs the <code>virt-sanlock-cleanup</code>
-      script periodically. This scripts deletes any lease
-      files which are not currently in use by running virtual
-      machines, freeing up disk space on the shared filesystem.
-      Unless VM disks are very frequently created + deleted
-      it should be sufficient to run the cleanup once a week.
-    </p>
-
-    <h2><a name="qemuconfig">QEMU/KVM driver configuration</a></h2>
-
-    <p>
-      The QEMU/KVM driver is fully integrated with the lock
-      manager framework as of release <span>0.9.3</span>.
-      The out of the box configuration, however, currently
-      uses the <strong>nop</strong> lock manager plugin.
-      To get protection for disks, it is thus necessary
-      to reconfigure QEMU to activate the <strong>sanlock</strong>
-      driver. This is achieved by editing the QEMU driver
-      configuration file (<code>/etc/libvirt/qemu.conf</code>)
-      and changing the <code>lock_manager</code> configuration
-      tunable.
-    </p>
-
-    <pre>
-      $ su - root
-      # augtool -s  set /files/etc/libvirt/qemu.conf/lock_manager sanlock
-      # service libvirtd restart
-    </pre>
-
-    <p>
-      If all went well, libvirtd will have talked to sanlock
-      and created the basic lockspace. This can be checked
-      by looking for existence of the following file
-    </p>
-
-    <pre>
-      # ls /var/lib/libvirt/sanlock/
-      __LIBVIRT__DISKS__
-    </pre>
-
-    <p>
-      Every time you start a guest, additional lease files will appear
-      in this directory, one for each virtual disk. The lease
-      files are named based on the MD5 checksum of the fully qualified
-      path of the virtual disk backing file. So if the guest is given
-      a disk backed by <code>/var/lib/libvirt/images/demo.img</code>
-      expect to see a lease <code>/var/lib/libvirt/sanlock/bfa0240911bc17753e0b473688822159</code>
-    </p>
-
-    <p>
-      It should be obvious that for locking to work correctly, every
-      host running virtual machines should have storage configured
-      in the same way. The easiest way to do this is to use the libvirt
-      storage pool capability to configure any NFS volumes, iSCSI targets,
-      or SCSI HBAs used for guest storage. Simply replicate the same
-      storage pool XML across every host. It is important that any
-      storage pools exposing block devices are configured to create
-      volume paths under <code>/dev/disks/by-path</code> to ensure
-      stable paths across hosts. An example iSCSI configuration
-      which ensures this is:
-    </p>
-
-    <pre>
-&lt;pool type='iscsi'&gt;
-  &lt;name&gt;myiscsipool&lt;/name&gt;
-  &lt;source&gt;
-    &lt;host name='192.168.254.8'/&gt;
-    &lt;device path='your-iscsi-target-iqn'/&gt;
-  &lt;/source&gt;
-  &lt;target&gt;
-    &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
-  &lt;/target&gt;
-&lt;/pool&gt;
-    </pre>
-
-    <h2><a name="domainconfig">Domain configuration</a></h2>
-
-    <p>
-      In case sanlock loses access to disk locks for some reason, it will
-      kill all domains that lost their locks. This default behavior may
-      be changed using
-      <a href="formatdomain.html#elementsEvents">on_lockfailure
-      element</a> in domain XML. When this element is present, sanlock
-      will call <code>sanlock_helper</code> (provided by libvirt) with
-      the specified action. This helper binary will connect to libvirtd
-      and thus it may need to authenticate if libvirtd was configured to
-      require that on the read-write UNIX socket. To provide the
-      appropriate credentials to sanlock_helper, a
-      <a href="auth.html#Auth_client_config">client authentication
-      file</a> needs to contain something like the following:
-    </p>
-    <pre>
-[auth-libvirt-localhost]
-credentials=sanlock
-
-[credentials-sanlock]
-authname=login
-password=password
-    </pre>
-  </body>
-</html>
--- a/docs/locking.html.in
+++ b/docs/locking.html.in
@@ -2,47 +2,258 @@
 <!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>Virtual machine lock manager</h1>
+    <h1>Virtual machine disk locking</h1>

    <ul id="toc"></ul>

    <p>
-      Libvirt includes a framework for ensuring mutual exclusion
-      between virtual machines using host resources. Typically
-      this is used to prevent two VM processes from having concurrent
-      write access to the same disk image, as this would result in
-      data corruption if the guest was not using a cluster
-      aware filesystem.
+      This page describes how to ensure a single disk cannot be
+      used by more than one running VM at a time, across any
+      host in a network. This is critical to avoid data corruption
+      of guest files systems that are not cluster aware.
    </p>

    <h2><a name="plugins">Lock manager plugins</a></h2>

    <p>
-      The lock manager framework has a pluggable architecture,
-      to allow different locking technologies to be used.
+      libvirt includes a pluggable framework for lock managers,
+      which hypervisor drivers can use to ensure safety for
+      guest domain disks, and potentially other resources.
+      At this time there are only two plugin implementations,
+      a "no op" implementation which does absolutely nothing,
+      and a <a href="https://fedorahosted.org/sanlock/">sanlock</a> implementation which uses
+      the Disk Paxos algorithm to ensure safety.
    </p>

-    <dl>
-      <dt>nop</dt>
-      <dd>This is a "no op" implementation which does absolutely
-        nothing. This can be used if mutual exclusion between
-        virtual machines is not required, or if it is being
-        solved at another level in the management stack.</dd>
-      <dt><a href="locking-lockd.html">lockd</a></dt>
-      <dd>This is the current preferred implementation shipped
-        with libvirt. It uses the <code>virtlockd</code> daemon
-        to manage locks using the POSIX fcntl() advisory locking
-        capability. As such it requires a shared filesystem of
-        some kind be accessible to all hosts which share the
-        same image storage.</dd>
-      <dt><a href="locking-sanlock.html">sanlock</a></dt>
-      <dd>This is an alternative implementation preferred by
-        the oVirt project. It uses a disk paxos algorithm for
-        maintaining continuously renewed leases. In the default
-        setup it requires some shared filesystem, but it is
-        possible to use it in a manual mode where the management
-        application creates leases in SAN storage volumes.
-      </dd>
-    </dl>
+    <h2><a name="sanlock">Sanlock daemon setup</a></h2>
+
+    <p>
+      On many operating systems, the <strong>sanlock</strong> plugin
+      is distributed in a sub-package which needs to be installed
+      separately from the main libvirt RPM. On a Fedora/RHEL host
+      this can be done with the <code>yum</code> command
+    </p>
+
+    <pre>
+      $ su - root
+      # yum install libvirt-lock-sanlock
+    </pre>
+
+    <p>
+      The next step is to start the sanlock daemon. For maximum
+      safety sanlock prefers to have a connection to a watchdog
+      daemon. This will cause the entire host to be rebooted in
+      the event that sanlock crashes / terminates abnormally.
+      To start the watchdog daemon on a Fedora/RHEL host
+      the following commands can be run:
+    </p>
+
+    <pre>
+      $ su - root
+      # chkconfig wdmd on
+      # service wdmd start
+    </pre>
+
+    <p>
+      Once the watchdog is running, sanlock can be started
+      as follows
+    </p>
+
+    <pre>
+      # chkconfig sanlock on
+      # service sanlock start
+    </pre>
+
+    <p>
+      <em>Note:</em> if you wish to avoid the use of the
+      watchdog, add the following line to <code>/etc/sysconfig/sanlock</code>
+      before starting it
+    </p>
+
+    <pre>
+      SANLOCKOPTS="-w 0"
+    </pre>
+
+    <p>
+      The sanlock daemon must be started on every single host
+      that will be running virtual machines. So repeat these
+      steps as necessary.
+    </p>
+
+    <h2><a name="sanlockplugin">libvirt sanlock plugin configuration</a></h2>
+
+    <p>
+      Once the sanlock daemon is running, the next step is to
+      configure the libvirt sanlock plugin. There is a separate
+      configuration file for each libvirt driver that is using
+      sanlock. For QEMU, we will edit <code>/etc/libvirt/qemu-sanlock.conf</code>
+      There is one mandatory parameter that needs to be set,
+      the <code>host_id</code>. This is a integer between
+      1 and 2000, which must be set to a <strong>unique</strong>
+      value on each host running virtual machines.
+    </p>
+
+    <pre>
+      $ su - root
+      # augtool -s set /files/etc/libvirt/qemu-sanlock.conf/host_id 1
+    </pre>
+
+    <p>
+      Repeat this on every host, changing <strong>1</strong> to a
+      unique value for the host.
+    </p>
+
+    <h2><a name="sanlockstorage">libvirt sanlock storage configuration</a></h2>
+
+    <p>
+      The sanlock plugin needs to create leases in a directory
+      that is on a filesystem shared between all hosts running
+      virtual machines. Obvious choices for this include NFS
+      or GFS2. The libvirt sanlock plugin expects its lease
+      directory be at <code>/var/lib/libvirt/sanlock</code>
+      so update the host's <code>/etc/fstab</code> to mount
+      a suitable shared/cluster filesystem at that location
+    </p>
+
+    <pre>
+      $ su - root
+      # echo "some.nfs.server:/export/sanlock /var/lib/libvirt/sanlock nfs hard,nointr 0 0" >> /etc/fstab
+      # mount /var/lib/libvirt/sanlock
+    </pre>
+
+    <p>
+      If your sanlock daemon happen to run under non-root
+      privileges, you need to tell this to libvirt so it
+      chowns created files correctly. This can be done by
+      setting <code>user</code> and/or <code>group</code>
+      variables in the configuration file. Accepted values
+      range is specified in description to the same
+      variables in <code>/etc/libvirt/qemu.conf</code>. For
+      example:
+    </p>
+
+    <pre>
+      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock
+      augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock
+    </pre>
+
+    <p>
+      But remember, that if this is NFS share, you need a
+      no_root_squash-ed one for chown (and chmod possibly)
+      to succeed.
+    </p>
+
+    <p>
+      In terms of storage requirements, if the filesystem
+      uses 512 byte sectors, you need to allow for <code>1MB</code>
+      of storage for each guest disk. So if you have a network
+      with 20 virtualization hosts, each running 50 virtual
+      machines and an average of 2 disks per guest, you will
+      need <code>20*50*2 == 2000 MB</code> of storage for
+      sanlock.
+    </p>
+
+
+    <p>
+      On one of the hosts on the network is it wise to setup
+      a cron job which runs the <code>virt-sanlock-cleanup</code>
+      script periodically. This scripts deletes any lease
+      files which are not currently in use by running virtual
+      machines, freeing up disk space on the shared filesystem.
+      Unless VM disks are very frequently created + deleted
+      it should be sufficient to run the cleanup once a week.
+    </p>
+
+    <h2><a name="qemuconfig">QEMU/KVM driver configuration</a></h2>
+
+    <p>
+      The QEMU/KVM driver is fully integrated with the lock
+      manager framework as of release <span>0.9.3</span>.
+      The out of the box configuration, however, currently
+      uses the <strong>nop</strong> lock manager plugin.
+      To get protection for disks, it is thus necessary
+      to reconfigure QEMU to activate the <strong>sanlock</strong>
+      driver. This is achieved by editing the QEMU driver
+      configuration file (<code>/etc/libvirt/qemu.conf</code>)
+      and changing the <code>lock_manager</code> configuration
+      tunable.
+    </p>
+
+    <pre>
+      $ su - root
+      # augtool -s  set /files/etc/libvirt/qemu.conf/lock_manager sanlock
+      # service libvirtd restart
+    </pre>
+
+    <p>
+      If all went well, libvirtd will have talked to sanlock
+      and created the basic lockspace. This can be checked
+      by looking for existence of the following file
+    </p>
+
+    <pre>
+      # ls /var/lib/libvirt/sanlock/
+      __LIBVIRT__DISKS__
+    </pre>
+
+    <p>
+      Every time you start a guest, additional lease files will appear
+      in this directory, one for each virtual disk. The lease
+      files are named based on the MD5 checksum of the fully qualified
+      path of the virtual disk backing file. So if the guest is given
+      a disk backed by <code>/var/lib/libvirt/images/demo.img</code>
+      expect to see a lease <code>/var/lib/libvirt/sanlock/bfa0240911bc17753e0b473688822159</code>
+    </p>
+
+    <p>
+      It should be obvious that for locking to work correctly, every
+      host running virtual machines should have storage configured
+      in the same way. The easiest way to do this is to use the libvirt
+      storage pool capability to configure any NFS volumes, iSCSI targets,
+      or SCSI HBAs used for guest storage. Simply replicate the same
+      storage pool XML across every host. It is important that any
+      storage pools exposing block devices are configured to create
+      volume paths under <code>/dev/disks/by-path</code> to ensure
+      stable paths across hosts. An example iSCSI configuration
+      which ensures this is:
+    </p>
+
+    <pre>
+&lt;pool type='iscsi'&gt;
+  &lt;name&gt;myiscsipool&lt;/name&gt;
+  &lt;source&gt;
+    &lt;host name='192.168.254.8'/&gt;
+    &lt;device path='your-iscsi-target-iqn'/&gt;
+  &lt;/source&gt;
+  &lt;target&gt;
+    &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
+  &lt;/target&gt;
+&lt;/pool&gt;
+    </pre>
+
+    <h2><a name="domainconfig">Domain configuration</a></h2>
+
+    <p>
+      In case sanlock loses access to disk locks for some reason, it will
+      kill all domains that lost their locks. This default behavior may
+      be changed using
+      <a href="formatdomain.html#elementsEvents">on_lockfailure
+      element</a> in domain XML. When this element is present, sanlock
+      will call <code>sanlock_helper</code> (provided by libvirt) with
+      the specified action. This helper binary will connect to libvirtd
+      and thus it may need to authenticate if libvirtd was configured to
+      require that on the read-write UNIX socket. To provide the
+      appropriate credentials to sanlock_helper, a
+      <a href="auth.html#Auth_client_config">client authentication
+      file</a> needs to contain something like the following:
+    </p>
+    <pre>
+[auth-libvirt-localhost]
+credentials=sanlock
+
+[credentials-sanlock]
+authname=login
+password=password
+    </pre>
  </body>
 </html>
--- a/docs/news.html.in
+++ b/docs/news.html.in
--- a/docs/page.xsl
+++ b/docs/page.xsl
@@ -10,6 +10,11 @@
  <!-- The sitemap.html.in page contains the master navigation structure -->
  <xsl:variable name="sitemap" select="document('sitemap.html.in')/html:html/html:body/html:div[@id='sitemap']"/>

+  <xsl:template match="html:code[@class='docref']" mode="content">
+    <xsl:variable name="name"><xsl:value-of select="."/></xsl:variable>
+    <a href="html/libvirt-libvirt.html#{$name}"><code><xsl:value-of select="$name"/></code></a>
+  </xsl:template>
+
  <xsl:template match="node() | @*" mode="content">
    <xsl:copy>
      <xsl:apply-templates select="node() | @*" mode="content"/>
--- a/docs/php.html.in
+++ b/docs/php.html.in
@@ -6,7 +6,8 @@

 <h2>Presentation</h2>
    <p>The libvirt-php, originally called php-libvirt, is the PHP API bindings for
-       the libvirt virtualization toolkit originally developed by Radek Hladik.</p>
+       the libvirt virtualization toolkit originally developed by Radek Hladik but
+       currently maintained by Red Hat.</p>

 <h2>Getting the source</h2>
 <p> The PHP bindings code source is now maintained in a <a
@@ -25,7 +26,7 @@ It can also be browsed at

 <p></p>
 <h2>Project pages</h2>
-<p>Since February 2011 the project has its own pages hosted at libvirt.org. For more information on the project
+<p>Since February 2011 the project have it's own pages hosted at libvirt.org. For more information on the project
   please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>.

 </p>
--- a/docs/python.html.in
+++ b/docs/python.html.in
@@ -12,11 +12,11 @@ becomes methods for the classes, their name is just stripped from the
 virConnect or virDomain(Get) prefix and the first letter gets converted to
 lower case, for example the C functions:</p>
    <p>
-      <code>int <a href="html/libvirt-libvirt-domain.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
+      <code>int <a href="html/libvirt-libvirt.html#virConnectNumOfDomains">virConnectNumOfDomains</a>
 (virConnectPtr conn);</code>
    </p>
    <p>
-      <code>int <a href="html/libvirt-libvirt-domain.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a>
+      <code>int <a href="html/libvirt-libvirt.html#virDomainSetMaxMemory">virDomainSetMaxMemory</a>
 (virDomainPtr domain, unsigned long memory);</code>
    </p>
    <p>become</p>
@@ -31,10 +31,10 @@ in the file libvirtclass.txt present in the python dir or in the docs.There
 is a couple of function who don't map directly to their C counterparts due to
 specificities in their argument conversions:</p>
    <ul>
-      <li><code><a href="html/libvirt-libvirt-domain.html#virConnectListDomains">virConnectListDomains</a></code>
+      <li><code><a href="html/libvirt-libvirt.html#virConnectListDomains">virConnectListDomains</a></code>
    is replaced by <code>virDomain::listDomainsID(self)</code> which returns
    a list of the integer ID for the currently running domains</li>
-      <li><code><a href="html/libvirt-libvirt-domain.html#virDomainGetInfo">virDomainGetInfo</a></code>
+      <li><code><a href="html/libvirt-libvirt.html#virDomainGetInfo">virDomainGetInfo</a></code>
    is replaced by <code>virDomain::info()</code> which returns a list of
    <ol><li>state: one of the state values (virDomainState)</li><li>maxMemory: the maximum memory used by the domain</li><li>memory: the current amount of memory used by the domain</li><li>nbVirtCPU: the number of virtual CPU</li><li>cpuTime: the time used by the domain in nanoseconds</li></ol></li>
    </ul>
--- a/docs/schemas/Makefile.am
+++ b/docs/schemas/Makefile.am
@@ -19,7 +19,6 @@ schema_DATA = \
 	basictypes.rng \
 	capability.rng \
 	domain.rng \
-	domaincaps.rng \
 	domaincommon.rng \
 	domainsnapshot.rng \
 	interface.rng \
--- a/docs/schemas/basictypes.rng
+++ b/docs/schemas/basictypes.rng
@@ -14,12 +14,6 @@
    </data>
  </define>

-  <define name='hexuint'>
-    <data type='string'>
-      <param name="pattern">(0x)?[0-9a-f]+</param>
-    </data>
-  </define>
-
  <define name="positiveInteger">
    <data type="positiveInteger">
      <param name="pattern">[0-9]+</param>
@@ -83,7 +77,10 @@
    </attribute>
    <optional>
      <attribute name="multifunction">
-        <ref name="virOnOff"/>
+        <choice>
+          <value>on</value>
+          <value>off</value>
+        </choice>
      </attribute>
    </optional>
  </define>
@@ -115,7 +112,7 @@
  <!--interface on a device (system).  The duid is often used by servers  -->
  <!--such as dnsmasq to assign a specific IP address (and optionally a   -->
  <!--name to an interface.  The applicable standards are RFC3315 and     -->
-  <!--RFC6355.  These standards actually require the duid to be fixed for -->
+  <!--RFC6355.  These standards actualy require the duid to be fixed for  -->
  <!--the hardward device and applicable to all network interfaces on     -->
  <!--that device.  It is not clear that any software currently enforces  -->
  <!--this requirement although it could be implemented manually.         -->
@@ -180,7 +177,7 @@
  <define name="ipv6Addr">
    <data type="string">
      <!-- To understand this better, take apart the toplevel "|"s -->
-<param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)|(::)</param>
+<param name="pattern">(([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(([0-9A-Fa-f]{1,4}:){0,5}:(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|(::([0-9A-Fa-f]{1,4}:){0,5}(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9]))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([1-9][0-9])|([0-9])))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:)</param>
    </data>
  </define>

@@ -234,15 +231,9 @@
    </data>
  </define>

-  <define name="dirPath">
-    <data type="string">
-      <param name="pattern">[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%]+</param>
-    </data>
-  </define>
-
  <define name="absFilePath">
    <data type="string">
-      <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%,:]+</param>
+      <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%,]+</param>
    </data>
  </define>

@@ -333,7 +324,6 @@
      <value>parisc64</value>
      <value>ppc</value>
      <value>ppc64</value>
-      <value>ppc64le</value>
      <value>ppcemb</value>
      <value>s390</value>
      <value>s390x</value>
@@ -349,9 +339,8 @@
  </define>

  <define name="PortNumber">
-    <data type="int">
+    <data type="short">
      <param name="minInclusive">-1</param>
-      <param name="maxInclusive">65535</param>
    </data>
  </define>

@@ -366,27 +355,9 @@
              <value>scsi_host</value>
            </attribute>
          </optional>
-          <choice>
-            <group>
-              <attribute name='name'>
-                <text/>
-              </attribute>
-            </group>
-            <group>
-              <interleave>
-                <element name="parentaddr">
-                  <optional>
-                    <attribute name='unique_id'>
-                      <ref name='positiveInteger'/>
-                    </attribute>
-                  </optional>
-                  <element name="address">
-                    <ref name="pciaddress"/>
-                  </element>
-                </element>
-              </interleave>
-            </group>
-          </choice>
+          <attribute name='name'>
+            <text/>
+          </attribute>
        </group>
        <group>
          <attribute name='type'>
@@ -397,11 +368,6 @@
              <text/>
            </attribute>
          </optional>
-          <optional>
-            <attribute name='managed'>
-              <ref name="virYesNo"/>
-            </attribute>
-          </optional>
          <attribute name='wwnn'>
            <ref name='wwn'/>
          </attribute>
@@ -431,43 +397,4 @@
    </optional>
  </define>

-  <define name="link-speed-state">
-    <optional>
-      <element name="link">
-        <optional>
-          <attribute name="speed">
-            <ref name="unsignedInt"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="state">
-            <choice>
-              <value>unknown</value>
-              <value>notpresent</value>
-              <value>down</value>
-              <value>lowerlayerdown</value>
-              <value>testing</value>
-              <value>dormant</value>
-              <value>up</value>
-            </choice>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-  </define>
-
-  <define name="virYesNo">
-    <choice>
-      <value>yes</value>
-      <value>no</value>
-    </choice>
-  </define>
-
-  <define name="virOnOff">
-    <choice>
-      <value>on</value>
-      <value>off</value>
-    </choice>
-  </define>
-
 </grammar>
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -118,9 +118,6 @@
        <empty/>
      </element>
    </zeroOrMore>
-    <zeroOrMore>
-      <ref name='pagesElem'/>
-    </zeroOrMore>
  </define>

  <define name='power_management'>
@@ -191,25 +188,6 @@
        <ref name='memory'/>
      </optional>

-      <zeroOrMore>
-        <ref name='pagesElem'/>
-      </zeroOrMore>
-
-      <optional>
-        <element name='distances'>
-          <zeroOrMore>
-            <element name='sibling'>
-              <attribute name='id'>
-                <ref name='unsignedInt'/>
-              </attribute>
-              <attribute name='value'>
-                <ref name='unsignedInt'/>
-              </attribute>
-            </element>
-          </zeroOrMore>
-        </element>
-      </optional>
-
      <optional>
        <element name='cpus'>
          <attribute name='num'>
@@ -262,8 +240,7 @@
    <element name='os_type'>
      <choice>
        <value>xen</value> <!-- Xen 3.0 pv -->
-        <value>linux</value> <!-- same as 'xen' - meant to be legacy,
-                                  but is also used by phyp driver -->
+        <value>linux</value> <!-- same as 'xen' - legacy -->
        <value>hvm</value> <!-- unmodified OS -->
        <value>exe</value> <!-- For container based virt -->
        <value>uml</value> <!-- user mode linux -->
@@ -406,10 +383,16 @@

  <define name='featuretoggle'>
    <attribute name='toggle'>
-      <ref name="virYesNo"/>
+      <choice>
+        <value>yes</value>
+        <value>no</value>
+      </choice>
    </attribute>
    <attribute name='default'>
-      <ref name="virOnOff"/>
+      <choice>
+        <value>on</value>
+        <value>off</value>
+      </choice>
    </attribute>
  </define>

@@ -418,18 +401,4 @@
      <param name='pattern'>[a-zA-Z0-9\-_]+</param>
    </data>
  </define>
-
-  <define name='pagesElem'>
-    <element name='pages'>
-      <optional>
-        <attribute name='unit'>
-          <ref name='unit'/>
-        </attribute>
-      </optional>
-      <attribute name='size'>
-        <ref name='unsignedInt'/>
-      </attribute>
-      <ref name='unsignedInt'/>
-    </element>
-  </define>
 </grammar>
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-<!-- A Relax NG schema for the libvirt domain capabilities XML format -->
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href='basictypes.rng'/>
-  <start>
-    <ref name='domainCapabilities'/>
-  </start>
-
-
-  <define name='domainCapabilities'>
-    <element name='domainCapabilities'>
-      <interleave>
-        <element name='path'>
-          <ref name="absFilePath"/>
-        </element>
-        <element name='domain'>
-          <text/>
-        </element>
-        <element name='machine'>
-          <text/>
-        </element>
-        <element name='arch'>
-          <text/>
-        </element>
-        <optional>
-          <ref name='vcpu'/>
-        </optional>
-        <optional>
-          <ref name='os'/>
-        </optional>
-        <optional>
-          <ref name='devices'/>
-        </optional>
-      </interleave>
-    </element>
-  </define>
-
-  <define name='vcpu'>
-    <element name='vcpu'>
-      <attribute name='max'>
-        <ref name='unsignedInt'/>
-      </attribute>
-      <empty/>
-    </element>
-  </define>
-
-  <define name='loader'>
-    <element name='loader'>
-      <ref name='supported'/>
-      <optional>
-        <ref name='value'/>
-      </optional>
-      <ref name='enum'/>
-    </element>
-  </define>
-
-  <define name='os'>
-    <element name='os'>
-      <interleave>
-        <ref name='supported'/>
-        <optional>
-          <ref name='loader'/>
-        </optional>
-      </interleave>
-    </element>
-  </define>
-
-  <define name='devices'>
-    <element name='devices'>
-      <interleave>
-        <ref name='disk'/>
-        <ref name='hostdev'/>
-      </interleave>
-    </element>
-  </define>
-
-  <define name='disk'>
-    <element name='disk'>
-      <ref name='supported'/>
-      <ref name='enum'/>
-    </element>
-  </define>
-
-  <define name='hostdev'>
-    <element name='hostdev'>
-      <ref name='supported'/>
-      <ref name='enum'/>
-    </element>
-  </define>
-
-  <define name='value'>
-    <zeroOrMore>
-      <element name='value'>
-        <text/>
-      </element>
-    </zeroOrMore>
-  </define>
-
-  <define name='supported'>
-    <attribute name='supported'>
-      <ref name="virYesNo"/>
-    </attribute>
-  </define>
-
-  <define name='enum'>
-    <zeroOrMore>
-      <element name='enum'>
-        <attribute name='name'>
-          <text/>
-        </attribute>
-        <ref name='value'/>
-      </element>
-    </zeroOrMore>
-  </define>
-</grammar>
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
--- a/docs/schemas/interface.rng
+++ b/docs/schemas/interface.rng
@@ -4,7 +4,7 @@
         xmlns:v="http://netcf.org/xml/version/1.0"
         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
  <!-- Versions for this schema are simple integers that are incremented
-       every time a changed (but backwards compatible) version
+       everytime a changed (but backwards compatible) version
       is released. The current version is indicated with the v:serial
       attribute on the start element.
  -->
@@ -29,41 +29,34 @@
       Ethernet adapter
  -->
  <define name="basic-ethernet-content">
-    <interleave>
-      <attribute name="type">
-        <value>ethernet</value>
-      </attribute>
-      <ref name="name-attr"/>
-      <!-- If no MAC is given when the interface is defined, it is determined
-           by using the device name.
-           FIXME: What if device name and MAC don't specify the same NIC ? -->
-      <optional>
-        <element name="mac">
-          <attribute name="address"><ref name="macAddr"/></attribute>
-        </element>
-      </optional>
-      <ref name="link-speed-state"/>
-      <!-- FIXME: Allow (some) ethtool options -->
-    </interleave>
+    <attribute name="type">
+      <value>ethernet</value>
+    </attribute>
+    <ref name="name-attr"/>
+    <!-- If no MAC is given when the interface is defined, it is determined
+         by using the device name.
+         FIXME: What if device name and MAC don't specify the same NIC ? -->
+    <optional>
+      <element name="mac">
+        <attribute name="address"><ref name="macAddr"/></attribute>
+      </element>
+    </optional>
+    <!-- FIXME: Allow (some) ethtool options -->
  </define>

  <!-- Ethernet adapter without IP addressing, e.g. for a bridge -->
  <define name="bare-ethernet-interface">
    <element name="interface">
-      <interleave>
-        <ref name="basic-ethernet-content"/>
-      </interleave>
+      <ref name="basic-ethernet-content"/>
    </element>
  </define>

  <define name="ethernet-interface">
    <element name="interface">
-      <interleave>
-        <ref name="startmode"/>
-        <ref name="basic-ethernet-content"/>
-        <ref name="mtu"/>
-        <ref name="interface-addressing"/>
-      </interleave>
+      <ref name="startmode"/>
+      <ref name="basic-ethernet-content"/>
+      <ref name="mtu"/>
+      <ref name="interface-addressing"/>
    </element>
  </define>

@@ -78,7 +71,6 @@
         of the form DEVICE.VLAN
    -->
    <optional><ref name="name-attr"/></optional>
-    <ref name="link-speed-state"/>
  </define>

  <define name="vlan-device">
@@ -92,22 +84,18 @@

  <define name="bare-vlan-interface">
    <element name="interface">
-      <interleave>
-        <ref name="vlan-interface-common"/>
-        <ref name="vlan-device"/>
-      </interleave>
+      <ref name="vlan-interface-common"/>
+      <ref name="vlan-device"/>
    </element>
  </define>

  <define name="vlan-interface">
    <element name="interface">
-      <interleave>
-        <ref name="vlan-interface-common"/>
-        <ref name="startmode"/>
-        <ref name="mtu"/>
-        <ref name="interface-addressing"/>
-        <ref name="vlan-device"/>
-      </interleave>
+      <ref name="vlan-interface-common"/>
+      <ref name="startmode"/>
+      <ref name="mtu"/>
+      <ref name="interface-addressing"/>
+      <ref name="vlan-device"/>
    </element>
  </define>

@@ -116,33 +104,31 @@
  -->
  <define name="bridge-interface">
    <element name="interface">
-      <interleave>
-        <attribute name="type">
-          <value>bridge</value>
-        </attribute>
-        <ref name="name-attr"/>
-        <ref name="startmode"/>
-        <ref name="mtu"/>
-        <ref name="interface-addressing"/>
-        <element name="bridge">
-          <optional>
-            <attribute name="stp">
-              <ref name="virOnOff"/>
-            </attribute>
-          </optional>
-          <!-- Bridge forward delay (see 'brctl setfd') -->
-          <optional v:since="2">
-            <attribute name="delay"><ref name="timeval"/></attribute>
-          </optional>
-          <zeroOrMore>
-            <choice>
-              <ref name="bare-ethernet-interface"/>
-              <ref name="bare-vlan-interface"/>
-              <ref v:since="2" name="bare-bond-interface"/>
-            </choice>
-          </zeroOrMore>
-        </element>
-      </interleave>
+      <attribute name="type">
+        <value>bridge</value>
+      </attribute>
+      <ref name="name-attr"/>
+      <ref name="startmode"/>
+      <ref name="mtu"/>
+      <ref name="interface-addressing"/>
+      <element name="bridge">
+        <optional>
+          <attribute name="stp">
+            <ref name="on-or-off"/>
+          </attribute>
+        </optional>
+        <!-- Bridge forward delay (see 'brctl setfd') -->
+        <optional v:since="2">
+          <attribute name="delay"><ref name="timeval"/></attribute>
+        </optional>
+        <zeroOrMore>
+          <choice>
+            <ref name="bare-ethernet-interface"/>
+            <ref name="bare-vlan-interface"/>
+            <ref v:since="2" name="bare-bond-interface"/>
+          </choice>
+        </zeroOrMore>
+      </element>
    </element>
  </define>
  <!-- Jim Fehlig would like support for other bridge attributes, in
@@ -157,7 +143,6 @@
      <value>bond</value>
    </attribute>
    <ref name="name-attr"/>
-    <ref name="link-speed-state"/>
  </define>

  <define name="bond-element">
@@ -194,73 +179,67 @@
             xmit_hash_policy       (since 2.6.3/3.2.2)
      -->

-      <interleave>
-        <optional>
-          <choice>
-            <element name="miimon">
-              <!-- miimon frequency in ms -->
-              <attribute name="freq"><ref name="unsignedInt"/></attribute>
-              <optional>
-                <attribute name="downdelay"><ref name="unsignedInt"/></attribute>
-              </optional>
-              <optional>
-                <attribute name="updelay"><ref name="unsignedInt"/></attribute>
-              </optional>
-              <optional>
-                <!-- use_carrier -->
-                <attribute name="carrier">
-                  <choice>
-                    <!-- use MII/ETHTOOL ioctl -->
-                    <value>ioctl</value>
-                    <!-- use netif_carrier_ok() -->
-                    <value>netif</value>
-                  </choice>
-                </attribute>
-              </optional>
-            </element>
-            <element name="arpmon">
-              <attribute name="interval"><ref name="unsignedInt"/></attribute>
-              <attribute name="target"><ref name="ipv4Addr"/></attribute>
-              <optional>
-                <attribute name="validate">
-                  <choice>
-                    <value>none</value>
-                    <value>active</value>
-                    <value>backup</value>
-                    <value>all</value>
-                  </choice>
-                </attribute>
-              </optional>
-            </element>
-          </choice>
-        </optional>
+      <optional>
+        <choice>
+          <element name="miimon">
+            <!-- miimon frequency in ms -->
+            <attribute name="freq"><ref name="unsignedInt"/></attribute>
+            <optional>
+              <attribute name="downdelay"><ref name="unsignedInt"/></attribute>
+            </optional>
+            <optional>
+              <attribute name="updelay"><ref name="unsignedInt"/></attribute>
+            </optional>
+            <optional>
+              <!-- use_carrier -->
+              <attribute name="carrier">
+                <choice>
+                  <!-- use MII/ETHTOOL ioctl -->
+                  <value>ioctl</value>
+                  <!-- use netif_carrier_ok() -->
+                  <value>netif</value>
+                </choice>
+              </attribute>
+            </optional>
+          </element>
+          <element name="arpmon">
+            <attribute name="interval"><ref name="unsignedInt"/></attribute>
+            <attribute name="target"><ref name="ipv4Addr"/></attribute>
+            <optional>
+              <attribute name="validate">
+                <choice>
+                  <value>none</value>
+                  <value>active</value>
+                  <value>backup</value>
+                  <value>all</value>
+                </choice>
+              </attribute>
+            </optional>
+          </element>
+        </choice>
+      </optional>

-        <oneOrMore>
-          <!-- The slave interfaces -->
-          <ref name="bare-ethernet-interface"/>
-        </oneOrMore>
-      </interleave>
+      <oneOrMore>
+        <!-- The slave interfaces -->
+        <ref name="bare-ethernet-interface"/>
+      </oneOrMore>
    </element>
  </define>

  <define name="bare-bond-interface">
    <element name="interface">
-      <interleave>
-        <ref name="bond-interface-common"/>
-        <ref name="bond-element"/>
-      </interleave>
+      <ref name="bond-interface-common"/>
+      <ref name="bond-element"/>
    </element>
  </define>

  <define name="bond-interface">
    <element name="interface">
-      <interleave>
-        <ref name="bond-interface-common"/>
-        <ref name="startmode"/>
-        <ref name="mtu"/>
-        <ref name="interface-addressing"/>
-        <ref name="bond-element"/>
-      </interleave>
+      <ref name="bond-interface-common"/>
+      <ref name="startmode"/>
+      <ref name="mtu"/>
+      <ref name="interface-addressing"/>
+      <ref name="bond-element"/>
    </element>
  </define>

@@ -322,24 +301,22 @@
      <attribute name="family">
        <value>ipv4</value>
      </attribute>
-      <interleave>
-        <optional>
-          <ref name="dhcp-element"/>
-        </optional>
-        <zeroOrMore>
+      <choice>
+        <ref name="dhcp-element"/>
+        <group>
          <element name="ip">
            <attribute name="address"><ref name="ipv4Addr"/></attribute>
            <optional>
              <attribute name="prefix"><ref name="ipv4Prefix"/></attribute>
            </optional>
          </element>
-        </zeroOrMore>
-        <optional>
-          <element name="route">
-            <attribute name="gateway"><ref name="ipv4Addr"/></attribute>
-          </element>
-        </optional>
-      </interleave>
+          <optional>
+            <element name="route">
+              <attribute name="gateway"><ref name="ipv4Addr"/></attribute>
+            </element>
+          </optional>
+        </group>
+      </choice>
    </element>
  </define>

@@ -348,27 +325,25 @@
      <attribute name="family">
        <value>ipv6</value>
      </attribute>
-      <interleave>
-        <optional>
-          <element name="autoconf"><empty/></element>
-        </optional>
-        <optional>
-          <ref name="dhcp-element"/>
-        </optional>
-        <zeroOrMore>
-          <element name="ip">
-            <attribute name="address"><ref name="ipv6Addr"/></attribute>
-            <optional>
-              <attribute name="prefix"><ref name="ipv6Prefix"/></attribute>
-            </optional>
-          </element>
-        </zeroOrMore>
-        <optional>
-          <element name="route">
-            <attribute name="gateway"><ref name="ipv6Addr"/></attribute>
-          </element>
-        </optional>
-      </interleave>
+      <optional>
+        <element name="autoconf"><empty/></element>
+      </optional>
+      <optional>
+        <ref name="dhcp-element"/>
+      </optional>
+      <zeroOrMore>
+        <element name="ip">
+          <attribute name="address"><ref name="ipv6Addr"/></attribute>
+          <optional>
+            <attribute name="prefix"><ref name="ipv6Prefix"/></attribute>
+          </optional>
+        </element>
+      </zeroOrMore>
+      <optional>
+        <element name="route">
+          <attribute name="gateway"><ref name="ipv6Addr"/></attribute>
+        </element>
+      </optional>
    </element>
  </define>

@@ -376,7 +351,7 @@
    <element name="dhcp">
      <optional>
        <attribute name="peerdns">
-          <ref name="virYesNo"/>
+          <ref name="yes-or-no"/>
        </attribute>
      </optional>
    </element>
@@ -415,6 +390,21 @@
       instead of destination and nexthop instead of gateway.
  -->

+  <!-- Auxiliary definitions -->
+  <define name="on-or-off">
+    <choice>
+      <value>on</value>
+      <value>off</value>
+    </choice>
+  </define>
+
+  <define name="yes-or-no">
+    <choice>
+      <value>yes</value>
+      <value>no</value>
+    </choice>
+  </define>
+
  <!-- Type library -->

  <define name="timeval">
@@ -425,7 +415,7 @@

  <define name='vlan-id'>
    <data type="unsignedInt">
-      <param name="maxInclusive">4095</param>
+      <param name="maxInclusive">4096</param>
    </data>
  </define>
 </grammar>
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -21,14 +21,12 @@
           with no gateways addresses specified -->
      <optional>
        <attribute name="ipv6">
-          <ref name="virYesNo"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="trustGuestRxFilters">
-          <ref name="virYesNo"/>
-        </attribute>
-      </optional>
+         <choice>
+          <value>yes</value>
+          <value>no</value>
+          </choice>
+         </attribute>
+       </optional>
      <interleave>

        <!-- The name of the network, used to refer to it through the API
@@ -55,22 +53,16 @@

            <optional>
              <attribute name="stp">
-                <ref name="virOnOff"/>
+                <choice>
+                  <value>on</value>
+                  <value>off</value>
+                </choice>
              </attribute>
            </optional>

            <optional>
              <attribute name="delay">
-                <data type="unsignedLong"/>
-              </attribute>
-            </optional>
-
-            <optional>
-              <attribute name="macTableManager">
-                <choice>
-                  <value>kernel</value>
-                  <value>libvirt</value>
-                </choice>
+                <data type="integer"/>
              </attribute>
            </optional>

@@ -112,7 +104,10 @@

            <optional>
              <attribute name="managed">
-                <ref name="virYesNo"/>
+                <choice>
+                  <value>yes</value>
+                  <value>no</value>
+                </choice>
              </attribute>
            </optional>
            <interleave>
@@ -208,12 +203,10 @@
            </attribute>
            <optional>
              <attribute name="default">
-                <ref name="virYesNo"/>
-              </attribute>
-            </optional>
-            <optional>
-              <attribute name="trustGuestRxFilters">
-                <ref name="virYesNo"/>
+                <choice>
+                  <value>yes</value>
+                  <value>no</value>
+                </choice>
              </attribute>
            </optional>
            <interleave>
@@ -234,9 +227,6 @@
        <optional>
          <element name="domain">
            <attribute name="name"><ref name="dnsName"/></attribute>
-            <optional>
-              <attribute name="localOnly"><ref name="virYesNo"/></attribute>
-            </optional>
          </element>
        </optional>

@@ -246,7 +236,10 @@
          <element name="dns">
            <optional>
              <attribute name="forwardPlainNames">
-                <ref name="virYesNo"/>
+                <choice>
+                  <value>yes</value>
+                  <value>no</value>
+                </choice>
              </attribute>
            </optional>
            <interleave>
@@ -299,6 +292,17 @@
        <optional>
         <ref name="vlan"/>
        </optional>
+        <optional>
+          <element name="link">
+            <attribute name="state">
+              <choice>
+                <value>up</value>
+                <value>down</value>
+              </choice>
+            </attribute>
+            <empty/>
+          </element>
+        </optional>

        <!-- <ip> element -->
        <zeroOrMore>
@@ -363,7 +367,25 @@
        </zeroOrMore>
        <!-- <route> element -->
        <zeroOrMore>
-          <ref name="route"/>
+          <!-- The (static) route element specifies a network address and gateway
+               address to access that network. Both the network address and
+               the gateway address must be specified. -->
+          <element name="route">
+            <optional>
+              <attribute name="family"><ref name="addr-family"/></attribute>
+            </optional>
+            <attribute name="address"><ref name="ipAddr"/></attribute>
+            <optional>
+              <choice>
+                <attribute name="netmask"><ref name="ipv4Addr"/></attribute>
+                <attribute name="prefix"><ref name="ipPrefix"/></attribute>
+              </choice>
+            </optional>
+            <attribute name="gateway"><ref name="ipAddr"/></attribute>
+            <optional>
+              <attribute name="metric"><ref name="unsignedInt"/></attribute>
+            </optional>
+          </element>
        </zeroOrMore>
      </interleave>
    </element>
--- a/docs/schemas/networkcommon.rng
+++ b/docs/schemas/networkcommon.rng
@@ -78,18 +78,6 @@
          </optional>
        </element>
      </group>
-      <group>
-        <element name="virtualport">
-          <attribute name="type">
-            <value>midonet</value>
-          </attribute>
-          <element name="parameters">
-            <attribute name="interfaceid">
-              <ref name="UUID"/>
-            </attribute>
-          </element>
-        </element>
-      </group>
      <group>
        <!-- use this when no type attribute is present -->
        <element name="virtualport">
@@ -152,11 +140,9 @@
  </define>

  <define name="bandwidth-attributes">
-    <optional>
-      <attribute name="average">
-        <ref name="speed"/>
-      </attribute>
-    </optional>
+    <attribute name="average">
+      <ref name="speed"/>
+    </attribute>
    <optional>
      <attribute name="peak">
        <ref name="speed"/>
@@ -238,26 +224,4 @@
      <param name='maxInclusive'>65535</param>
    </data>
  </define>
-
-  <!-- The (static) route element specifies a network address and gateway
-       address to access that network. Both the network address and
-       the gateway address must be specified. -->
-  <define name='route'>
-    <element name="route">
-      <optional>
-        <attribute name="family"><ref name="addr-family"/></attribute>
-      </optional>
-      <attribute name="address"><ref name="ipAddr"/></attribute>
-      <optional>
-        <choice>
-          <attribute name="netmask"><ref name="ipv4Addr"/></attribute>
-          <attribute name="prefix"><ref name="ipPrefix"/></attribute>
-        </choice>
-      </optional>
-      <attribute name="gateway"><ref name="ipAddr"/></attribute>
-      <optional>
-        <attribute name="metric"><ref name="unsignedInt"/></attribute>
-      </optional>
-    </element>
-  </define>
 </grammar>
--- a/docs/schemas/nodedev.rng
+++ b/docs/schemas/nodedev.rng
@@ -158,45 +158,6 @@
      </element>
    </optional>

-    <optional>
-      <element name='numa'>
-        <optional>
-          <attribute name='node'>
-            <data type='int'/>
-          </attribute>
-        </optional>
-      </element>
-    </optional>
-
-    <optional>
-      <element name='pci-express'>
-        <zeroOrMore>
-          <element name='link'>
-            <attribute name='validity'>
-              <choice>
-                <value>cap</value>
-                <value>sta</value>
-              </choice>
-            </attribute>
-            <optional>
-              <attribute name='port'>
-                <ref name='unsignedInt'/>
-              </attribute>
-            </optional>
-            <optional>
-              <attribute name='speed'>
-                <data type="string">
-                  <param name="pattern">[0-9]+(.[0-9]+)?</param>
-                </data>
-              </attribute>
-            </optional>
-            <attribute name='width'>
-              <ref name='unsignedInt'/>
-            </attribute>
-          </element>
-        </zeroOrMore>
-      </element>
-    </optional>
  </define>

  <define name='capusbdev'>
@@ -272,27 +233,12 @@
        <ref name='mac'/>
      </element>
    </optional>
-    <ref name="link-speed-state"/>
-
-    <zeroOrMore>
-      <element name='feature'>
-        <attribute name='name'>
-          <ref name='netfeaturename'/>
-        </attribute>
-      </element>
-    </zeroOrMore>

    <zeroOrMore>
      <ref name='subcapnet'/>
    </zeroOrMore>
  </define>

-  <define name='netfeaturename'>
-    <data type='string'>
-      <param name='pattern'>[a-zA-Z\-_]+</param>
-    </data>
-  </define>
-
  <define name='subcapnet'>
    <element name='capability'>
      <choice>
@@ -353,12 +299,6 @@
      <ref name='unsignedLong'/>
    </element>

-    <optional>
-      <element name='unique_id'>
-        <ref name='positiveInteger'/>
-      </element>
-    </optional>
-
    <optional>
      <zeroOrMore>
        <element name='capability'>
@@ -481,6 +421,12 @@
    </element>
  </define>

+  <define name='hexuint'>
+    <data type='string'>
+      <param name="pattern">(0x)?[0-9a-f]+</param>
+    </data>
+  </define>
+
  <define name='mac'>
    <data type='string'>
      <param name="pattern">([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}</param>
--- a/docs/schemas/nwfilter.rng
+++ b/docs/schemas/nwfilter.rng
@@ -90,7 +90,6 @@
                  <ref name="common-ipv6-attributes-p1"/>
                  <ref name="common-port-attributes"/>
                  <ref name="ip-attributes"/>
-                  <ref name="icmp-attribute-ranges"/>
                  <ref name="comment-attribute"/>
                </element>
              </zeroOrMore>
@@ -378,7 +377,10 @@
    <interleave>
      <optional>
         <attribute name="match">
-           <ref name="virYesNo"/>
+           <choice>
+             <value>yes</value>
+             <value>no</value>
+           </choice>
         </attribute>
      </optional>
    </interleave>
@@ -589,31 +591,6 @@
    </interleave>
  </define>

-  <define name="icmp-attribute-ranges">
-    <interleave>
-      <optional>
-        <attribute name="type">
-          <ref name="uint8range"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="typeend">
-          <ref name="uint8range"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="code">
-          <ref name="uint8range"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="codeend">
-          <ref name="uint8range"/>
-        </attribute>
-      </optional>
-    </interleave>
-  </define>
-
  <define name="mac-attributes">
    <interleave>
      <optional>
--- a/docs/schemas/secret.rng
+++ b/docs/schemas/secret.rng
@@ -11,12 +11,18 @@
    <element name='secret'>
      <optional>
        <attribute name='ephemeral'>
-          <ref name="virYesNo"/>
+          <choice>
+            <value>yes</value>
+            <value>no</value>
+          </choice>
        </attribute>
      </optional>
      <optional>
        <attribute name='private'>
-          <ref name="virYesNo"/>
+          <choice>
+            <value>yes</value>
+            <value>no</value>
+          </choice>
        </attribute>
      </optional>
      <interleave>
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -75,7 +75,6 @@
      <value>vdi</value>
      <value>fat</value>
      <value>vhd</value>
-      <value>ploop</value>
      <ref name='storageFormatBacking'/>
    </choice>
  </define>
@@ -94,39 +93,4 @@
    <notAllowed/>
  </define>

-  <define name='permissions'>
-    <optional>
-      <element name='permissions'>
-        <interleave>
-          <optional>
-            <element name='mode'>
-              <ref name='octalMode'/>
-            </element>
-          </optional>
-          <optional>
-            <element name='owner'>
-              <choice>
-                <ref name='unsignedInt'/>
-                <value>-1</value>
-              </choice>
-            </element>
-          </optional>
-          <optional>
-            <element name='group'>
-              <choice>
-                <ref name='unsignedInt'/>
-                <value>-1</value>
-              </choice>
-            </element>
-          </optional>
-          <optional>
-            <element name='label'>
-              <text/>
-            </element>
-          </optional>
-        </interleave>
-      </element>
-    </optional>
-  </define>
-
 </grammar>
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -3,7 +3,6 @@
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
  <include href='basictypes.rng'/>
-  <include href='storagecommon.rng'/>
  <start>
    <ref name='pool'/>
  </start>
@@ -23,7 +22,6 @@
        <ref name='poolrbd'/>
        <ref name='poolsheepdog'/>
        <ref name='poolgluster'/>
-        <ref name='poolzfs'/>
      </choice>
    </element>
  </define>
@@ -159,20 +157,6 @@
    </interleave>
  </define>

-  <define name='poolzfs'>
-    <attribute name='type'>
-      <value>zfs</value>
-    </attribute>
-    <interleave>
-      <ref name='commonmetadata'/>
-      <ref name='sizing'/>
-      <ref name='sourcezfs'/>
-      <optional>
-        <ref name='target'/>
-      </optional>
-    </interleave>
-  </define>
-
  <define name='sourceinfovendor'>
    <interleave>
      <optional>
@@ -225,6 +209,35 @@
    </interleave>
  </define>

+  <define name='permissions'>
+    <optional>
+      <element name='permissions'>
+        <interleave>
+          <element name='mode'>
+            <ref name='octalMode'/>
+          </element>
+          <element name='owner'>
+            <choice>
+              <ref name='unsignedInt'/>
+              <value>-1</value>
+            </choice>
+          </element>
+          <element name='group'>
+            <choice>
+              <ref name='unsignedInt'/>
+              <value>-1</value>
+            </choice>
+          </element>
+          <optional>
+            <element name='label'>
+              <text/>
+            </element>
+          </optional>
+        </interleave>
+      </element>
+    </optional>
+  </define>
+
  <define name='target'>
    <element name='target'>
      <interleave>
@@ -314,15 +327,6 @@
    </element>
  </define>

-  <define name='sourceinfonetrelativepath'>
-    <element name='dir'>
-      <attribute name='path'>
-        <ref name='dirPath'/>
-      </attribute>
-      <empty/>
-    </element>
-  </define>
-
  <define name='sourceinfoname'>
    <element name='name'>
      <text/>
@@ -357,17 +361,6 @@
    </element>
  </define>

-  <define name='sourcezfs'>
-    <element name='source'>
-      <interleave>
-        <ref name='sourceinfoname'/>
-        <optional>
-          <ref name='sourceinfodev'/>
-        </optional>
-      </interleave>
-    </element>
-  </define>
-
  <define name='sourcefmtfs'>
    <optional>
      <element name='format'>
@@ -400,6 +393,8 @@
          <choice>
            <value>auto</value>
            <value>nfs</value>
+            <value>cifs</value>
+            <value>glusterfs</value>
          </choice>
        </attribute>
      </element>
@@ -412,7 +407,7 @@
      <element name='format'>
        <attribute name='type'>
          <choice>
-            <value>unknown</value>
+            <value>none</value>
            <value>dos</value>
            <value>dvh</value>
            <value>gpt</value>
@@ -436,7 +431,7 @@
      <element name='format'>
        <attribute name='type'>
          <choice>
-            <value>unknown</value> <!-- back-compat requires keeping 'unknown' not 'auto' -->
+            <value>auto</value>
            <value>lvm2</value>
          </choice>
        </attribute>
@@ -473,35 +468,14 @@

  <define name='sourcenetfs'>
    <element name='source'>
-      <choice>
-        <group>
-          <interleave>
-            <ref name='sourceinfohost'/>
-            <ref name='sourceinfodir'/>
-            <ref name='sourcefmtnetfs'/>
-            <optional>
-                <ref name='sourceinfovendor'/>
-            </optional>
-          </interleave>
-        </group>
-        <group>
-          <interleave>
-            <ref name='sourceinfohost'/>
-            <ref name='sourceinfonetrelativepath'/>
-            <element name='format'>
-              <attribute name='type'>
-                <choice>
-                  <value>cifs</value>
-                  <value>glusterfs</value>
-                </choice>
-              </attribute>
-            </element>
-            <optional>
-                <ref name='sourceinfovendor'/>
-            </optional>
-          </interleave>
-        </group>
-      </choice>
+      <interleave>
+        <ref name='sourceinfohost'/>
+        <ref name='sourceinfodir'/>
+        <ref name='sourcefmtnetfs'/>
+        <optional>
+          <ref name='sourceinfovendor'/>
+        </optional>
+      </interleave>
    </element>
  </define>

--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -59,6 +59,29 @@
    </interleave>
  </define>

+  <define name='permissions'>
+    <optional>
+      <element name='permissions'>
+        <interleave>
+          <element name='mode'>
+            <ref name='octalMode'/>
+          </element>
+          <element name='owner'>
+            <ref name='unsignedInt'/>
+          </element>
+          <element name='group'>
+            <ref name='unsignedInt'/>
+          </element>
+          <optional>
+            <element name='label'>
+              <text/>
+            </element>
+          </optional>
+        </interleave>
+      </element>
+    </optional>
+  </define>
+
  <define name='timestamps'>
    <optional>
      <element name='timestamps'>
@@ -114,11 +137,6 @@
        <optional>
          <ref name='compat'/>
        </optional>
-        <optional>
-          <element name='nocow'>
-            <empty/>
-          </element>
-        </optional>
        <optional>
          <ref name='fileFormatFeatures'/>
        </optional>
--- a/docs/search.php.code.in
+++ b/docs/search.php.code.in
@@ -9,12 +9,11 @@
    $scope = ltrim ($scope);
    if ($scope == "")
        $scope = "any";
-    $querystr = htmlspecialchars($query, ENT_QUOTES, 'UTF-8');
 ?>

 <form action="<?php echo $_SERVER['PHP_SELF'], "?query=", rawurlencode($query) ?>"
      enctype="application/x-www-form-urlencoded" method="get">
-  <input name="query" type="text" size="50" value="<?php echo $querystr ?>"/>
+  <input name="query" type="text" size="50" value="<?php echo $query?>"/>
  <select name="scope">
    <option value="any">Search All</option>
    <option value="API" <?php if ($scope == 'API') print "selected='selected'"?>>Only the APIs</option>
@@ -201,7 +200,7 @@
 	    }
 	    mysql_close($link);
 	    $nb = count($results);
-	    echo "<h3 align='center'>Found $nb results for query $querystr</h3>\n";
+	    echo "<h3 align='center'>Found $nb results for query $query</h3>\n";
 	    usort($results, "resSort");

            if ($nb > 0) {
--- a/docs/securityprocess.html.in
+++ b/docs/securityprocess.html.in
@@ -66,9 +66,9 @@
    <p>
      The libvirt security team operates a policy of
      <a href="http://en.wikipedia.org/wiki/Responsible_disclosure">responsible disclosure</a>.
-      As such any security issue reported, that is not already publicly disclosed
+      As such any security issue reported, that is not already publically disclosed
      elsewhere, will have an embargo date assigned. Members of the security team agree
-      not to publicly disclose any details of the security issue until the embargo
+      not to publically disclose any details of the security issue until the embargo
      date expires.
    </p>

@@ -77,7 +77,7 @@
      are two weeks or less in duration. If a problem is identified
      with a proposed patch for a security issue, requiring further
      investigation and bug fixing, the embargo clock may be restarted.
-      In exceptional circumstances longer initial embargoes may be
+      In exceptional circumstances longer initial embargos may be
      negotiated by mutual agreement between members of the security
      team and other relevant parties to the problem. Any such extended
      embargoes will aim to be at most one month in duration.
--- a/docs/sitemap.html.in
+++ b/docs/sitemap.html.in
@@ -101,16 +101,6 @@
              <li>
                <a href="locking.html">Disk locking</a>
                <span>Ensuring exclusive guest access to disks</span>
-                <ul>
-                  <li>
-                    <a href="locking-lockd.html">virtlockd</a>
-                    <span>virtlockd lock manager plugin</span>
-                  </li>
-                  <li>
-                    <a href="locking-sanlock.html">Sanlock</a>
-                    <span>Sanlock lock manager plugin</span>
-                  </li>
-                </ul>
              </li>
              <li>
                <a href="cgroups.html">CGroups</a>
@@ -184,10 +174,6 @@
                <a href="formatcaps.html">Capabilities</a>
                <span>The driver capabilities XML format</span>
              </li>
-              <li>
-                <a href="formatdomaincaps.html">Domain capabilities</a>
-                <span>The domain capabilities XML format</span>
-              </li>
              <li>
                <a href="formatnode.html">Node Devices</a>
                <span>The host device XML format</span>
@@ -259,8 +245,8 @@
                <span>Driver for IBM PowerVM</span>
              </li>
              <li>
-                <a href="drvvirtuozzo.html">Virtuozzo</a>
-                <span>Driver for Virtuozzo</span>
+                <a href="drvparallels.html">Parallels</a>
+                <span>Driver for Parallels Cloud Server</span>
              </li>
              <li>
                <a href="drvbhyve.html">Bhyve</a>
@@ -301,52 +287,12 @@
            -->
            <ul>
              <li>
-                <a href="html/libvirt-libvirt-domain.html">Domain</a>
-                <span>domain APIs for the libvirt library</span>
+                <a href="html/libvirt-libvirt.html">libvirt</a>
+                <span>core interfaces for the libvirt library</span>
              </li>
              <li>
-                <a href="html/libvirt-libvirt-domain-snapshot.html">Domain snapshot</a>
-                <span>domain snapshot APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-virterror.html">Error</a>
-                <span>error handling APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-event.html">Event</a>
-                <span>event APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-host.html">Host</a>
-                <span>host APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-interface.html">Interface</a>
-                <span>interface APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-network.html">Network</a>
-                <span>network APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-nodedev.html">Node device</a>
-                <span>node device APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-nwfilter.html">Network filter</a>
-                <span>network filter APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-secret.html">Secret</a>
-                <span>secret APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-storage.html">Storage</a>
-                <span>storage APIs for the libvirt library</span>
-              </li>
-              <li>
-                <a href="html/libvirt-libvirt-stream.html">Stream</a>
-                <span>stream APIs for the libvirt library</span>
+                <a href="html/libvirt-virterror.html">virterror</a>
+                <span>error handling interfaces for the libvirt library</span>
              </li>
              <li>
                <a href="hvsupport.html">Driver support</a>
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -117,9 +117,6 @@
      <li>
        <a href="#StorageBackendGluster">Gluster backend</a>
      </li>
-      <li>
-        <a href="#StorageBackendZFS">ZFS backend</a>
-      </li>
    </ul>

    <h2><a name="StorageBackendDir">Directory pool</a></h2>
@@ -291,8 +288,7 @@
        the <a href="#StorageBackendGluster">gluster</a> pool.)
      </li>
      <li>
-        <code>cifs</code> - use the SMB (samba) or CIFS file system.
-        The mount will use "-o guest" to mount the directory anonymously.
+        <code>cifs</code> - use the SMB (samba) or CIFS file system
      </li>
    </ul>

@@ -329,10 +325,14 @@

    <h3>Valid pool format types</h3>
    <p>
-      The logical volume pool supports only the <code>lvm2</code> format,
-      although not supplying a format value will result in automatic
-      selection of the<code>lvm2</code> format.
+      The logical volume pool supports the following formats:
    </p>
+    <ul>
+      <li><code>auto</code> - automatically determine format</li>
+      <li>
+        <code>lvm2</code>
+      </li>
+    </ul>

    <h3>Valid volume format types</h3>
    <p>
@@ -347,7 +347,6 @@
      on the size and placement of volumes. The 'free extents'
      information will detail the regions which are available for creating
      new volumes. A volume cannot span across 2 different free extents.
-      It will default to using <code>msdos</code> as the pool source format.
    </p>

    <h3>Example pool input</h3>
@@ -440,12 +439,6 @@
      to use <code>/dev/disk/by-path</code> or <code>/dev/disk/by-id</code>
      for the target path. These provide persistent stable naming for LUNs
    </p>
-    <p>
-      The libvirt iSCSI storage backend does not resolve the provided
-      host name or IP address when finding the available target IQN's
-      on the host; therefore, defining two pools to use the same IQN
-      on the same host will fail the duplicate source pool checks.
-    </p>

    <h3>Example pool input</h3>
    <pre>
@@ -453,7 +446,7 @@
        &lt;name&gt;virtimages&lt;/name&gt;
        &lt;source&gt;
          &lt;host name="iscsi.example.com"/&gt;
-          &lt;device path="iqn.2013-06.com.example:iscsi-pool"/&gt;
+          &lt;device path="demo-target"/&gt;
        &lt;/source&gt;
        &lt;target&gt;
          &lt;path&gt;/dev/disk/by-path&lt;/path&gt;
@@ -505,8 +498,7 @@
    <h2><a name="StorageBackendMultipath">Multipath pools</a></h2>
    <p>
      This provides a pool that contains all the multipath devices on the
-      host. Therefore, only one Multipath pool may be configured per host.
-      Volume creating is not supported via the libvirt APIs.
+      host. Volume creating is not supported via the libvirt APIs.
      The target element is actually ignored, but one is required to appease
      the libvirt XML parser.<br/>
      <br/>
@@ -560,12 +552,12 @@
        &lt;name&gt;myrbdpool&lt;/name&gt;
        &lt;source&gt;
          &lt;name&gt;rbdpool&lt;/name&gt;
-          &lt;host name='1.2.3.4' port='6789'/&gt;
-          &lt;host name='my.ceph.monitor' port='6789'/&gt;
-          &lt;host name='third.ceph.monitor' port='6789'/&gt;
-          &lt;auth username='admin' type='ceph'&gt;
-            &lt;secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/&gt;
-          &lt;/auth&gt;
+            &lt;host name='1.2.3.4' port='6789'/&gt;
+            &lt;host name='my.ceph.monitor' port='6789'/&gt;
+            &lt;host name='third.ceph.monitor' port='6789'/&gt;
+            &lt;auth username='admin' type='ceph'&gt;
+              &lt;secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/&gt;
+            &lt;/auth&gt;
        &lt;/source&gt;
      &lt;/pool&gt;</pre>

@@ -751,42 +743,5 @@
      pool type.
    </p>

-    <h2><a name="StorageBackendZFS">ZFS pools</a></h2>
-    <p>
-      This provides a pool based on the ZFS filesystem. It is currently
-      supported on FreeBSD only.
-    </p>
-
-    <p>A pool could either be created manually using the <code>zpool create</code>
-      command and its name specified in the source section or <span class="since">
-      since 1.2.9</span> source devices could be specified to create a pool using
-      libvirt.
-    </p>
-
-    <p>Please refer to the ZFS documentation for details on a pool creation.</p>
-
-    <p><span class="since">Since 1.2.8</span></p>.
-
-    <h3>Example pool input</h3>
-    <pre>
-      &lt;pool type="zfs"&gt;
-        &lt;name&gt;myzfspool&lt;/name&gt;
-        &lt;source&gt;
-          &lt;name&gt;zpoolname&lt;/name&gt;
-          &lt;device path="/dev/ada1"/&gt;
-          &lt;device path="/dev/ada2"/&gt;
-        &lt;/source&gt;
-      &lt;/pool&gt;</pre>
-
-    <h3>Valid pool format types</h3>
-    <p>
-      The ZFS volume pool does not use the pool format type element.
-    </p>
-
-    <h3>Valid pool format types</h3>
-    <p>
-      The ZFS volume pool does not use the volume format type element.
-    </p>
-
  </body>
 </html>
--- a/docs/uri.html.in
+++ b/docs/uri.html.in
@@ -19,15 +19,7 @@ documents libvirt URIs.
    <h2><a name="URI_libvirt">Specifying URIs to libvirt</a></h2>

    <p>
-      The URI is passed as the <code>name</code> parameter to
-      <a href="html/libvirt-libvirt-host.html#virConnectOpen">
-        <code>virConnectOpen</code>
-      </a>
-      or
-      <a href="html/libvirt-libvirt-host.html#virConnectOpenReadOnly">
-        <code>virConnectOpenReadOnly</code>
-      </a>.
-      For example:
+The URI is passed as the <code>name</code> parameter to <a href="html/libvirt-libvirt.html#virConnectOpen"><code>virConnectOpen</code></a> or <a href="html/libvirt-libvirt.html#virConnectOpenReadOnly"><code>virConnectOpenReadOnly</code></a>.  For example:
 </p>
    <pre>
 virConnectPtr conn = virConnectOpenReadOnly (<b>"test:///default"</b>);
@@ -299,7 +291,7 @@ Notes:
    <ol>
      <li> The HTTP client does not fully support IPv6. </li>
      <li> Many features do not work as expected across HTTP connections, in
- particular, <a href="html/libvirt-libvirt-host.html#virConnectGetCapabilities">virConnectGetCapabilities</a>.
+ particular, <a href="html/libvirt-libvirt.html#virConnectGetCapabilities">virConnectGetCapabilities</a>.
 The <a href="remote.html">remote support</a> however does work
 correctly. </li>
      <li> XenD's new-style XMLRPC interface is not supported by
--- a/examples/apparmor/Makefile.am
+++ b/examples/apparmor/Makefile.am
@@ -15,8 +15,7 @@
 ## <http://www.gnu.org/licenses/>.

 EXTRA_DIST=				\
-	TEMPLATE.qemu			\
-	TEMPLATE.lxc			\
+	TEMPLATE			\
 	libvirt-qemu			\
 	libvirt-lxc 			\
 	usr.lib.libvirt.virt-aa-helper	\
@@ -37,7 +36,6 @@ abstractions_DATA = \

 templatesdir = $(apparmordir)/libvirt
 templates_DATA = \
-	TEMPLATE.qemu \
-	TEMPLATE.lxc \
+	TEMPLATE \
 	$(NULL)
 endif WITH_APPARMOR_PROFILES
--- a/examples/apparmor/TEMPLATE.qemu
+++ b/examples/apparmor/TEMPLATE.qemu
@@ -5,5 +5,5 @@
 #include <tunables/global>

 profile LIBVIRT_TEMPLATE {
-  #include <abstractions/libvirt-qemu>
+  #include <abstractions/libvirt-driver>
 }
--- a/examples/apparmor/TEMPLATE.lxc
+++ b/examples/apparmor/TEMPLATE.lxc
@@ -1,15 +0,0 @@
-#
-# This profile is for the domain whose UUID matches this file.
-#
-
-#include <tunables/global>
-
-profile LIBVIRT_TEMPLATE {
-  #include <abstractions/libvirt-lxc>
-
-  # Globally allows everything to run under this profile
-  # These can be narrowed depending on the container's use.
-  file,
-  capability,
-  network,
-}
--- a/examples/apparmor/libvirt-lxc
+++ b/examples/apparmor/libvirt-lxc
@@ -2,115 +2,16 @@

  #include <abstractions/base>

-  umount,
+  # Needed for lxc-enter-namespace
+  capability sys_admin,
+  capability sys_chroot,

-  # ignore DENIED message on / remount
-  deny mount options=(ro, remount) -> /,
+  # Added for lxc-enter-namespace --cmd /bin/bash
+  /bin/bash PUx,

-  # allow tmpfs mounts everywhere
-  mount fstype=tmpfs,
+  /usr/sbin/cron PUx,
+  /usr/lib/systemd/systemd PUx,

-  # allow mqueue mounts everywhere
-  mount fstype=mqueue,
-
-  # allow fuse mounts everywhere
-  mount fstype=fuse.*,
-
-  # deny writes in /proc/sys/fs but allow binfmt_misc to be mounted
-  mount fstype=binfmt_misc -> /proc/sys/fs/binfmt_misc/,
-  deny @{PROC}/sys/fs/** wklx,
-
-  # allow efivars to be mounted, writing to it will be blocked though
-  mount fstype=efivarfs -> /sys/firmware/efi/efivars/,
-
-  # block some other dangerous paths
-  deny @{PROC}/sysrq-trigger rwklx,
-  deny @{PROC}/mem rwklx,
-  deny @{PROC}/kmem rwklx,
-
-  # deny writes in /sys except for /sys/fs/cgroup, also allow
-  # fusectl, securityfs and debugfs to be mounted there (read-only)
-  mount fstype=fusectl -> /sys/fs/fuse/connections/,
-  mount fstype=securityfs -> /sys/kernel/security/,
-  mount fstype=debugfs -> /sys/kernel/debug/,
-  mount fstype=proc -> /proc/,
-  mount fstype=sysfs -> /sys/,
-  deny /sys/firmware/efi/efivars/** rwklx,
-  deny /sys/kernel/security/** rwklx,
-
-  # generated by: lxc-generate-aa-rules.py container-rules.base
-  deny /proc/sys/[^kn]*{,/**} wklx,
-  deny /proc/sys/k[^e]*{,/**} wklx,
-  deny /proc/sys/ke[^r]*{,/**} wklx,
-  deny /proc/sys/ker[^n]*{,/**} wklx,
-  deny /proc/sys/kern[^e]*{,/**} wklx,
-  deny /proc/sys/kerne[^l]*{,/**} wklx,
-  deny /proc/sys/kernel/[^smhd]*{,/**} wklx,
-  deny /proc/sys/kernel/d[^o]*{,/**} wklx,
-  deny /proc/sys/kernel/do[^m]*{,/**} wklx,
-  deny /proc/sys/kernel/dom[^a]*{,/**} wklx,
-  deny /proc/sys/kernel/doma[^i]*{,/**} wklx,
-  deny /proc/sys/kernel/domai[^n]*{,/**} wklx,
-  deny /proc/sys/kernel/domain[^n]*{,/**} wklx,
-  deny /proc/sys/kernel/domainn[^a]*{,/**} wklx,
-  deny /proc/sys/kernel/domainna[^m]*{,/**} wklx,
-  deny /proc/sys/kernel/domainnam[^e]*{,/**} wklx,
-  deny /proc/sys/kernel/domainname?*{,/**} wklx,
-  deny /proc/sys/kernel/h[^o]*{,/**} wklx,
-  deny /proc/sys/kernel/ho[^s]*{,/**} wklx,
-  deny /proc/sys/kernel/hos[^t]*{,/**} wklx,
-  deny /proc/sys/kernel/host[^n]*{,/**} wklx,
-  deny /proc/sys/kernel/hostn[^a]*{,/**} wklx,
-  deny /proc/sys/kernel/hostna[^m]*{,/**} wklx,
-  deny /proc/sys/kernel/hostnam[^e]*{,/**} wklx,
-  deny /proc/sys/kernel/hostname?*{,/**} wklx,
-  deny /proc/sys/kernel/m[^s]*{,/**} wklx,
-  deny /proc/sys/kernel/ms[^g]*{,/**} wklx,
-  deny /proc/sys/kernel/msg*/** wklx,
-  deny /proc/sys/kernel/s[^he]*{,/**} wklx,
-  deny /proc/sys/kernel/se[^m]*{,/**} wklx,
-  deny /proc/sys/kernel/sem*/** wklx,
-  deny /proc/sys/kernel/sh[^m]*{,/**} wklx,
-  deny /proc/sys/kernel/shm*/** wklx,
-  deny /proc/sys/kernel?*{,/**} wklx,
-  deny /proc/sys/n[^e]*{,/**} wklx,
-  deny /proc/sys/ne[^t]*{,/**} wklx,
-  deny /proc/sys/net?*{,/**} wklx,
-  deny /sys/[^fdc]*{,/**} wklx,
-  deny /sys/c[^l]*{,/**} wklx,
-  deny /sys/cl[^a]*{,/**} wklx,
-  deny /sys/cla[^s]*{,/**} wklx,
-  deny /sys/clas[^s]*{,/**} wklx,
-  deny /sys/class/[^n]*{,/**} wklx,
-  deny /sys/class/n[^e]*{,/**} wklx,
-  deny /sys/class/ne[^t]*{,/**} wklx,
-  deny /sys/class/net?*{,/**} wklx,
-  deny /sys/class?*{,/**} wklx,
-  deny /sys/d[^e]*{,/**} wklx,
-  deny /sys/de[^v]*{,/**} wklx,
-  deny /sys/dev[^i]*{,/**} wklx,
-  deny /sys/devi[^c]*{,/**} wklx,
-  deny /sys/devic[^e]*{,/**} wklx,
-  deny /sys/device[^s]*{,/**} wklx,
-  deny /sys/devices/[^v]*{,/**} wklx,
-  deny /sys/devices/v[^i]*{,/**} wklx,
-  deny /sys/devices/vi[^r]*{,/**} wklx,
-  deny /sys/devices/vir[^t]*{,/**} wklx,
-  deny /sys/devices/virt[^u]*{,/**} wklx,
-  deny /sys/devices/virtu[^a]*{,/**} wklx,
-  deny /sys/devices/virtua[^l]*{,/**} wklx,
-  deny /sys/devices/virtual/[^n]*{,/**} wklx,
-  deny /sys/devices/virtual/n[^e]*{,/**} wklx,
-  deny /sys/devices/virtual/ne[^t]*{,/**} wklx,
-  deny /sys/devices/virtual/net?*{,/**} wklx,
-  deny /sys/devices/virtual?*{,/**} wklx,
-  deny /sys/devices?*{,/**} wklx,
-  deny /sys/f[^s]*{,/**} wklx,
-  deny /sys/fs/[^c]*{,/**} wklx,
-  deny /sys/fs/c[^g]*{,/**} wklx,
-  deny /sys/fs/cg[^r]*{,/**} wklx,
-  deny /sys/fs/cgr[^o]*{,/**} wklx,
-  deny /sys/fs/cgro[^u]*{,/**} wklx,
-  deny /sys/fs/cgrou[^p]*{,/**} wklx,
-  deny /sys/fs/cgroup?*{,/**} wklx,
-  deny /sys/fs?*{,/**} wklx,
+  /usr/lib/libsystemd-*.so.* mr,
+  /usr/lib/libudev-*.so.* mr,
+  /etc/ld.so.cache mr,
--- a/examples/apparmor/libvirt-qemu
+++ b/examples/apparmor/libvirt-qemu
@@ -1,4 +1,4 @@
-# Last Modified: Wed Sep 3 21:52:03 2014
+# Last Modified: Fri Mar 9 14:43:22 2012

  #include <abstractions/base>
  #include <abstractions/consoles>
@@ -21,7 +21,6 @@
  /dev/ptmx rw,
  /dev/kqemu rw,
  @{PROC}/*/status r,
-  @{PROC}/sys/kernel/cap_last_cap r,

  # For hostdev access. The actual devices will be added dynamically
  /sys/bus/usb/devices/ r,
@@ -59,7 +58,6 @@
  # access to firmware's etc
  /usr/share/kvm/** r,
  /usr/share/qemu/** r,
-  /usr/share/qemu-kvm/** r,
  /usr/share/bochs/** r,
  /usr/share/openbios/** r,
  /usr/share/openhackware/** r,
@@ -74,7 +72,6 @@
  # the various binaries
  /usr/bin/kvm rmix,
  /usr/bin/qemu rmix,
-  /usr/bin/qemu-kvm rmix,
  /usr/bin/qemu-system-arm rmix,
  /usr/bin/qemu-system-cris rmix,
  /usr/bin/qemu-system-i386 rmix,
@@ -113,17 +110,13 @@
  /usr/bin/qemu-sparc32plus rmix,
  /usr/bin/qemu-sparc64 rmix,
  /usr/bin/qemu-x86_64 rmix,
-  /usr/{lib,lib64}/qemu/block-curl.so mr,
-  /usr/{lib,lib64}/qemu/block-rbd.so mr,
+  /usr/lib/qemu/block-curl.so mr,

  # for save and resume
  /bin/dash rmix,
  /bin/dd rmix,
  /bin/cat rmix,

-  # for restore
-  /bin/bash rmix,
-
  # for usb access
  /dev/bus/usb/ r,
  /etc/udev/udev.conf r,
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -1,7 +1,7 @@
 # Last Modified: Mon Apr  5 15:10:27 2010
 #include <tunables/global>

-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
+/usr/lib/libvirt/virt-aa-helper {
  #include <abstractions/base>

  # needed for searching directories
@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
  /sys/devices/ r,
  /sys/devices/** r,

-  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
+  /usr/lib/libvirt/virt-aa-helper mr,
  /sbin/apparmor_parser Ux,

  /etc/apparmor.d/libvirt/* r,
--- a/examples/apparmor/usr.sbin.libvirtd
+++ b/examples/apparmor/usr.sbin.libvirtd
@@ -13,7 +13,6 @@
  capability sys_admin,
  capability sys_module,
  capability sys_ptrace,
-  capability sys_pacct,
  capability sys_nice,
  capability sys_chroot,
  capability setuid,
@@ -25,7 +24,6 @@
  capability mknod,
  capability fsetid,
  capability audit_write,
-  capability ipc_lock,

  # Needed for vfio
  capability sys_resource,
@@ -35,7 +33,6 @@
  network inet6 stream,
  network inet6 dgram,
  network packet dgram,
-  network packet raw,

  # Very lenient profile for libvirtd since we want to first focus on confining
  # the guests. Guests will have a very restricted profile.
@@ -47,8 +44,7 @@
  /usr/bin/* PUx,
  /usr/sbin/* PUx,
  /lib/udev/scsi_id PUx,
-  /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx,
-  /usr/{lib,lib64}/xen/bin/* Ux,
+  /usr/lib/xen-common/bin/xen-toolstack PUx,

  # force the use of virt-aa-helper
  audit deny /sbin/apparmor_parser rwxl,
@@ -57,9 +53,7 @@
  audit deny /sys/kernel/security/apparmor/matching rwxl,
  audit deny /sys/kernel/security/apparmor/.* rwxl,
  /sys/kernel/security/apparmor/profiles r,
-  /usr/{lib,lib64}/libvirt/* PUxr,
-  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
-  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
+  /usr/lib/libvirt/* PUxr,
  /etc/libvirt/hooks/** rmix,
  /etc/xen/scripts/** rmix,

--- a/examples/domtop/Makefile.am
+++ b/examples/domtop/Makefile.am
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-## Copyright (C) 2014 Red Hat, Inc.
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-           -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \
-           -I$(top_srcdir)
-LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \
-         $(top_builddir)/gnulib/lib/libgnu.la $(COVERAGE_LDFLAGS)
-
-noinst_PROGRAMS=domtop
-
-domtop_SOURCES=domtop.c
-domtop_LDFLAGS=
-domtop_LDADD= $(LDADDS)
--- a/examples/domtop/domtop.c
+++ b/examples/domtop/domtop.c
@@ -1,406 +0,0 @@
-/*
- * domtop.c: Demo program showing how to calculate CPU usage
- *
- * Copyright (C) 2014 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: Michal Privoznik <mprivozn@redhat.com>
- */
-
-#include <config.h>
-
-#include <errno.h>
-#include <getopt.h>
-#include <libvirt/libvirt.h>
-#include <libvirt/virterror.h>
-#include <signal.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-static bool debug;
-static bool run_top;
-
-/* On mingw, there's a header file that poisons the well:
- *
- *
- *  CC       domtop.o
- *domtop.c:40:0: warning: "ERROR" redefined [enabled by default]
- * #define ERROR(...)                                              \
- * ^
- *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0,
- *                 from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
- *                 from ../../gnulib/lib/unistd.h:48,
- *                 from domtop.c:35:
- * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition
- * #define ERROR 0
- */
-#undef ERROR
-#define ERROR(...)                                              \
-do {                                                            \
-    fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
-} while (0)
-
-#define DEBUG(...)                                              \
-do {                                                            \
-    if (!debug)                                                 \
-        break;                                                  \
-    fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
-} while (0)
-
-#define STREQ(a, b) (strcmp(a, b) == 0)
-
-static void
-print_usage(const char *progname)
-{
-    const char *unified_progname;
-
-    if (!(unified_progname = strrchr(progname, '/')))
-        unified_progname = progname;
-    else
-        unified_progname++;
-
-    printf("\n%s [options] [domain name]\n\n"
-           "  options:\n"
-           "    -d | --debug        enable debug messages\n"
-           "    -h | --help         print this help\n"
-           "    -c | --connect=URI  hypervisor connection URI\n"
-           "    -D | --delay=X      delay between updates in milliseconds "
-           "(default is 500ms)\n"
-           "\n"
-           "Print the cumulative usage of each host CPU.\n"
-           "Without any domain name specified the list of\n"
-           "all running domains is printed out.\n",
-           unified_progname);
-}
-
-static void
-parse_argv(int argc, char *argv[],
-           const char **uri,
-           const char **dom_name,
-           unsigned int *milliseconds)
-{
-    int arg;
-    unsigned long val;
-    char *p;
-    struct option opt[] = {
-        {"debug", no_argument, NULL, 'd'},
-        {"help", no_argument, NULL, 'h'},
-        {"connect", required_argument, NULL, 'c'},
-        {"delay", required_argument, NULL, 'D'},
-        {NULL, 0, NULL, 0}
-    };
-
-    while ((arg = getopt_long(argc, argv, "+:dhc:D:", opt, NULL)) != -1) {
-        switch (arg) {
-        case 'd':
-            debug = true;
-            break;
-        case 'h':
-            print_usage(argv[0]);
-            exit(EXIT_SUCCESS);
-            break;
-        case 'c':
-            *uri = optarg;
-            break;
-        case 'D':
-            /* strtoul man page suggests clearing errno prior to call */
-            errno = 0;
-            val = strtoul(optarg, &p, 10);
-            if (errno || *p || p == optarg) {
-                ERROR("Invalid number: '%s'", optarg);
-                exit(EXIT_FAILURE);
-            }
-            *milliseconds = val;
-            if (*milliseconds != val) {
-                ERROR("Integer overflow: %ld", val);
-                exit(EXIT_FAILURE);
-            }
-            break;
-        case ':':
-            ERROR("option '-%c' requires an argument", optopt);
-            exit(EXIT_FAILURE);
-        case '?':
-            if (optopt)
-                ERROR("unsupported option '-%c'. See --help.", optopt);
-            else
-                ERROR("unsupported option '%s'. See --help.", argv[optind - 1]);
-            exit(EXIT_FAILURE);
-        default:
-            ERROR("unknown option");
-            exit(EXIT_FAILURE);
-        }
-    }
-
-    if (argc > optind)
-        *dom_name = argv[optind];
-}
-
-static int
-fetch_domains(virConnectPtr conn)
-{
-    int num_domains, ret = -1;
-    virDomainPtr *domains = NULL;
-    size_t i;
-    const int list_flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE;
-
-    DEBUG("Fetching list of running domains");
-    num_domains = virConnectListAllDomains(conn, &domains, list_flags);
-
-    DEBUG("num_domains=%d", num_domains);
-    if (num_domains < 0) {
-        ERROR("Unable to fetch list of running domains");
-        goto cleanup;
-    }
-
-    printf("Running domains:\n");
-    printf("----------------\n");
-    for (i = 0; i < num_domains; i++) {
-        virDomainPtr dom = domains[i];
-        const char *dom_name = virDomainGetName(dom);
-        printf("%s\n", dom_name);
-        virDomainFree(dom);
-    }
-
-    ret = 0;
- cleanup:
-    free(domains);
-    return ret;
-}
-
-static void
-print_cpu_usage(const char *dom_name,
-                size_t cpu,
-                size_t ncpus,
-                unsigned long long then,
-                virTypedParameterPtr then_params,
-                size_t then_nparams,
-                unsigned long long now,
-                virTypedParameterPtr now_params,
-                size_t now_nparams)
-{
-    size_t i, j;
-    size_t nparams = now_nparams;
-    bool delim = false;
-
-    if (then_nparams != now_nparams) {
-        /* this should not happen (TM) */
-        ERROR("parameters counts don't match");
-        return;
-    }
-
-    for (i = 0; i < ncpus; i++) {
-        size_t pos;
-        double usage;
-
-        /* check if the vCPU is in the maps */
-        if (now_params[i * nparams].type == 0 ||
-            then_params[i * then_nparams].type == 0)
-            continue;
-
-        for (j = 0; j < nparams; j++) {
-            pos = i * nparams + j;
-            if (STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_CPUTIME) ||
-                STREQ(then_params[pos].field, VIR_DOMAIN_CPU_STATS_VCPUTIME))
-                break;
-        }
-
-        if (j == nparams) {
-            ERROR("unable to find %s", VIR_DOMAIN_CPU_STATS_CPUTIME);
-            return;
-        }
-
-        DEBUG("now_params=%llu then_params=%llu now=%llu then=%llu",
-              now_params[pos].value.ul, then_params[pos].value.ul, now, then);
-
-        /* @now_params and @then_params are in nanoseconds, @now and @then are
-         * in microseconds. In ideal world, we would translate them both into
-         * the same scale, divide one by another and multiply by factor of 100
-         * to get percentage. However, the count of floating point operations
-         * performed has a bad effect on the precision, so instead of dividing
-         * @now_params and @then_params by 1000 and then multiplying again by
-         * 100, we divide only once by 10 and get the same result. */
-        usage = (now_params[pos].value.ul - then_params[pos].value.ul) /
-                (now - then) / 10;
-
-        if (delim)
-            printf("\t");
-        printf("CPU%zu: %.2lf", cpu + i, usage);
-        delim = true;
-    }
-
-    printf("\n");
-}
-
-static void
-stop(int sig)
-{
-    DEBUG("Exiting on signal %d\n", sig);
-    run_top = false;
-}
-
-static int
-do_top(virConnectPtr conn,
-       const char *dom_name,
-       unsigned int milliseconds)
-{
-    int ret = -1;
-    virDomainPtr dom;
-    int max_id = 0;
-    int nparams = 0, then_nparams = 0, now_nparams = 0;
-    virTypedParameterPtr then_params = NULL, now_params = NULL;
-    struct sigaction action_stop;
-
-    memset(&action_stop, 0, sizeof(action_stop));
-    action_stop.sa_handler = stop;
-
-    /* Lookup the domain */
-    if (!(dom = virDomainLookupByName(conn, dom_name))) {
-        ERROR("Unable to find domain '%s'", dom_name);
-        goto cleanup;
-    }
-
-    /* and see how many vCPUs can we fetch stats for */
-    if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0)) < 0) {
-        ERROR("Unable to get cpu stats");
-        goto cleanup;
-    }
-
-    /* how many stats can we get for a vCPU? */
-    if ((nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, 0)) < 0) {
-        ERROR("Unable to get cpu stats");
-        goto cleanup;
-    }
-
-    if (!(now_params = calloc(nparams * max_id, sizeof(*now_params))) ||
-        !(then_params = calloc(nparams * max_id, sizeof(*then_params)))) {
-        ERROR("Unable to allocate memory");
-        goto cleanup;
-    }
-
-    sigaction(SIGTERM, &action_stop, NULL);
-    sigaction(SIGINT, &action_stop, NULL);
-
-    run_top = true;
-    while (run_top) {
-        struct timeval then, now;
-
-        /* Get current time */
-        if (gettimeofday(&then, NULL) < 0) {
-            ERROR("unable to get time");
-            goto cleanup;
-        }
-
-        /* And current stats */
-        if ((then_nparams = virDomainGetCPUStats(dom, then_params,
-                                                 nparams, 0, max_id, 0)) < 0) {
-            ERROR("Unable to get cpu stats");
-            goto cleanup;
-        }
-
-        /* Now sleep some time */
-        usleep(milliseconds * 1000); /* usleep expects microseconds */
-
-        /* And get current time */
-        if (gettimeofday(&now, NULL) < 0) {
-            ERROR("unable to get time");
-            goto cleanup;
-        }
-
-        /* And current stats */
-        if ((now_nparams = virDomainGetCPUStats(dom, now_params,
-                                                nparams, 0, max_id, 0)) < 0) {
-            ERROR("Unable to get cpu stats");
-            goto cleanup;
-        }
-
-        print_cpu_usage(dom_name, 0, max_id,
-                        then.tv_sec * 1000000 + then.tv_usec,
-                        then_params, then_nparams,
-                        now.tv_sec * 1000000 + now.tv_usec,
-                        now_params, now_nparams);
-
-        virTypedParamsClear(now_params, now_nparams * max_id);
-        virTypedParamsClear(then_params, then_nparams * max_id);
-    }
-
-    ret = 0;
- cleanup:
-    virTypedParamsFree(now_params, nparams * max_id);
-    virTypedParamsFree(then_params, nparams * max_id);
-    if (dom)
-        virDomainFree(dom);
-    return ret;
-}
-
-int
-main(int argc, char *argv[])
-{
-    int ret = EXIT_FAILURE;
-    virConnectPtr conn = NULL;
-    const char *uri = NULL;
-    const char *dom_name = NULL;
-    unsigned int milliseconds = 500; /* Sleep this long between two API calls */
-    const int connect_flags = 0; /* No connect flags for now */
-
-    parse_argv(argc, argv, &uri, &dom_name, &milliseconds);
-
-    DEBUG("Proceeding with uri=%s dom_name=%s milliseconds=%u",
-          uri, dom_name, milliseconds);
-
-    if (!(conn = virConnectOpenAuth(uri,
-                                    virConnectAuthPtrDefault,
-                                    connect_flags))) {
-        ERROR("Failed to connect to hypervisor");
-        goto cleanup;
-    }
-
-    DEBUG("Successfully connected");
-
-    if (!dom_name) {
-        if (fetch_domains(conn) == 0)
-            ret = EXIT_SUCCESS;
-        goto cleanup;
-    }
-
-    if (do_top(conn, dom_name, milliseconds) < 0)
-        goto cleanup;
-
-    ret = EXIT_SUCCESS;
- cleanup:
-    if (conn) {
-        int tmp;
-        tmp = virConnectClose(conn);
-        if (tmp < 0) {
-            ERROR("Failed to disconnect from the hypervisor");
-            ret = EXIT_FAILURE;
-        } else if (tmp > 0) {
-            ERROR("One or more references were leaked after "
-                  "disconnect from the hypervisor");
-            ret = EXIT_FAILURE;
-        } else {
-            DEBUG("Connection successfully closed");
-        }
-    }
-    return ret;
-}
--- a/Show More
+++ b/Show More