Release of libvirt-0.7.0

* configure.in NEWS docs/* libvirt.spec.in include/libvirt/libvirt.h:
  Release of 0.7.0
* po/*.po*: updated and regenerated the localization pool

.cvsignore

@@ -1,37 +0,0 @@
-*.a
-*.o
-*.orig
-*.rej
-*~
-.git
-ABOUT-NLS
-COPYING
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-coverage
-libtool
-libvirt-*.tar.gz
-libvirt.pc
-libvirt.spec
-ltconfig
-ltmain.sh
-m4
-mingw32-libvirt.spec
-mkinstalldirs
-results.log
-stamp-h
-stamp-h.in
-stamp-h1
-update.log

.gitignore

@@ -1,9 +1,8 @@
 *.a
 *.o
-*.orig
-*.rej
 *~
 .git
+.git-module-status
 ABOUT-NLS
 COPYING
 INSTALL
@@ -21,13 +20,14 @@ config.status
 config.sub
 configure
 coverage
+cscope.files
+cscope.out
 libtool
 libvirt-*.tar.gz
 libvirt.pc
 libvirt.spec
 ltconfig
 ltmain.sh
-m4
 mingw32-libvirt.spec
 mkinstalldirs
 results.log
@@ -35,3 +35,12 @@ stamp-h
 stamp-h.in
 stamp-h1
 update.log
+tests/*.log
+/GNUmakefile
+/maint.mk
+gnulib/
+*.orig
+*.rej
+*#*#
+*.#*#
+ChangeLog

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+	path = .gnulib
+	url = git://git.sv.gnu.org/gnulib.git

.hgignore

@@ -0,0 +1,298 @@
+syntax: glob
+*.a
+*.o
+*~
+.git
+ABOUT-NLS
+COPYING
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+build-aux/compile
+build-aux/config.guess
+build-aux/config.rpath
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/missing
+build-aux/mkinstalldirs
+build-aux/mktempd
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.rpath
+config.status
+config.sub
+configure
+coverage
+docs/.memdump
+docs/Makefile
+docs/Makefile.in
+docs/apibuild.pyc
+docs/devhelp/Makefile
+docs/devhelp/Makefile.in
+docs/devhelp/libvirt.devhelp
+docs/examples/.deps
+docs/examples/.libs
+docs/examples/.memdump
+docs/examples/Makefile
+docs/examples/Makefile.in
+docs/examples/info1
+docs/examples/python/Makefile
+docs/examples/python/Makefile.in
+docs/examples/suspend
+docs/schemas/Makefile
+docs/schemas/Makefile.in
+examples/domain-events/events-c/*.exe
+examples/domain-events/events-c/.deps
+examples/domain-events/events-c/.libs
+examples/domain-events/events-c/Makefile
+examples/domain-events/events-c/Makefile.in
+examples/domain-events/events-c/event-test
+examples/hellolibvirt/.deps
+examples/hellolibvirt/.libs
+examples/hellolibvirt/Makefile
+examples/hellolibvirt/Makefile.in
+examples/hellolibvirt/hellolibvirt
+gnulib/lib/*.la
+gnulib/lib/*.lo
+gnulib/lib/.deps
+gnulib/lib/.libs
+gnulib/lib/Makefile
+gnulib/lib/Makefile.in
+gnulib/lib/alloca.h
+gnulib/lib/arpa/inet.h
+gnulib/lib/arpa_inet.h
+gnulib/lib/errno.h
+gnulib/lib/float.h
+gnulib/lib/netdb.h
+gnulib/lib/netinet/in.h
+gnulib/lib/netinet_in.h
+gnulib/lib/poll.h
+gnulib/lib/stdbool.h
+gnulib/lib/stdint.h
+gnulib/lib/stdio.h
+gnulib/lib/stdlib.h
+gnulib/lib/string.h
+gnulib/lib/sys/select.h
+gnulib/lib/sys/socket.h
+gnulib/lib/sys/stat.h
+gnulib/lib/sys/time.h
+gnulib/lib/sys_ioctl.h
+gnulib/lib/sys_select.h
+gnulib/lib/sys_socket.h
+gnulib/lib/sys_stat.h
+gnulib/lib/sys_time.h
+gnulib/lib/time.h
+gnulib/lib/unistd.h
+gnulib/lib/wchar.h
+gnulib/tests/.deps
+gnulib/tests/.libs
+gnulib/tests/Makefile
+gnulib/tests/Makefile.in
+gnulib/tests/sys
+gnulib/tests/test-EOVERFLOW
+gnulib/tests/test-alloca-opt
+gnulib/tests/test-arpa_inet
+gnulib/tests/test-c-ctype
+gnulib/tests/test-errno
+gnulib/tests/test-fseeko
+gnulib/tests/test-getaddrinfo
+gnulib/tests/test-getdelim
+gnulib/tests/test-gethostname
+gnulib/tests/test-getline
+gnulib/tests/test-gettimeofday
+gnulib/tests/test-lseek
+gnulib/tests/test-lstat
+gnulib/tests/test-netdb
+gnulib/tests/test-netinet_in
+gnulib/tests/test-perror
+gnulib/tests/test-poll
+gnulib/tests/test-random_r
+gnulib/tests/test-snprintf
+gnulib/tests/test-sockets
+gnulib/tests/test-stdbool
+gnulib/tests/test-stdint
+gnulib/tests/test-stdio
+gnulib/tests/test-stdlib
+gnulib/tests/test-strerror
+gnulib/tests/test-string
+gnulib/tests/test-sys_select
+gnulib/tests/test-sys_socket
+gnulib/tests/test-sys_stat
+gnulib/tests/test-sys_time
+gnulib/tests/test-time
+gnulib/tests/test-unistd
+gnulib/tests/test-vasnprintf
+gnulib/tests/test-vasprintf
+gnulib/tests/test-wchar
+include/Makefile
+include/Makefile.in
+include/libvirt/Makefile
+include/libvirt/Makefile.in
+libtool
+libvirt-*.tar.gz
+libvirt.pc
+libvirt.spec
+ltconfig
+ltmain.sh
+m4/Makefile
+m4/Makefile.in
+m4/acinclude.m4
+m4/aclocal.m4
+m4/codeset.m4
+m4/gettext.m4
+m4/glibc21.m4
+m4/iconv.m4
+m4/intdiv0.m4
+m4/intmax.m4
+m4/inttypes-pri.m4
+m4/inttypes.m4
+m4/inttypes_h.m4
+m4/isc-posix.m4
+m4/lcmessage.m4
+m4/lib-ld.m4
+m4/lib-link.m4
+m4/lib-prefix.m4
+m4/libtool.m4
+m4/longdouble.m4
+m4/longlong.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+m4/nls.m4
+m4/po.m4
+m4/printf-posix.m4
+m4/progtest.m4
+m4/signed.m4
+m4/size_max.m4
+m4/stdint_h.m4
+m4/uintmax_t.m4
+m4/ulonglong.m4
+m4/wchar_t.m4
+m4/wint_t.m4
+m4/xsize.m4
+mingw32-libvirt.spec
+mkinstalldirs
+po/*.gmo
+po/Makefile
+po/Makefile.in
+po/Makefile.in.in
+po/Makevars.template
+po/POTFILES
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.sed
+po/remove-potcdate.sin
+po/stamp-po
+proxy/.deps
+proxy/.libs
+proxy/Makefile
+proxy/Makefile.in
+proxy/libvirt_proxy
+python/*.la
+python/*.lo
+python/*.loT
+python/*.pyc
+python/.deps
+python/.libs
+python/Makefile
+python/Makefile.in
+python/gen_prog
+python/generated.stamp
+python/libvirt-export.c
+python/libvirt-py.[ch]
+python/libvirt.py
+python/libvirtclass.py
+python/libvirtclass.txt
+python/tests/Makefile
+python/tests/Makefile.in
+qemud/*.gcda
+qemud/*.gcno
+qemud/*.la
+qemud/*.lo
+qemud/.deps
+qemud/.libs
+qemud/Makefile
+qemud/Makefile.in
+qemud/libvirt_qemud
+qemud/libvirtd
+qemud/libvirtd.init
+qemud/libvirtd.logrotate
+results.log
+src/*.cov
+src/*.exe
+src/*.gcda
+src/*.gcno
+src/*.gcov
+src/*.i
+src/*.la
+src/*.lo
+src/*.loT
+src/*.s
+src/.deps
+src/.libs
+src/Makefile
+src/Makefile.in
+src/libvirt.syms
+src/libvirt_lxc
+src/libvirt_parthelper
+src/virsh
+src/virsh-net-edit.c
+src/virsh-pool-edit.c
+stamp-h
+stamp-h.in
+stamp-h1
+tests/*.exe
+tests/*.gcda
+tests/*.gcno
+tests/.deps
+tests/.libs
+tests/Makefile
+tests/Makefile.in
+tests/confdata/Makefile
+tests/confdata/Makefile.in
+tests/conftest
+tests/eventtest
+tests/nodedevxml2xmltest
+tests/nodeinfotest
+tests/object-locking
+tests/object-locking-files.txt
+tests/object-locking.cmi
+tests/object-locking.cmx
+tests/qemuargv2xmltest
+tests/qemuhelptest
+tests/qemuxml2argvtest
+tests/qemuxml2xmltest
+tests/qparamtest
+tests/reconnect
+tests/seclabeltest
+tests/sexpr2xmldata/Makefile
+tests/sexpr2xmldata/Makefile.in
+tests/sexpr2xmltest
+tests/statstest
+tests/virshtest
+tests/xencapsdata/Makefile
+tests/xencapsdata/Makefile.in
+tests/xencapstest
+tests/xmconfigdata/Makefile
+tests/xmconfigdata/Makefile.in
+tests/xmconfigtest
+tests/xml2sexprdata/Makefile
+tests/xml2sexprdata/Makefile.in
+tests/xml2sexprtest
+tools/Makefile
+tools/Makefile.in
+tools/virt-xml-validate
+tools/virt-xml-validate.1
+update.log

.x-sc_avoid_if_before_free

@@ -1,5 +1 @@
-^gnulib/lib/getaddrinfo\.c$
-^gnulib/lib/printf-parse\.c$
-^gnulib/lib/vasnprintf\.c$
-^build-aux/useless-if-before-free$
-^ChangeLog$
+^ChangeLog

.x-sc_avoid_write

@@ -1,4 +1,5 @@
 ^src/util\.c$
 ^src/xend_internal\.c$
 ^src/util-lib\.c$
+^qemud/qemud.c$
 ^gnulib/

.x-sc_m4_quote_check

@@ -0,0 +1 @@
+^gnulib/m4/intl\.m4$

.x-sc_prohibit_HAVE_MBRTOWC

@@ -0,0 +1 @@
+gnulib/.*

.x-sc_prohibit_VIR_ERR_NO_MEMORY

@@ -0,0 +1,8 @@
+ChangeLog
+docs/devhelp/libvirt-virterror.html
+docs/html/libvirt-virterror.html
+docs/libvirt-api.xml
+docs/libvirt-refs.xml
+include/libvirt/virterror.h
+qemud/dispatch.c
+src/virterror.c

.x-sc_prohibit_asprintf

@@ -0,0 +1,3 @@
+^gnulib/
+^po/
+ChangeLog

.x-sc_prohibit_gethostby

@@ -0,0 +1,3 @@
+gnulib/lib/getaddrinfo.c
+gnulib/m4/
+src/xend_internal.c

.x-sc_prohibit_nonreentrant

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

.x-sc_prohibit_strcmp_and_strncmp

@@ -0,0 +1 @@
+^gnulib/

.x-sc_require_config_h_first

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

AUTHORS

@@ -20,7 +20,8 @@ The primary maintainers and people with commit access rights:
   Dave Leskovec        <dlesko@linux.vnet.ibm.com>
   Cole Robinson        <crobinso@redhat.com>
   Dan Smith            <danms@us.ibm.com>
-  Guido Guenther       <agx@sigxcpu.org>
+  Guido Günther        <agx@sigxcpu.org>
+  John Levon           <john.levon@sun.com>
 
 Patches have also been contributed by:
 
@@ -47,18 +48,43 @@ Patches have also been contributed by:
   Stefan de Konink     <dekonink@kinkrsoftware.nl>
   Kaitlin Rupert       <kaitlin@linux.vnet.ibm.com>
   Evgeniy Sokolov      <evg@openvz.org>
-  John Levon           <john.levon@sun.com>
   David Lively         <dlively@virtualiron.com>
   Charles Duffy        <Charles_Duffy@messageone.com>
   Nguyen Anh Quynh     <aquynh@gmail.com>
   James Morris         <jmorris@namei.org>
   Chris Wrigh          <chrisw@redhat.com>
-  Ben Guthro           <bguthro@virtualiron.com>
+  Ben Guthro           <ben.guthro@gmail.com>
   Shigeki Sakamoto     <fj0588di@aa.jp.fujitsu.com>
   Gerd von Egidy       <lists@egidy.de>
+  Itamar Heim          <iheim@redhat.com>
+  Dave Allan           <dallan@redhat.com>
+  Markus Armbruster    <armbru@redhat.com>
+  Ryota Ozaki          <ozaki.ryota@gmail.com>
+  James Morris         <jmorris@namei.org>
+  Daniel J Walsh       <dwalsh@redhat.com>
+  Maximilian Wilhelm   <max@rfc2324.org>
+  Pritesh Kothari      <Pritesh.Kothari@Sun.COM>
+  Amit Shah            <amit.shah@redhat.com>
+  Florian Vichot       <florian.vichot@diateam.net>
+  Takahashi Tomohiro   <takatom@jp.fujitsu.com>
+  Serge E. Hallyn      <serue@us.ibm.com>
+  Soren Hansen         <soren@canonical.com>
+  Laine Stump          <laine@redhat.com>
+  Abel Míguez Rodríguez<amiguezr@pdi.ucm.es>
+  Doug Goldstein       <cardoe@gentoo.org>
+  Javier Fontan        <jfontan@gmail.com>
+  Federico Simoncelli  <federico.simoncelli@gmail.com>
+  Amy Griffis          <amy.griffis@hp.com>
+  Henrik Persson E     <henrik.e.persson@ericsson.com>
+  Satoru SATOH         <satoru.satoh@gmail.com>
+  Paolo Bonzini        <pbonzini@redhat.com>
+  Matthias Bolte       <matthias.bolte@googlemail.com>
 
   [....send patches to get your name here....]
 
 The libvirt Logo was designed by Diana Fong
 
 -- End
+;; Local Variables:
+;; coding: utf-8
+;; End:

COPYING.LIB

@@ -506,5 +506,3 @@ if necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

GNUmakefile

@@ -1,60 +0,0 @@
-# Having a separate GNUmakefile lets me `include' the dynamically
-# generated rules created via Makefile.maint as well as Makefile.maint itself.
-# This makefile is used only if you run GNU Make.
-# It is necessary if you want to build targets usually of interest
-# only to the maintainer.
-
-# Copyright (C) 2001, 2003, 2006-2008 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Systems where /bin/sh is not the default shell need this.  The $(shell)
-# command below won't work with e.g. stock DOS/Windows shells.
-ifeq ($(wildcard /bin/s[h]),/bin/sh)
-SHELL = /bin/sh
-else
-# will be used only with the next shell-test line, then overwritten
-# by a configured-in value
-SHELL = sh
-endif
-
-_have-Makefile := $(shell test -f Makefile && echo yes)
-
-# If the user runs GNU make but has not yet run ./configure,
-# give them a diagnostic.
-ifeq ($(_have-Makefile),yes)
-
-# Make tar archive easier to reproduce.
-export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
-
-include Makefile
-
-include $(srcdir)/Makefile.cfg
-include $(srcdir)/Makefile.maint
-
-else
-
-all:
-	@echo There seems to be no Makefile in this directory.   1>&2
-	@echo "You must run ./configure before running \`make'." 1>&2
-	@exit 1
-
-check dist distcheck install: all
-
-endif
-
-# Tell version 3.79 and up of GNU make to not build goals in this
-# directory in parallel.  This is necessary in case someone tries to
-# build multiple targets on one command line.
-.NOTPARALLEL:

HACKING

@@ -91,6 +91,62 @@ Usually they're in macro definitions or strings, and should be converted
 anyhow.
 
 
+C types
+=======
+Use the right type.
+
+Scalars
+-------
+If you're using "int" or "long", odds are good that there's a better type.
+If a variable is counting something, be sure to declare it with an
+unsigned type.
+If it's memory-size-related, use size_t (use ssize_t only if required).
+If it's file-size related, use uintmax_t, or maybe off_t.
+If it's file-offset related (i.e., signed), use off_t.
+If it's just counting small numbers use "unsigned int";
+(on all but oddball embedded systems, you can assume that that
+type is at least four bytes wide).
+If a variable has boolean semantics, give it the "bool" type
+and use the corresponding "true" and "false" macros.  It's ok
+to include <stdbool.h>, since libvirt's use of gnulib ensures
+that it exists and is usable.
+In the unusual event that you require a specific width, use a
+standard type like int32_t, uint32_t, uint64_t, etc.
+
+While using "bool" is good for readability, it comes with minor caveats:
+ - Don't use "bool" in places where the type size must be constant across
+   all systems, like public interfaces and on-the-wire protocols.  Note
+   that it would be possible (albeit wasteful) to use "bool" in libvirt's
+   logical wire protocol, since XDR maps that to its lower-level bool_t
+   type, which *is* fixed-size.
+ - Don't compare a bool variable against the literal, "true",
+   since a value with a logical non-false value need not be "1".
+   I.e., don't write "if (seen == true) ...".  Rather, write "if (seen)...".
+
+Of course, take all of the above with a grain of salt.  If you're about
+to use some system interface that requires a type like size_t, pid_t or
+off_t, use matching types for any corresponding variables.
+
+Also, if you try to use e.g., "unsigned int" as a type, and that
+conflicts with the signedness of a related variable, sometimes
+it's best just to use the *wrong* type, if "pulling the thread"
+and fixing all related variables would be too invasive.
+
+Finally, while using descriptive types is important, be careful not to
+go overboard.  If whatever you're doing causes warnings, or requires
+casts, then reconsider or ask for help.
+
+Pointers
+--------
+Ensure that all of your pointers are "const-correct".
+Unless a pointer is used to modify the pointed-to storage,
+give it the "const" attribute.  That way, the reader knows
+up-front that this is a read-only pointer.  Perhaps more
+importantly, if we're diligent about this, when you see a non-const
+pointer, you're guaranteed that it is used to modify the storage
+it points to, or it is aliased to another pointer that is.
+
+
 Low level memory management
 ===========================
 
@@ -247,6 +303,22 @@ are some special reasons why you cannot include these files
 explicitly.
 
 
+Printf-style functions
+======================
+
+Whenever you add a new printf-style function, i.e., one with a format
+string argument and following "..." in its prototype, be sure to use
+gcc's printf attribute directive in the prototype.  For example, here's
+the one for virAsprintf, in util.h:
+
+    int virAsprintf(char **strp, const char *fmt, ...)
+	ATTRIBUTE_FMT_PRINTF(2, 3);
+
+This makes it so gcc's -Wformat and -Wformat-security options can do
+their jobs and cross-check format strings with the number and types
+of arguments.
+
+
 
                 Libvirt commiters guidelines
                 ============================

Makefile.am

@@ -3,19 +3,24 @@
 LCOV = lcov
 GENHTML = genhtml
 
-SUBDIRS = gnulib/lib include src qemud proxy docs gnulib/tests \
-  python tests po examples/domain-events/events-c
+SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
+  python tests po examples/domain-events/events-c examples/hellolibvirt
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 EXTRA_DIST = \
+  ChangeLog-old \
   libvirt.spec libvirt.spec.in \
   mingw32-libvirt.spec.in \
   libvirt.pc libvirt.pc.in \
   $(man_MANS) autobuild.sh \
   .x-sc_avoid_if_before_free \
+  .x-sc_require_config_h_first \
   .x-sc_prohibit_strcmp \
+  .x-sc_prohibit_strcmp_and_strncmp \
   .x-sc_require_config_h \
+  .x-sc_prohibit_nonreentrant \
+  Makefile.nonreentrant \
   autogen.sh
 
 man_MANS = virsh.1
@@ -43,5 +48,21 @@ cov: clean-cov
 clean-cov:
 	rm -rf $(top_builddir)/coverage
 
+MAINTAINERCLEANFILES = .git-module-status
+
 # disable this check
 distuninstallcheck:
+
+dist-hook: gen-ChangeLog
+
+# Generate the ChangeLog file (with all entries since the switch to git)
+# and insert it into the directory we're about to use to create a tarball.
+gen_start_date = 2009-07-04
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d .git; then					\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
+	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
+	  rm -f $(distdir)/ChangeLog;				\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
+	fi

Makefile.cfg

@@ -1,57 +0,0 @@
-# Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Use alpha.gnu.org for alpha and beta releases.
-# Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
-url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/coreutils
-
-# Tests not to run as part of "make distcheck".
-local-checks-to-skip =			\
-  makefile_path_separator_check		\
-  makefile-check			\
-  sc_tight_scope			\
-  sc_GPL_version			\
-  sc_always_defined_macros		\
-  sc_cast_of_alloca_return_value	\
-  sc_dd_max_sym_length			\
-  sc_error_exit_success			\
-  sc_file_system			\
-  sc_obsolete_symbols			\
-  sc_prohibit_atoi_atof			\
-  sc_prohibit_jm_in_m4			\
-  sc_prohibit_quote_without_use		\
-  sc_prohibit_quotearg_without_use	\
-  sc_root_tests				\
-  sc_space_tab				\
-  sc_sun_os_names			\
-  sc_system_h_headers			\
-  sc_two_space_separator_in_usage	\
-  sc_useless_cpp_parens			\
-  patch-check				\
-  check-AUTHORS				\
-  changelog-check
-
-useless_free_options =		\
-  --name=sexpr_free		\
-  --name=xmlFree		\
-  --name=xmlXPathFreeContext	\
-  --name=xmlXPathFreeObject

Makefile.maint

@@ -1,635 +0,0 @@
-# This is reported not to work with make-3.79.1
-# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-ME := Makefile.maint
-
-# Do not save the original name or timestamp in the .tar.gz file.
-# Use --rsyncable if available.
-gzip_rsyncable := \
-  $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable)
-GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
-
-VC_LIST = build-aux/vc-list-files
-
-VC_LIST_EXCEPT = \
-  $(VC_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi
-
-# Prevent programs like 'sort' from considering distinct strings to be equal.
-# Doing it here saves us from having to set LC_ALL elsewhere in this file.
-export LC_ALL = C
-
-# Collect the names of rules starting with `sc_'.
-syntax-check-rules := $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
-                        $(srcdir)/$(ME))
-.PHONY: $(syntax-check-rules)
-
-local-checks-available = \
-  po-check copyright-check m4-check author_mark_check \
-  patch-check strftime-check $(syntax-check-rules) \
-  makefile_path_separator_check \
-  makefile-check check-AUTHORS
-.PHONY: $(local-checks-available)
-
-local-check := $(filter-out $(local-checks-to-skip), $(local-checks-available))
-
-syntax-check: $(local-check)
-#	@grep -nE '#  *include <(limits|std(def|arg|bool))\.h>'		\
-#	    $$(find -type f -name '*.[chly]') &&			\
-#	  { echo '$(ME): found conditional include' 1>&2;		\
-#	    exit 1; } || :
-
-#	grep -nE '^#  *include <(string|stdlib)\.h>'			\
-#	    $(srcdir)/{lib,src}/*.[chy] &&				\
-#	  { echo '$(ME): FIXME' 1>&2;					\
-#	    exit 1; } || :
-# FIXME: don't allow `#include .strings\.h' anywhere
-
-sc_avoid_if_before_free:
-	@$(srcdir)/build-aux/useless-if-before-free			\
-		$(useless_free_options)					\
-	    $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo '$(ME): found useless "if" before "free" above' 1>&2;	\
-	    exit 1; } || :
-
-# Avoid uses of write(2).  Either switch to streams (fwrite), or use
-# the safewrite wrapper.
-sc_avoid_write:
-	@if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then		\
-	  grep '\<write *(' $$($(VC_LIST_EXCEPT) | grep '\.c$$') &&	\
-	    { echo "$(ME): the above files use write;"			\
-	      " consider using the safewrite wrapper instead"		\
-		  1>&2; exit 1; } || :;					\
-	else :;								\
-	fi
-
-sc_cast_of_argument_to_free:
-	@grep -nE '\<free \(\(' $$($(VC_LIST_EXCEPT)) &&		\
-	  { echo '$(ME): don'\''t cast free argument' 1>&2;		\
-	    exit 1; } || :
-
-sc_cast_of_x_alloc_return_value:
-	@grep -nE '\*\) *x(m|c|re)alloc\>' $$($(VC_LIST_EXCEPT)) &&	\
-	  { echo '$(ME): don'\''t cast x*alloc return value' 1>&2;	\
-	    exit 1; } || :
-
-sc_cast_of_alloca_return_value:
-	@grep -nE '\*\) *alloca\>' $$($(VC_LIST_EXCEPT)) &&		\
-	  { echo '$(ME): don'\''t cast alloca return value' 1>&2;	\
-	    exit 1; } || :
-
-sc_space_tab:
-	@grep -n '[ ]	' $$($(VC_LIST_EXCEPT)) &&			\
-	  { echo '$(ME): found SPACE-TAB sequence; remove the SPACE'	\
-		1>&2; exit 1; } || :
-
-# Don't use *scanf or the old ato* functions in `real' code.
-# They provide no error checking mechanism.
-# Instead, use strto* functions.
-sc_prohibit_atoi_atof:
-	@grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$($(VC_LIST_EXCEPT)) && \
-	  { echo '$(ME): do not use *scan''f, ato''f, ato''i, ato''l, ato''ll, ato''q, or ss''canf'	\
-		1>&2; exit 1; } || :
-
-# Use STREQ rather than comparing strcmp == 0, or != 0.
-# Similarly, use STREQLEN or STRPREFIX rather than strncmp.
-sc_prohibit_strcmp:
-	@grep -nE '! *str''n?cmp *\(|\<str''n?cmp *\([^)]+\) *=='	\
-	    $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo '$(ME): use STREQ in place of the above uses of str''cmp' \
-		1>&2; exit 1; } || :
-
-# Using EXIT_SUCCESS as the first argument to error is misleading,
-# since when that parameter is 0, error does not exit.  Use `0' instead.
-sc_error_exit_success:
-	@grep -nF 'error (EXIT_SUCCESS,'				\
-	    $$(find -type f -name '*.[chly]') &&			\
-	  { echo '$(ME): found error (EXIT_SUCCESS' 1>&2;		\
-	    exit 1; } || :
-
-sc_file_system:
-	@grep -ni 'file''system' $$($(VC_LIST_EXCEPT)) &&		\
-	  { echo '$(ME): found use of "file''system";'			\
-	    'rewrite to use "file system"' 1>&2;			\
-	    exit 1; } || :
-
-sc_no_have_config_h:
-	@grep -n '^# *if.*HAVE''_CONFIG_H' $$($(VC_LIST_EXCEPT)) &&	\
-	  { echo '$(ME): found use of HAVE''_CONFIG_H; remove'		\
-		1>&2; exit 1; } || :
-
-# Nearly all .c files must include <config.h>.
-sc_require_config_h:
-	@if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then		\
-	  grep -L '^# *include <config\.h>'				\
-		$$($(VC_LIST_EXCEPT) | grep '\.c$$')			\
-	      | grep . &&						\
-	  { echo '$(ME): the above files do not include <config.h>'	\
-		1>&2; exit 1; } || :;					\
-	else :;								\
-	fi
-
-# To use this "command" macro, you must first define two shell variables:
-# h: the header, enclosed in <> or ""
-# re: a regular expression that matches IFF something provided by $h is used.
-define _header_without_use
-  h_esc=`echo "$$h"|sed 's/\./\\./'`;					\
-  if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then			\
-    files=$$(grep -l '^# *include '"$$h_esc"				\
-	     $$($(VC_LIST_EXCEPT) | grep '\.c$$')) &&			\
-    grep -LE "$$re" $$files | grep . &&					\
-      { echo "$(ME): the above files include $$h but don't use it"	\
-	1>&2; exit 1; } || :;						\
-  else :;								\
-  fi
-endef
-
-# Prohibit the inclusion of assert.h without an actual use of assert.
-sc_prohibit_assert_without_use:
-	@h='<assert.h>' re='\<assert *\(' $(_header_without_use)
-
-# Prohibit the inclusion of getopt.h without an actual use.
-sc_prohibit_getopt_without_use:
-	@h='<getopt.h>' re='\<getopt(_long)? *\(' $(_header_without_use)
-
-# Don't include quotearg.h unless you use one of its functions.
-sc_prohibit_quotearg_without_use:
-	@h='"quotearg.h"' re='\<quotearg(_[^ ]+)? *\(' $(_header_without_use)
-
-# Don't include quote.h unless you use one of its functions.
-sc_prohibit_quote_without_use:
-	@h='"quote.h"' re='\<quote(_n)? *\(' $(_header_without_use)
-
-# Prohibit the inclusion of c-ctype.h without an actual use.
-sc_prohibit_c_ctype_without_use:
-	@h='[<"]c-ctype.h[">]' re='\<c_($(ctype_re)) *\(' $(_header_without_use)
-
-# Prohibit the inclusion of <ctype.h>.
-sc_prohibit_ctype_h:
-	@grep -E '^# *include  *<ctype\.h>' $$($(VC_LIST_EXCEPT)) &&	\
-	  { echo "$(ME): don't use ctype.h; instead, use c-ctype.h"	\
-		1>&2; exit 1; } || :
-
-sc_obsolete_symbols:
-	@grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>'			\
-	     $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY'	\
-		1>&2; exit 1; } || :
-
-# FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ
-
-# Each nonempty line must start with a year number, or a TAB.
-# Or day-of-week+space.
-changelog_entry_header_regexp = \
-  ([12][0-9][0-9][0-9]|	.|(Mon|Tue|Wed|Thu|Fri|Sat|Sun) )
-sc_changelog:
-	@grep -Evn '(^$$|^$(changelog_entry_header_regexp))'		\
-	  $$(find . -maxdepth 2 -name ChangeLog) &&			\
-	  { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2;	\
-	    exit 1; } || :
-
-# Ensure that dd's definition of LONGEST_SYMBOL stays in sync
-# with the strings from the two affected variables.
-dd_c = $(srcdir)/src/dd.c
-sc_dd_max_sym_length:
-ifneq ($(wildcard $(dd_c)),)
-	@len=$$( (sed -n '/conversions\[\] =$$/,/^};/p' $(dd_c);\
-		 sed -n '/flags\[\] =$$/,/^};/p' $(dd_c) )	\
-		|sed -n '/"/s/^[^"]*"\([^"]*\)".*/\1/p'		\
-	      | wc --max-line-length);				\
-	max=$$(sed -n '/^#define LONGEST_SYMBOL /s///p' $(dd_c)	\
-	      |tr -d '"' | wc --max-line-length);		\
-	if test "$$len" = "$$max"; then :; else			\
-	  echo 'dd.c: LONGEST_SYMBOL is not longest' 1>&2;	\
-	  exit 1;						\
-	fi
-endif
-
-# Many m4 macros names once began with `jm_'.
-# On 2004-04-13, they were all changed to start with gl_ instead.
-# Make sure that none are inadvertently reintroduced.
-sc_prohibit_jm_in_m4:
-	@grep -nE 'jm_[A-Z]'					\
-		$$($(VC_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \
-	    { echo '$(ME): do not use jm_ in m4 macro names'	\
-	      1>&2; exit 1; } || :
-
-sc_root_tests:
-	@if test -d tests \
-	      && grep check-root tests/Makefile.am>/dev/null 2>&1; then \
-	t1=sc-root.expected; t2=sc-root.actual;				\
-	grep -nl '^require_root_$$'					\
-	  $$($(VC_LIST) tests) |sed s,tests,., |sort > $$t1;		\
-	sed -n 's,	cd \([^ ]*\) .*MAKE..check TESTS=\(.*\),./\1/\2,p' \
-	  $(srcdir)/tests/Makefile.am |sort > $$t2;			\
-	diff -u $$t1 $$t2 || diff=1;					\
-	rm -f $$t1 $$t2;						\
-	test "$$diff"							\
-	  && { echo 'tests/Makefile.am: missing check-root action'>&2;	\
-	       exit 1; } || :;						\
-	fi
-
-headers_with_interesting_macro_defs = \
-  exit.h	\
-  fcntl_.h	\
-  fnmatch_.h	\
-  intprops.h	\
-  inttypes_.h	\
-  lchown.h	\
-  openat.h	\
-  stat-macros.h	\
-  stdint_.h
-
-# Create a list of regular expressions matching the names
-# of macros that are guaranteed by parts of gnulib to be defined.
-.re-defmac:
-	@(cd $(srcdir)/lib;						\
-	  for f in $(headers_with_interesting_macro_defs); do		\
-	    test -f $$f &&						\
-	      sed -n '/^# *define \([^_ (][^ (]*\)[ (].*/s//\1/p' $$f;	\
-	   done;							\
-	 ) | sort -u							\
-	   | grep -Ev 'ATTRIBUTE_NORETURN|SIZE_MAX'			\
-	   | sed 's/^/^# *define /'					\
-	  > $@-t
-	@mv $@-t $@
-
-# Don't define macros that we already get from gnulib header files.
-sc_always_defined_macros: .re-defmac
-	@if test -f $(srcdir)/src/system.h; then			\
-	  trap 'rc=$$?; rm -f .re-defmac; exit $$rc' 0 1 2 3 15;	\
-	  grep -f .re-defmac $$($(VC_LIST))				\
-	    && { echo '$(ME): define the above via some gnulib .h file'	\
-		  1>&2;  exit 1; } || :;				\
-	fi
-
-# Create a list of regular expressions matching the names
-# of files included from system.h.  Exclude a couple.
-.re-list:
-	@sed -n '/^# *include /s///p' $(srcdir)/src/system.h \
-	  | grep -Ev 'sys/(param|file)\.h' \
-	  | sed 's/ .*//;;s/^["<]/^# *include [<"]/;s/\.h[">]$$/\\.h[">]/' \
-	  > $@-t
-	@mv $@-t $@
-
-# Files in src/ should not include directly any of
-# the headers already included via system.h.
-sc_system_h_headers: .re-list
-	@if test -f $(srcdir)/src/system.h; then			\
-	  trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15;		\
-	  grep -nE -f .re-list						\
-	      $$($(VC_LIST) src |					\
-		 grep -Ev '((copy|system)\.h|parse-gram\.c)$$')		\
-	    && { echo '$(ME): the above are already included via system.h'\
-		  1>&2;  exit 1; } || :;				\
-	fi
-
-sc_sun_os_names:
-	@grep -nEi \
-	    'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \
-	    $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo '$(ME): found misuse of Sun OS version numbers' 1>&2;	\
-	    exit 1; } || :
-
-sc_the_the:
-	@grep -ni '\<the ''the\>' $$($(VC_LIST_EXCEPT)) &&		\
-	  { echo '$(ME): found use of "the ''the";' 1>&2;		\
-	    exit 1; } || :
-
-sc_tight_scope:
-	$(MAKE) -C src $@
-
-sc_trailing_blank:
-	@grep -n '[	 ]$$' $$($(VC_LIST_EXCEPT)) &&			\
-	  { echo '$(ME): found trailing blank(s)'			\
-		1>&2; exit 1; } || :
-
-# Ensure that no C source file uses TABs for indentation.
-# Also match *.h.in files, to get libvirt.h.in.
-# Exclude files in gnulib, since they're imported.
-sc_TAB_in_indentation:
-	@grep -lE '^ *	' /dev/null					\
-	     $$($(VC_LIST_EXCEPT)					\
-	        | grep -E '\.[ch](\.in)?$$'				\
-	        | grep -v '^gnulib/') &&				\
-	  { echo '$(ME): found TAB(s) use for indentation; use spaces'	\
-		1>&2; exit 1; } || :
-
-ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
-|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
-
-sc_avoid_ctype_macros:
-	@grep -E '\b($(ctype_re)) *\(' /dev/null			\
-	     $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo "$(ME): don't use ctype macros (use c-ctype.h)"	\
-		1>&2; exit 1; } || :
-
-# Match lines like the following, but where there is only one space
-# between the options and the description:
-#   -D, --all-repeated[=delimit-method]  print all duplicate lines\n
-longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*\]?)?
-sc_two_space_separator_in_usage:
-	@grep -nE '^   *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$'		\
-	    $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo "$(ME): help2man requires at least two spaces between"; \
-	    echo "$(ME): an option and its description"; \
-		1>&2; exit 1; } || :
-
-msg_gen_function =
-msg_gen_function += DISABLE_fprintf
-msg_gen_function += virXendError
-msg_gen_function += virXMLError
-msg_gen_function += virHashError
-msg_gen_function += virConfError
-msg_gen_function += virTestError
-msg_gen_function += virLibConnError
-msg_gen_function += virStorageReportError
-msg_gen_function += virxmlRpcError
-msg_gen_function += virLog
-msg_gen_function += qemudLog
-msg_gen_function += remoteDispatchError
-msg_gen_function += virStorageLog
-msg_gen_function += xenXMError
-msg_gen_function += ReportError
-msg_gen_function += qemudReportError
-msg_gen_function += openvzLog
-msg_gen_function += openvzError
-msg_gen_function += virDomainReportError
-msg_gen_function += virReportErrorHelper
-msg_gen_function += lxcError
-
-# Uncomment the following and run "make syntax-check" to see diagnostics
-# that are not yet marked for translation, but that need to be rewritten
-# so that they are translatable.
-# msg_gen_function += error
-# msg_gen_function += virXenError
-# msg_gen_function += testError
-
-func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|')
-func_re := ($(func_or))
-
-# Look for diagnostics that aren't marked for translation.
-# This won't find any for which error's format string is on a separate line.
-# The sed filters eliminate false-positives like these:
-#    _("...: "
-#    "%s", _("no storage vol w..."
-sc_unmarked_diagnostics:
-	@grep -nE							\
-            '\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))	\
-	  | grep -v '_''(' &&						\
-	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
-	    exit 1; } || :
-	@{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
-	   grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
-	   | sed 's/_("[^"][^"]*"//;s/[	 ]"%s"//'			\
-	   | grep '[	 ]"' &&						\
-	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
-	    exit 1; } || :
-
-sc_prohibit_virBufferAdd_with_string_literal:
-	@grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(VC_LIST_EXCEPT)) && \
-	  { echo '$(ME): use virBufferAddLit, not virBufferAdd,' \
-	      'with a string literal' 1>&2; exit 1; } || :
-
-# Avoid useless parentheses like those in this example:
-# #if defined (SYMBOL) || defined (SYM2)
-sc_useless_cpp_parens:
-	@grep -n '^# *if .*defined *(' $$($(VC_LIST_EXCEPT)) &&		\
-	  { echo '$(ME): found useless parentheses in cpp directive'	\
-		1>&2; exit 1; } || :
-
-# Require the latest GPL.
-sc_GPL_version:
-	@grep -n 'either ''version [^3]' $$($(VC_LIST_EXCEPT)) &&	\
-	  { echo '$(ME): GPL vN, N!=3' 1>&2; exit 1; } || :
-
-# Ensure that the c99-to-c89 patch applies cleanly.
-patch-check:
-	rm -rf src-c89 $@.1 $@.2
-	cp -a src src-c89
-	(cd src-c89; patch -p1 -V never --fuzz=0) < src/c99-to-c89.diff \
-	  > $@.1 2>&1
-	if test "$$REGEN_PATCH" = yes; then \
-	  diff -upr src src-c89 | sed 's,src-c89/,src/,' \
-	    | grep -v '^Only in' > new-diff || : ; fi
-	grep -v '^patching file ' $@.1 > $@.2 || :
-	msg=ok; test -s $@.2 && msg='fuzzy patch' || : ;	\
-	rm -f src-c89/*.o || msg='rm failed';			\
-	$(MAKE) -C src-c89 CFLAGS='-Wdeclaration-after-statement -Werror' \
-	  || msg='compile failure with extra options';		\
-	test "$$msg" = ok && rm -rf src-c89 $@.1 $@.2 || echo "$$msg" 1>&2; \
-	test "$$msg" = ok
-
-# Ensure that date's --help output stays in sync with the info
-# documentation for GNU strftime.  The only exception is %N,
-# which date accepts but GNU strftime does not.
-extract_char = sed 's/^[^%][^%]*%\(.\).*/\1/'
-strftime-check:
-	@if test -f $(srcdir)/src/date.c; then				\
-	  grep '^  %.  ' $(srcdir)/src/date.c | sort			\
-	    | $(extract_char) > $@-src;					\
-	  { echo N;							\
-	    info libc date calendar format | grep '^    `%.'\'		\
-	      | $(extract_char); } | sort > $@-info;			\
-	  diff -u $@-src $@-info || exit 1;				\
-	  rm -f $@-src $@-info;						\
-	fi
-
-check-AUTHORS:
-	$(MAKE) -C src $@
-
-# Ensure that we use only the standard $(VAR) notation,
-# not @...@ in Makefile.am, now that we can rely on automake
-# to emit a definition for each substituted variable.
-makefile-check:
-	grep -nE '@[A-Z_0-9]+@' `find . -name Makefile.am` \
-	  && { echo 'Makefile.maint: use $$(...), not @...@' 1>&2; exit 1; } || :
-
-news-date-check: NEWS
-	today=`date +%Y-%m-%d`;						\
-	if head NEWS | grep '^\*.* $(VERSION_REGEXP) ('$$today')'	\
-	    >/dev/null; then						\
-	  :;								\
-	else								\
-	  echo "version or today's date is not in NEWS" 1>&2;		\
-	  exit 1;							\
-	fi
-
-changelog-check:
-	if head ChangeLog | grep 'Version $(VERSION_REGEXP)\.$$'	\
-	    >/dev/null; then						\
-	  :;								\
-	else								\
-	  echo "$(VERSION) not in ChangeLog" 1>&2;			\
-	  exit 1;							\
-	fi
-
-m4-check:
-	@grep -n 'AC_DEFUN([^[]' m4/*.m4 \
-	  && { echo 'Makefile.maint: quote the first arg to AC_DEFUN' 1>&2; \
-	       exit 1; } || :
-
-fix_po_file_diag = \
-'you have changed the set of files with translatable diagnostics;\n\
-apply the above patch\n'
-
-# Verify that all source files using _() are listed in po/POTFILES.in.
-po_file = po/POTFILES.in
-po-check:
-	@if test -f po/POTFILES.in; then					\
-	  grep -E -v '^(#|$$)' po/POTFILES.in				\
-	    | grep -v '^src/false\.c$$' | sort > $@-1;			\
-	  files=;							\
-	  for file in $$($(VC_LIST_EXCEPT)); do				\
-	    case $$file in						\
-	    djgpp/* | man/*) continue;;					\
-	    */c99-to-c89.diff) continue;;				\
-	    esac;							\
-	    case $$file in						\
-	    *.[ch])							\
-	      base=`expr " $$file" : ' \(.*\)\..'`;			\
-	      { test -f $$base.l || test -f $$base.y; } && continue;;	\
-	    *) continue;;						\
-	    esac;							\
-	    files="$$files $$file";					\
-	  done;								\
-	  grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files		\
-	    | sort -u > $@-2;						\
-	  diff -u -L $(po_file) -L $(po_file) $@-1 $@-2			\
-	    || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; };	\
-	  rm -f $@-1 $@-2;						\
-	fi
-
-# In a definition of #define AUTHORS "... and ..." where the RHS contains
-# the English word `and', the string must be marked with `N_ (...)' so that
-# gettext recognizes it as a string requiring translation.
-author_mark_check:
-	@grep -n '^# *define AUTHORS "[^"]* and ' src/*.c |grep -v ' N_ (' && \
-	  { echo 'Makefile.maint: enclose the above strings in N_ (...)' 1>&2; \
-	    exit 1; } || :
-
-# Sometimes it is useful to change the PATH environment variable
-# in Makefiles.  When doing so, it's better not to use the Unix-centric
-# path separator of `:', but rather the automake-provided `@PATH_SEPARATOR@'.
-# It'd be better to use `find -print0 ...|xargs -0 ...', but less portable,
-# and there probably aren't many projects with so many Makefile.am files
-# that we'd have to worry about limits on command line length.
-msg = 'Makefile.maint: Do not use `:'\'' above; use @PATH_SEPARATOR@ instead'
-makefile_path_separator_check:
-	@grep -n 'PATH=.*:' `find $(srcdir) -name Makefile.am` \
-	  && { echo $(msg) 1>&2; exit 1; } || :
-
-# Check that `make alpha' will not fail at the end of the process.
-writable-files:
-	if test -d $(release_archive_dir); then :; else			\
-	  for file in $(distdir).tar.gz					\
-	              $(release_archive_dir)/$(distdir).tar.gz; do	\
-	    test -e $$file || continue;					\
-	    test -w $$file						\
-	      || { echo ERROR: $$file is not writable; fail=1; };	\
-	  done;								\
-	  test "$$fail" && exit 1 || :
-	fi
-
-v_etc_file = lib/version-etc.c
-sample-test = tests/sample-test
-texi = doc/$(PACKAGE).texi
-# Make sure that the copyright date in $(v_etc_file) is up to date.
-# Do the same for the $(sample-test) and the main doc/.texi file.
-copyright-check:
-	@if test -f $(v_etc_file); then \
-	  grep 'enum { COPYRIGHT_YEAR = '$$(date +%Y)' };' $(v_etc_file) \
-	    >/dev/null \
-	  || { echo 'out of date copyright in $(v_etc_file); update it' 1>&2; \
-	       exit 1; }; \
-	fi
-	@if test -f $(sample-test); then \
-	  grep '# Copyright (C) '$$(date +%Y)' Free' $(sample-test) \
-	    >/dev/null \
-	  || { echo 'out of date copyright in $(sample-test); update it' 1>&2; \
-	       exit 1; }; \
-	fi
-	@if test -f $(texi); then \
-	  grep 'Copyright @copyright{} .*'$$(date +%Y)' Free' $(texi) \
-	    >/dev/null \
-	  || { echo 'out of date copyright in $(texi); update it' 1>&2; \
-	       exit 1; }; \
-	fi
-
-vc-diff-check:
-	$(VC) diff > vc-diffs || :
-	if test -s vc-diffs; then				\
-	  cat vc-diffs;						\
-	  echo "Some files are locally modified:" 1>&2;		\
-	  exit 1;						\
-	else							\
-	  rm vc-diffs;						\
-	fi
-
-cvs-check: vc-diff-check
-
-maintainer-distcheck:
-	$(MAKE) distcheck
-	$(MAKE) my-distcheck
-
-# Use -Wformat -Werror to detect format-string/arg-list mismatches.
-# Also, check for shadowing problems with -Wshadow, and for pointer
-# arithmetic problems with -Wpointer-arith.
-# These CFLAGS are pretty strict.  If you build this target, you probably
-# have to have a recent version of gcc and glibc headers.
-# The for-loop below ensures that there is a bin/ directory full of all
-# of the programs under test (except the few that are required for basic
-# Makefile rules), all symlinked to the just-built "false" program.
-# This is to ensure that if ever a test neglects to make PATH include
-# the build srcdir, these always-failing programs will run.
-# Otherwise, it is too easy to test the wrong programs.
-# Note that "false" itself is a symlink to true, so it too will malfunction.
-TMPDIR ?= /tmp
-t=$(TMPDIR)/$(PACKAGE)/test
-my-distcheck: $(local-check) check
-	-rm -rf $(t)
-	mkdir -p $(t)
-	GZIP=$(GZIP_ENV) $(AMTAR) -C $(t) -zxf $(distdir).tar.gz
-	cd $(t)/$(distdir)				\
-	  && ./configure --disable-nls			\
-	  && $(MAKE) CFLAGS='$(warn_cflags)'		\
-	      AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)'	\
-	  && $(MAKE) dvi				\
-	  && $(MAKE) distclean
-	(cd $(t) && mv $(distdir) $(distdir).old	\
-	  && $(AMTAR) -zxf - ) < $(distdir).tar.gz
-	diff -ur $(t)/$(distdir).old $(t)/$(distdir)
-	if test -f $(srcdir)/src/c99-to-c89.diff; then			\
-	  cd $(t)/$(distdir)						\
-	    && (cd src && patch -V never --fuzz=0 <c99-to-c89.diff)	\
-	    && ./configure --disable-largefile				\
-	         CFLAGS='-Werror -ansi -Wno-long-long'			\
-	    && $(MAKE);							\
-	fi
-	-rm -rf $(t)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
-
-cvs-to-git = '\#!/usr/bin/perl\n\
-use warnings;\n\
-use strict;\n\
-use File::Find;\n\
-use File::Copy;\n\
-\n\
-find ({wanted =>\n\
-       sub {$$_ eq q/.cvsignore/ or return;\n\
-	    my $$gi = q/.gitignore/;\n\
-	    unlink $$gi;\n\
-	    copy($$_, $$gi) or die qq/copy failed: $$_->$$gi: $$!\\n/;\n\
-	    chmod 0444, $$gi;\n\
-	    }},\n\
-      q!.!);\n'
-
-.PHONY: sync-vcs-ignore-files
-c2g = cvs-to-git
-sync-vcs-ignore-files:
-	rm -f $(c2g)-t $(c2g)
-	printf $(cvs-to-git) > $(c2g)-t
-	chmod a+x-w $(c2g)-t
-	mv $(c2g)-t $(c2g)
-	perl $(c2g)
-	rm -f $(c2g)

Makefile.nonreentrant

@@ -0,0 +1,85 @@
+
+#
+# Generated by running the following on Fedora 9:
+#
+#  nm -D --defined-only /lib/libc.so.6  \
+#      | grep '_r$' \
+#      | awk '{print $3}' \
+#      | grep -v __ \
+#      | grep -v qsort \ # Red herring since we don't need to pass extra args to qsort comparator
+#      | grep -v readdir \ # This is safe as long as each DIR * instance is only used by one thread
+#      | sort \
+#      | uniq \
+#      | sed -e 's/_r//'
+#
+
+NON_REENTRANT =
+NON_REENTRANT += asctime
+NON_REENTRANT += ctime
+NON_REENTRANT += drand48
+NON_REENTRANT += ecvt
+NON_REENTRANT += erand48
+NON_REENTRANT += ether_aton
+NON_REENTRANT += ether_ntoa
+NON_REENTRANT += fcvt
+NON_REENTRANT += fgetgrent
+NON_REENTRANT += fgetpwent
+NON_REENTRANT += fgetspent
+NON_REENTRANT += getaliasbyname
+NON_REENTRANT += getaliasent
+NON_REENTRANT += getdate
+NON_REENTRANT += getgrent
+NON_REENTRANT += getgrgid
+NON_REENTRANT += getgrnam
+NON_REENTRANT += gethostbyaddr
+NON_REENTRANT += gethostbyname2
+NON_REENTRANT += gethostbyname
+NON_REENTRANT += gethostent
+NON_REENTRANT += getlogin
+NON_REENTRANT += getmntent
+NON_REENTRANT += getnetbyaddr
+NON_REENTRANT += getnetbyname
+NON_REENTRANT += getnetent
+NON_REENTRANT += getnetgrent
+NON_REENTRANT += getprotobyname
+NON_REENTRANT += getprotobynumber
+NON_REENTRANT += getprotoent
+NON_REENTRANT += getpwent
+NON_REENTRANT += getpwnam
+NON_REENTRANT += getpwuid
+NON_REENTRANT += getrpcbyname
+NON_REENTRANT += getrpcbynumber
+NON_REENTRANT += getrpcent
+NON_REENTRANT += getservbyname
+NON_REENTRANT += getservbyport
+NON_REENTRANT += getservent
+NON_REENTRANT += getspent
+NON_REENTRANT += getspnam
+NON_REENTRANT += getutent
+NON_REENTRANT += getutid
+NON_REENTRANT += getutline
+NON_REENTRANT += gmtime
+NON_REENTRANT += hcreate
+NON_REENTRANT += hdestroy
+NON_REENTRANT += hsearch
+NON_REENTRANT += initstate
+NON_REENTRANT += jrand48
+NON_REENTRANT += lcong48
+NON_REENTRANT += localtime
+NON_REENTRANT += lrand48
+NON_REENTRANT += mrand48
+NON_REENTRANT += nrand48
+NON_REENTRANT += ptsname
+NON_REENTRANT += qecvt
+NON_REENTRANT += qfcvt
+NON_REENTRANT += random
+NON_REENTRANT += rand
+NON_REENTRANT += seed48
+NON_REENTRANT += setstate
+NON_REENTRANT += sgetspent
+NON_REENTRANT += srand48
+NON_REENTRANT += srandom
+NON_REENTRANT += strerror
+NON_REENTRANT += strtok
+NON_REENTRANT += tmpnam
+NON_REENTRANT += ttyname

NEWS

@@ -5,6 +5,577 @@
        http://libvirt.org/news.html
 
 
+0.7.0: Aug  5 2009:
+   - New features: Interface implementation based on netcf (Laine Stump,
+      Daniel Veillard), Add new net filesystem glusterfs (Harshavardhana),
+      Initial VMWare ESX driver (Matthias Bolte), Add support for VBox
+      3 and event callbacks on vbox (Pritesh Kothari), First version
+      of the Power Hypervisor driver (Eduardo Otubo), Run QEMU guests
+      as an unprivileged user (Daniel P. Berrange), Support cgroups
+      in QEMU driver (Daniel P. Berrange), QEmu hotplug NIC support
+      (Mark McLoughlin), Storage cloning for LVM and Disk backends(Cole
+      Robinson), Switching to GIT (Jim Meyering)
+   - Documentation: Typo and comment fixes (Aron Griffis),
+      Fix virCapabilitiesDefaultGuestMachine documentation. (Chris
+      Lalancette), ESX Scheduler documentation and cleanup (Matthias
+      Bolte), Update the java bindings page (Bryan Kearney), Added
+      Matthias Bolte to AUTHORS list (Daniel Veillard), doc: clone+build
+      instructions (Jim Meyering), docs: say that the old repository
+      is deprecated... (Jim Meyering), document tcp listen and raw
+      wire option (Guido Günther), Fix docs and code disagreements
+      for character devices. (Cole Robinson), Fix documentation of
+      virStoragePoolUndefine return (Thomas Treutner), Fix gitweb link on
+      download page. (Cole Robinson), update download informations after
+      switch to git (Daniel Veillard), Update links to bugzilla (Garry
+      Dolley), Update the links for RHEL libvirt bugzillas (Garry Dolley)
+   - Portability: Xen Inotify support needs sys/inotify.h
+      (Maximilian Wilhelm), Workaround for broken GCC in Debian Etch
+      (Maximilian Wilhelm), LXC driver requires sched.h and unshare()
+      (Maximilian Wilhelm), Configure UML support only if sys/inotify.h
+      present (Maximilian Wilhelm), Fix libcurl automatic check and ESX
+      status (Maximilian Wilhelm), Enable ESX driver build on Mingw32
+      (Daniel P. Berrange), Fix build on mingw32 by disabling netcf
+      (Daniel P. Berrange), Reduce glusterfs dependency to 2.0.1
+      (Mark McLoughlin), Desactivate phyp build and indicate libssh
+      builreq (Daniel Veillard), Fix misc Win32 compile warnings
+      (Daniel P. Berrange), Rename variable for compilation in Mingw32
+      (end) (Laine Stump), Rename variable for compilation in Mingw32
+      (Laine Stump), rpm spec cleanup and split off client only package
+      (Daniel Veillard)
+   - Bug fixes: Add uniqueness checking for LXC define/create methods
+      (Daniel P. Berrange), Fix removal of transient VMs when LXC aborts
+      (Daniel P. Berrange), Don't try to activate cgroups if not present
+      for LXC (Daniel P. Berrange), Refresh /etc/xen if inotify wasn't
+      (Cole Robinson), Don't loose id on xen domain redefine (Cole
+      Robinson), Fix memory leak in openvz driver (Daniel P. Berrange),
+      Protected against potential crash scenarios (Daniel P. Berrange),
+      Fix crash when attempting to shutdown inactive QEMU vm (Daniel
+      P. Berrange), Fix PCIe FLR detection (Mark McLoughlin), Set perms
+      on /var/lib/libvirt/images to 0711 (Mark McLoughlin), Fix problem
+      writing QEMU pidfile (Daniel P. Berrange), Fix vcpupin on Xen
+      problem (Henrik Persson), Fix RPM upgrades from F11 to F12 (Daniel
+      P. Berrange), Fix deadlock in remote driver domain events (Daniel
+      P. Berrange), qemu: fix monitor socket reconnection (Ryota Ozaki),
+      Fix polkit/netcf disabling on older fedoras (Mark McLoughlin),
+      Fix crashes in Xen capabilities code (Daniel P. Berrange),
+      Always add -no-kvm and -no-kqemu, for qemu domains (Jim Paris),
+      Avoid raising an internal error (Paolo Bonzini), Don't allow NULL
+      paths for BlockStats and InterfaceStats (Cole Robinson), Don't
+      leak vm-monitorpath on re-connect (Mark McLoughlin), Don't restore
+      labels on shared/readonly disks (Daniel P. Berrange), Ensure spawned
+      children have a stderr/out set to /dev/null if requested (Daniel
+      P. Berrange), Ensure test:/// URIs get routed to the non-privileged
+      libvirtd (Daniel P. Berrange), fix another failing "make distcheck"
+      (qemuhelptest) (Jim Meyering), Fix an uninitialized variable
+      in Unix socket open (Jun Koi), Fix configure flags in spec file
+      (Daniel Veillard), Fix error reporting for security driver over
+      remote protocol (Daniel P. Berrange), fix failing "make distcheck"
+      (Jim Meyering), Fix free of unitialized data upon PCI open fail
+      (Daniel P. Berrange), Fix informations about previous git server
+      (Daniel Veillard), Fix memory leaks in esxDomainDumpXML (Matthias
+      Bolte), Fix multiple memory leaks in virsh (Laine Stump), Fix PCI
+      device hotplug/unplug with newer QEMU (Daniel P. Berrange), Fix
+      problem with QEMU monitor welcome prompt confusing libvirt after a
+      libvirtd daemon restart with active guests (Daniel P. Berrange),
+      Fix python examples to use read-write conn (Dan Kenigsberg), Fix
+      reconnect bug for VBox (Pritesh Kothari), Fix SELinux denial during
+      hotplug (Daniel P. Berrange), Fix typo in check for glusterfs format
+      pools (Daniel P. Berrange), Fix typo in storage cloning (Daniel
+      P. Berrange), qemu: Check driver is initialized up front, to avoid
+      segfault. (Cole Robinson), qemu: Try multiple times to open unix
+      monitor socket (Cole Robinson), Release conn lock before reporting
+      errors (end) (Laine Stump), Release conn lock before reporting
+      interface errors (Laine Stump), Remove the network backend if NIC
+      hotplug fails (Mark McLoughlin), Set specific flags for glusterfs
+      fs mounts (Harshavardhana), storage: disk: Default to 'ext2' for
+      new volumes. (Cole Robinson), storage: disk: Fix parthelper '-g'
+      option handling. (Cole Robinson), storage: disk: Fix segfault
+      creating volume without target path (Cole Robinson), storage:
+      Fix deadlock when cloning across pools. (Cole Robinson), Update
+      modified mac address in place in virGetInterface (Laine Stump)
+   - Improvements: Add an allocation unit when calling qemu-img
+      (Ryota Ozaki), Improve diagnostics when pidfile writing fails
+      (Daniel P. Berrange), Disable IPv6 on virtual networks (Daniel
+      P. Berrange), Allow dnsmasq to provide DNS without DHCP (Daniel
+      P. Berrange), Fix an initialization problem in previous patch
+      (Aron Griffis), Remove MAX_TAP_ID and let kernel do numbering
+      (Aron Griffis), Kernel command line support for UML (Ron Yorston),
+      Activate the interface drivers, and cleanups (Daniel Veillard),
+      Add an error code for conflicting mac addresses (Laine Stump),
+      Add a test interface driver (Laine Stump), Add canonical machine
+      name to capabilities output (Mark McLoughlin), add cd and pwd
+      commands to virsh (Paolo Bonzini), Add checks for some NIC hotplug
+      related features added in qemu-0.10.0 (Mark McLoughlin), Add
+      domain autostart for LXC driver (Daniel P. Berrange), Add domain
+      events support to LXC driver (Daniel P. Berrange), Add interface
+      object list manipulation functions (Laine Stump), Add internal XML
+      parsing/formatting flag (Mark McLoughlin), Add netcf XML schemas
+      and test data (Daniel Veillard), Add new net filesystem glusterfs
+      (Harshavardhana), Add NIC and hostnet names to domain state XML
+      (Mark McLoughlin), Add no_verify query parameter to ESX URIs
+      (Matthias Bolte), Add SCM_RIGHTS support to QEMU monitor code
+      (Mark McLoughlin), Add support for attaching network/bridge NICs
+      in QEMU driver (Mark McLoughlin), add support for netcf XML import
+      and export (Daniel Veillard), Add support for network device detach
+      (Mark McLoughlin), Add support for physical memory access for QEmu
+      (Nguyen Anh Quynh), Add support for VBox 3 and event callbacks on
+      vbox (Pritesh Kothari), Add the monitor type to the domain state
+      XML (Mark McLoughlin), Add virCapsGuestMachine structure (Mark
+      McLoughlin), Add virsh commands for network interface management
+      (Laine Stump), Allow autostart of libvirtd to be disabled with
+      LIBVIRT_AUTOSTART=0 (Daniel P. Berrange), Allow leading dots in VMX
+      config entry names (Matthias Bolte), Assign names to qemu NICs and
+      network backends (Mark McLoughlin), Basic qemu NIC hotplug support
+      (Mark McLoughlin), build: adjust aclocal's search patch to prefer
+      gnulib's m4 files. (Jim Meyering), build: automatically rerun
+      ./bootstrap when needed (Jim Meyering), build: make autogen.sh use
+      autoreconf -if (Jim Meyering), build: submodule machinery now works
+      also when no tag is reachable (Jim Meyering), Canonicalize qemu
+      machine types (Mark McLoughlin), Change code generator to give async
+      event messages their own postfix (Daniel P. Berrange), Change the
+      way client event loop watches are managed (Daniel P. Berrange),
+      Decode incoming request header before invoking dispatch code
+      (Daniel P. Berrange), Define an API for registering incoming message
+      dispatch filters (Daniel P. Berrange), ESX driver accept VI API
+      version 4.0 (Matthias Bolte), Fill in vCPU - pCPU current mapping,
+      and vCPU cpuTime for QEMU (Daniel P. Berrange), generate ChangeLog
+      from git logs into distribution tarball (Jim Meyering), Implement
+      qemu dump capabilities (Paolo Bonzini), Implement schedular
+      tunables API using cgroups (Daniel P. Berrange), Implement the
+      new virinterface functions (Laine Stump), Make cgroups a little
+      more efficient (Daniel P. Berrange), Make it easier to debug tests
+      running programs (Daniel P. Berrange), Make qemuBuildHostNetStr()
+      take tapfd as a string (Mark McLoughlin), Make QEMU cgroups use
+      configurable (Daniel P. Berrange), Make qemuCmdFlags available in
+      qemudDomainAttachDevice() (Mark McLoughlin), Move queuing of RPC
+      replies into dispatch code (Daniel P. Berrange), Move vnet_hdr logic
+      into qemudNetworkIfaceConnect() and export it (Mark McLoughlin),
+      Netcf based interface driver implementation (Laine Stump), netcf
+      XML validation and input and output tests (Daniel Veillard), Only
+      probe qemu for machine types when binary changes (Mark McLoughlin),
+      Place every QEMU guest in a private cgroup (Daniel P. Berrange),
+      Probe for QEMU machine types (Mark McLoughlin), Probe QEMU directly
+      for machine aliases if not found in capabilties (Mark McLoughlin),
+      Public API for new virInterface functions (Laine Stump), python:
+      Raise exceptions if virDomain*Stats fail. (Cole Robinson), Refactor
+      cgroups to allow a group per driver to be managed directly (Daniel
+      P. Berrange), Re-factor pci_add reply parsing and parse domain/bus
+      numbers (Mark McLoughlin), Retain disk PCI address across libvirtd
+      restarts (Mark McLoughlin), Retain PCI address from NIC attach
+      (Mark McLoughlin), Run QEMU guests as an unprivileged user (Daniel
+      P. Berrange), Separate code for encoding outgoing remote message
+      headers (Daniel P. Berrange), Split generic RPC message dispatch
+      code out from remote protocol API handlers (Daniel P. Berrange),
+      Split out code for handling incoming method call messages
+      (Daniel P. Berrange), storage: Break out actual raw cloning to
+      separate function. (Cole Robinson), storage: cleanup: do away with
+      'createFile' (Cole Robinson), storage: disk: Use capacity, not
+      allocation, when creating volume. (Cole Robinson), storage: Don't
+      try sparse detection if writing to block device. (Cole Robinson),
+      storage: Implement 'CreateBlockFrom' helper. (Cole Robinson),
+      storage: Implement CreateVolFrom for logical and disk backend. (Cole
+      Robinson), storage: Move most of the FS creation functions to
+      common backend. (Cole Robinson), storage: Refactor FS backend
+      'create' function choosing. (Cole Robinson), Store the interface
+      vlan number in the domain state (Mark McLoughlin), Support video
+      element for QEMU guests (Daniel P. Berrange), Support video tag
+      for defining VGA card properties (Daniel P. Berrange), Switch to
+      using a unix socket for the qemu monitor (Mark McLoughlin), test:
+      Generate net interface names when assigning XML. (Cole Robinson),
+      test: Implement BlockStats and InterfaceStats (Cole Robinson),
+      Use cgroups for block device whitelisting in QEMU guests (Daniel
+      P. Berrange), Use enums for cgroup controller types / labels
+      (Daniel P. Berrange), Use sendmsg() on QEMU monitor socket (Mark
+      McLoughlin), Use virDomainChrTypeFromString() instead of open
+      coding (Mark McLoughlin), Use virFileReadAll/virFileWriteStr for
+      key cgroup read/write helpers (Daniel P. Berrange), virGetinterface
+      matching of MAC and interface name (Laine Stump)
+   - Cleanups: Fix configure checks from previous commits (Daniel
+      P. Berrange), Avoid a warning if compiling without inotify
+      (Daniel P. Berrange), Remove a stray semicolon (Daniel Veillard),
+      Extend the ESX URL to habdle ports and GSX (Matthias Bolte), Fix
+      escaping of 8-bit high characters (Daniel P. Berrange), , Remove
+      ATTRIBUTE_UNUSED from flags to qemudDomainMigratePerform. (Chris
+      Lalancette), Add a comment about setting errors after
+      qemudStartVMDaemon(). (Chris Lalancette), Fix an erroneous
+      debug error to KVM; it should read QEMU/KVM. (Chris Lalancette),
+      Remove a stray semicolon in qemudDomainMigratePrepare2. (Chris
+      Lalancette), Convert a few stray users of free() in libvirt.c
+      to VIR_FREE(). (Chris Lalancette), Use virGetHostname instead
+      of gethostname. (Chris Lalancette), Fix up a minor indentation
+      issue with virDomainMigratePrepare. (Chris Lalancette), Fix up a
+      silly typo in apibuild.py. (Chris Lalancette), Avoid warning when
+      compiling without IFF_VNET_HDR (Maximilian Wilhelm), Capilize
+      libvirt-client summary (Mark McLoughlin), Move ldconfig calls
+      to libvirt-client %post/%postun (Mark McLoughlin), Convert NEWS
+      to UTF-8 (Mark McLoughlin), Fix trailing whitespace in NEWS
+      (Mark McLoughlin), No need to build require both python-devel
+      and python (Mark McLoughlin), Remove executable perms from
+      /etc/sysconfig/libvirtd (Mark McLoughlin), Use a %postun -p for
+      one line scriptlet (Mark McLoughlin), Don't explicitly require
+      libxml2 (Mark McLoughlin), Fix some unowned directories (Mark
+      McLoughlin), Kill qemu BuildRequires (Mark McLoughlin), Enable
+      netcf by default (Mark McLoughlin), Default to with_polkit
+      (Mark McLoughlin), Make vbox support configurable (Mark
+      McLoughlin), Build with --without-capng if capng is disabled
+      (Mark McLoughlin), BuildRequires libcap-ng-devel not capng-devel
+      (Mark McLoughlin), Drop curl host check when using ESX without
+      check (Shahar Klein), Fix typo in xen capabilities code (Daniel
+      P. Berrange), Add bare format string to printf-derivatives troubles
+      (Laine Stump), Add phyp files to POTFILES, to make syntax-check
+      happy. (Cole Robinson), avoid a make distcheck failure: distribute
+      docs/schemas/interface.rng (Jim Meyering), avoid a make distcheck
+      failure: distribute tests/interfaceschemadata/ (Jim Meyering), avoid
+      a "make syntax-check" failure (Jim Meyering), build: do not emit
+      a trailing blank line into VC'd file, NEWS (Jim Meyering), build:
+      update from gnulib, for latest maint.mk (Jim Meyering), Clean up
+      error handling in qemudDomainAttachNetDevice() (Mark McLoughlin),
+      Cleanup qemu binary detection logic in qemudCapsInitGuest() (Mark
+      McLoughlin), Commit newly generated docs, after changes from
+      commit 2348cf. (Cole Robinson), Factor qemuBuildHostNetStr()
+      out from qemuBuildCommandLine() (Mark McLoughlin), Factor
+      qemuBuildNicStr() out from qemuBuildCommandLine() (Mark McLoughlin),
+      Factor qemudMonitorSend() out of qemudMonitorCommandExtra() (Mark
+      McLoughlin), Fix cgroup compile warnings (Daniel P. Berrange),
+      Fix misc build problems due to new drivers (Daniel P. Berrange),
+      Fix wierd build problems due to autopoint overwriting gnulib m4
+      (Daniel P. Berrange), Makefile.cfg: Rename to... (Jim Meyering),
+      make .gnulib a submodule (Jim Meyering), make "make syntax-check"
+      consistent with "git diff --check" (Jim Meyering), Minor qemu
+      monitor coding style fixes (Mark McLoughlin), Prepare to use
+      maint.mk from gnulib (Jim Meyering), Refactor incoming message
+      handling to prepare for data stream support (Daniel P. Berrange),
+      Refactor message sending to allow code reuse for data streams
+      (Daniel P. Berrange), remove all .cvsignore files (Jim Meyering),
+      remove all trailing blank lines (Jim Meyering), Remove some unused
+      variables and cut long lines (Daniel Veillard), Remove trailing
+      blank lines (Daniel Veillard), Rename a bunch of internal methods
+      to clarify their meaning (Daniel P. Berrange), Rename 'direction'
+      to 'type' in remote_message_header (Daniel P. Berrange), Report
+      the object name on lookup error (Daniel Veillard), Simplify remote
+      driver error reporting (Daniel P. Berrange), skip some of gnulib's
+      new rules (Jim Meyering), use automake-1.11's silent-rules
+      option, when possible (Jim Meyering), use gnumakefile and
+      maintainer-makefile modules from gnulib (Jim Meyering)
+
+
+0.6.5: Jul  3 2009:
+   - New features: create storage columes on disk backend (Henrik Persson),
+          drop of capabilities based on libcap-ng when possible (Daniel
+          Berrange)
+   - Portability: fix build on non-Linux targets (Daniel Berrange)
+   - Documentation: typo and english fixes (Runa Bhattacharjee and
+          Garry Dolley), Docs on extending APIs (Dave Allan), cleanup
+          of debug and logging documentation (Amy Griffis), add
+          HACKING doc to the website (Daniel Berrange),
+          documentation for OpenNebula driver (Abel Miguez Rodriguez)
+   - Bug fixes: forbid autostart on transcient networks,
+          xen device removal crash (Daniel Berrange), re-detection of
+          transient VMs after libvirtd restart(Daniel Berrange),
+          bug in virFindFileInPath (Daniel Berrange), handle new
+          availheap sysctl in Xen (Daniel Berrange), allow USB hostdev
+          product 0 (Cole Robinson), cleanup when creating a storage pool
+          fails (Henrik Persson), domain id fix on redefinition in
+          test driver (Cole Robinson), fix raw storage allocation (Cole
+          Robinson), memory reporting for inactive qemu drivers (Cole
+          Robinson), segfault if storage pool has no type attribute (Cole
+          Robinson), OpenNebula compilation issues (Javier Fontan),
+          dominfo command without security driver (Daniel Berrange),
+          domain state problems after migration or destroy (Federico
+          Simoncelli), leak in node device parsing (Dave Allan),
+          storage pool definitions reading at startup (Cole Robinson),
+          bogus WWN in NPIV support (David Allan), avoid a segfault with
+          recent Xen (Sascha), cope with libnuma failures on weird
+          topologies (Dan Berrange), crash in QEMU driver with bad capabilities
+          data (Dan Berrange), trying to re-create a pool should not destroy
+          it (Dave Allan), endless loop in node device XML dump (Cole Robinson),
+          Re-label shared and readonly images (Dan Berrange)
+   - Improvements: create and destroy NPIV support (David Allan),
+          networking in UML driver (Daniel Berrange), HAL driver restart
+          thread safety (Daniel Berrange), capabilities and nodeinfo
+          APIs for LXC (Daniel Berrange), iNUMA API for VBox (Daniel Berrange),
+          dynamically search and use kvm-img qemu-img or qcow-create (Doug
+          Goldstein), fix qemu and kvm version parsing (Mark McLoughlin),
+          serial number for HAL storage (Dave Allan), improve error reporting
+          for virConnectOpen URIs (Daniel Berrange), include OS driver name
+          in device XML (Daniel Berrange), fix qemu command flags fetching
+          (Cole Robinson), check that qemu support -drive format= (Cole
+          Robinson), improve emulator detection (Cole Robinson), changes
+          to config parser to accomodate VMX syntax (Matthias Bolte),
+          update network schemas and driver for missing elements (Satoru SATOH),
+          avoid changing file context if not needed (Tim Waugh),
+          skip labelling if no src path (Cole Robinson), add arm emulation
+          if qemu-system-arm is present (C.J. Adams-Collier)
+   - Cleanups: daemon check logging env variables (Daniel Berrange),
+          User Mode Linux start and stop cleanups (Daniel Berrange),
+          share the NUMA api implementations (Daniel Berrange), storage
+          module dependancies (Dave Allan), refactor storage XML parsing
+          (Cole Robinson), big cleanup of logging code (Amy Griffis),
+          superfluous % on format (Matthias Bolte), cleanups and updates
+          on OpenNebula driver (Daniel Berrange and Abel Miguez Rodriguez)
+
+
+0.6.4: May 29 2009:
+   - New features: new API virStorageVolCreateXMLFrom (Cole Robinson),
+          full VBox graphic capabilities (Pritesh Kothari), Interface config
+          APIs (Laine Stump), APIs for domain XML conversions (Daniel
+          Berrange), initial version of OpenNebula driver (Abel Miguez
+          Rodriguez)
+   - Portability: better compiler warning selection (Daniel Berrange),
+          Win32 portability fixes (Daniel Berrange)
+   - Documentation: documentation for <sound> device XML format (Cole
+          Robinson), storage format documentation fixes (Ryota Ozaki),
+          docs for XML conversion APIs (Daniel Berrange), inconsistencies
+          in storage volume docs and schemas (Ryota Ozaki)
+   - Bug fixes: fix hostdev managed handling (Mark McLoughlin),
+          lxc_controller should not cash without args (Guido Gunther),
+          bug fixes in I/O routines (Guido Gunther), fix migrationsave/restore
+          for QEmu 0.10.0 (Daniel Berrange), avoid crash on VBox init
+          (Guido Gunther), fix dev and cgroup init in LXC (Ryota Ozaki),
+          QEmu startup fix (Cole Robinson), block node reboots from LXCs (Ryota
+          Ozaki), QEmu argv detection fix for recent kvm (Daniel Berrange),
+          fix watch/timer event deletion (Daniel Berrange), fix XML escaping
+          bug, various locking bugs (Daniel Berrange), avoid a deadlock in
+          HAL nodedev driver (Cole Robinson), detection of node device media
+          insert/eject (Cole Robinson), broken networking with new QEMU/KVM
+          >= 86 (Daniel Berrange), various fixes in domain and network
+          startup error report (Cole Robinson), double free on unexpected
+          client disconnect (Daniel Berrange)
+   - Improvements: cleanups and doc on virExec (Cole Robinson), error
+          reporting in QEmu migrations (Cole Robinson), better path and driver
+          detection in VBox (Pritesh Kothari), avoid caching QEMU driver
+          capabilities(Cole Robinson), multiple graphics elements definitions
+          (Pritesh Kothari), LSB init header init.d improvements (Frederik
+          Himpe), special erro code for invalid operations (Daniel Berrange),
+          dlopen error logging (Daniel Berrange), fix UUID and name uniqueness
+          (Daniel Berrange), improvement on VBox initialization (Pritesh
+          Kothari and Dan Berrange), "Host only" and "Internal" network in VBox
+          (Pritesh Kothari), add utility virExecDaemonize (Cole Robinson),
+          enable bridges without IP (Ludwig Nussel), 'make -s' silencing
+          (Daniel Berrange), test case for exercising the event loop (Daniel
+          Berrange), virsh commands vol-clone and vol-create-from (Cole
+          Robinson), new xend don't use [] around cpumaps (Tatsuro Enokura),
+          add the CIL mutex lock checker (Daniel Berrange), fix some LXC
+          error code (Amy Griffis), virInterface python bindings (Daniel
+          Berrange), fix to the example code for event handling (Pritesh
+          Kothari), always add location informations to logging (Daniel
+          Berrange), python domain events example and binding (Daniel
+          Berrange), PPC Qemu Machine Type update (Thomas Baker)
+   - Cleanups: strings bug in virsh (Daniel Berrange), various cleanups
+          in storage code (Cole Robinson), rpm spec cleanups, destructors
+          data cleanups (Laine Stump), some QEmu code refactoring (Daniel
+          Berrange), avoid dependancy on libcap (Daniel Berrange), python
+          import cleanup (Cole Robinson), virAsprintf based cleanups in
+          storage code (Cole Robinson), fix some direct stderr logging,
+          OpenNebula driver cleanups (Daniel Berrange)
+
+
+0.6.3: Apr 24 2009:
+   - New features: VirtualBox driver support (Pritesh Kothari),
+          virt-xml-validate new command (Daniel Berrange)
+   - Portability: patch to build on Centos (Joseph Shraibman),
+          build breakage (Anton Protopopov), 
+   - Documentation: Linux Containers documentation (Serge Hallyn),
+          improvement and updates of architecture pages, fix
+          virNodeGetFreeMemory documentation to reflect reality,
+          man page cleanups (Daniel Berrange), man page typo
+          (Robert P. J. Day), VirtualBox Documentation (Pritesh Kothari),
+          
+   - Bug fixes: veth off-by-one error (Dan Smith), vcpupin to inactive
+          Xen crash (Takahashi Tomohiro), virsh ttyconsole return value,
+          use format= not fmt= on QEmu commandline (Mark McLoughlin),
+          use UUID for internal domain lookups (Daniel Berrange), remote
+          domain ID related bugs (Daniel Berrange), QEmu pidfile handling
+          bugs (Daniel Berrange), network config handling on old Xen (Daniel
+          Berrange)
+   - Improvements: add SCSI storage rescan (David Allan), rootless
+          LXC containers support improvements (Serge Hallyn), getHostname
+          support for LXC (Dan Smith), cleanup and logging output of some
+          domain functions (Guido Günther), drop pool lock when allocating
+          volumes (Cole Robinson), LXC handle kernel without CLONE_NEWUSER
+          support (Serge Hallyn), cpu pinning on defined Xen domains (Takahashi
+          Tomohiro), dynamic bridge names support (Soren Hansen), LXC use
+          of private /dev/pts when available (Daniel Berrange),
+          virNodeDeviceCreateXML and virNodeDeviceDestroy entry points
+          (Dave Allan)
+   - Cleanups: don't hardcode getgrnam_r buffer to 1024 bytes (Guido
+          Günther), qemudBuildCommandLine API cleanup (Daniel Berrange),
+          
+
+
+0.6.2: Apr  3 2009:
+   - New features: support SASL auth for VNC server (Daniel Berrange),
+          memory ballooning in QEMU (Daniel Berrange), SCSI HBA storage pool
+          support (Dave Allan), PCI passthrough in Xen driver (Daniel
+          Berrange)
+   - Portability: be more flexible in QEmu binaries paths (Daniel
+          Berrange), Mingw portability fixes (Daniel Berrange),
+   - Documentation: add security attributes in RNG schemas, cleanup
+          of architecture docs, missing disk bus values in RNG schemas,
+   - Bug fixes: tap vs vbd type on block detach (Cole Robinson and
+          Takahashi Tomohiro), bad free on storage volume error (Daniel
+          Berrange), maplenght computations in remote driver (Daniel Berrange),
+          event dispatching in the daemon (Daniel Berrange), virDomainSetVcpus
+          deadlock (Daniel Berrange), save deadlock in test driver (Cole
+          Robinson), fix timing of security driver init (Cole Robinson),
+          forbid readonly connections from dumping the XML safe info (Cole
+          Robinson), file descriptor leak on remote access,
+          fix labelling of shared/readonly devices (Dan Walsh),
+          virsh missing auth on shell commands (Matthias Bolte),
+          avoid zombie on exec pipe errors (Ryota Ozaki),
+          memory leak in virNodeDeviceGetParent (Daniel Berrange),
+          URI check in migration (Daniel Berrange), various memory bug fixes
+          (Daniel Berrange), python bindings generator fix (Daniel Berrange),
+          NUMA memory fixes (Daniel Berrange), various svirt fixes (Daniel
+          Berrange), fix sparse volume allocation reporting (Cole Robinson),
+          test driver domain restore return value (Cole Robinson),
+          do not lose file format info on volume refresh (Cole Robinson)
+   - Improvements: get CPU usage info for LXC (Ryota Ozaki), fix domain
+          RNG to add ac97 and tests (Pritesh Kothari), OpenVZ support for
+          non-template filesystem root (Florian Vichot), improve arch
+          capabilities generation (Daniel Berrange), modularization of spec
+          file (Ryota Ozaki), better error reports in SEXPR generation (Daniel
+          Berrange), support for vifname parameter in VIF config (Daniel
+          Berrange), localtime handling for new xen (Daniel Berrange),
+          error reporting/ verification of security labels (Dan Walsh),
+          add --console arg for create and start virsh commands (Daniel
+          Berrange), refresh volume alloc/capacity when dumping XML (Cole
+          Robinson)
+   - Cleanups: FILE * leaks removal, unused parameters flagging
+          (Maximilian Wilhelm), switch to pre-C99 struct initialization
+           for drivers (Chris Lalancette), symlinks resolving cleanup (Daniel
+           Berrange)
+
+
+0.6.1: Mar  3 2009:
+   - New features: new APIs for Node device detach reattach and reset
+          (Mark McLoughlin), sVirt mandatory access control support (James
+          Morris and Dan Walsh)
+   - Portability: non gcc toolchain (John Levon), gcc-4.4 warnings fixes
+          (Mark McLoughlin), fix build without LXC and QEmu (Jim Meyering)
+   - Documentation: man page bugzilla URL (Mark McLoughlin), typo
+          in domain format (Jesse Farinacci), clock offset fix (Mark
+          McLoughlin), hostdev description typo (Mark McLoughlin), static
+          host IP (Charles Duffy), new example program (David Allan)
+   - Bug fixes: NULL dereference in LXC (Jim Meyering), fix domain
+          error reporting (John Levon), fix loop of libvirtd --timeout
+          (Daniel Berrange), limit history to 500 to restrict virsh memory
+          (Daniel Berrange), wrong lvm volume format check (Cole Robinson),
+          I/O error in daemon and associated remote acces crash (Daniel
+          Berrange), fix autostart of session daemon (Daniel Berrange),
+          restart guest on qemu migration failures (Chris Lalancette),
+          config parsing leaks (Ryota Ozaki), DBus multithreading activation
+          to avoid crashes (Daniel Berrange), mark defined network descriptions
+          as persistent (Cole Robinson), qemu+tls handshake negotiation hang
+          (Chris Lalancette)
+   - Improvements: don't hardcode ssh port (Guido Günther), new test
+          cases and testing infrastructure (Jim Meyering), improve the
+          SExpr parser (John Levon), proper error reporting on xend
+          shutdown command (John Levon), proper handling of errors when
+          saving QEmu domains state (Guido Günther), revamp of the internal
+          error memory APIs (John Levon), better virsh error reporting (John
+          Levon), more daemon options to allow running multiple daemons (Jim
+          Meyering), error handling when creating a QEmu domain (Guido Günther),
+          fix timeouts in QEmu log reading (Guido Günther), migration with
+          xend 3.3 fixes (John Levon), virsh XML dump flags cleanup (Cole
+          Robinson), fix build with loadable drivers (Maximilian Wilhelm),
+          internal XML APIs to read long long and hexa values (Mark
+          McLoughlin), function to parse node device XML descriptions and
+          associated test (Mark McLoughlin), generate network bridge names if
+          not provided (Cole Robinson), recognize ejectable media in hostdev
+          hal driver (Cole Robinson), integration of sVirt (Daniel Berrange)
+   - Cleanups: printf NULL string checks (John Levon), remove uses of
+          strerror and use virStrerror (Jim Meyering), remove redundant NULL
+          assignments (Jim Meyering), QEmu driver logging and exec cleanups
+          (Jim Meyering), many error handling cleanups (Jim Meyering), XML
+          module cleanups (Mark McLoughlin), compiler warning (Maximilian
+          Wilhelm), daemon TCP listen cleanup (Cole Robinson), size_t type
+          cleanup (Guido Günther), parallel make fix (Michael Marineau),
+          storage error diagnostic fix (Ryota Ozaki), remove redundant monitor
+          watch variable (Cole Robinson), qemu AttachDevice error report
+          improvement (Cole Robinson), virsh output cleanup (Jim Meyering),
+          various tests cleanups and improvements (Jim Meyering), fix the
+          internal export list with new APIs (Daniel Berrange), cleanups on
+          new APIs for Node device (Daniel Berrange)
+
+
+0.6.0: Jan 31 2009:
+   - New features: thread safety of the API and event handling (Daniel
+          Berrange), allow QEmu domains to survive daemon restart (Guido
+          Günther), extended logging capabilities, support copy-on-write
+          storage volumes (Daniel Berrange), support of storage cache
+          control options for QEmu/KVM (Daniel Berrange)
+   - Portability: fix old DBus API problem, Debian portability fix
+          (Daniel Berrange), fix distcheck (Jim Meyering), build in
+          debug mode (Jim Meyering), libnuma API portability (Jim Meyering),
+          many portability fixes pointed by Solaris (John Levon), non-gcc
+          portability fixes (John Levon), various include fixes (Jim Meyering),
+          various Windows and Mingw portability fixes (Daniel Berrange),
+          solaris Xen fixes (John Levon), RPC portability to Solaris (Daniel
+          Berrange)
+   - Documentation: typo fixes (Richard Jones), logging support,
+          vnc keymap attributes (Guido Günther), HACKING file updates
+         (Jim Meyering), new PCI passthrough format, libvirt-qpid and
+         UML driver documentation (Daniel Berrange), provide RNG schemas
+         for all XML formats used in libvirt APIs (Daniel Berrange), 
+   - Bug fixes: segfault on virtual network without bridge name (Cole
+          Robinson), various locking fixes (Cole Robinson), fix serial
+          and parallel devices on tcp/unix/telnet (Guido Günther), leak
+          in daemon (Jim Meyering), storage driver segfault (Miloslav TrmaC),
+          missing check in read-only connections (Daniel Berrange),
+          OpenVZ crash and mutex fixes (Anton Protopopov), couple of
+          daemon bug fixes (John Levon), OpenVZ MAC addresses generation
+          (Evgeniy Sokolov), poll call initialization fix (Daniel Berrange),
+          various Xen driver fixes (John Levon), segfault on device
+          back compat (Cole Robinson), couple Xen bug fixes coming from
+          RHEL (Markus Armbruster), buffer overflow in libvirt proxy
+          (rasputin@email.ru), vnc port report (John Levon), repair save
+          and restore on recent KVM versions (Daniel Berrange), Xen
+          cpu pinning XML fix (John Levon), various xen driver fixes
+          (Daniel Berrange), some memory leak fixes (Daniel Berrange)
+   - Improvements: driver infrastructure and locking (Daniel Berrange),
+          Test driver infrastructure (Daniel Berrange), parallelism in the
+          daemon and associated config (Daniel Berrange), virsh help cleanups
+          (Jim Meyering), logrotate daemon logs (Guido Günther), more
+          regression tests (Jim Meyering), QEmu SDL graphics (Itamar Heim),
+          add --version flag to daemon (Dave Allan), memory consumption
+          cleanup (Dave Allan), QEmu pid file and XML states for daemon
+          restart (Guido Günther), gnulib updates (Jim Meyering and
+          Dan Berrange), PCI passthrough for KVM (Jason Krieg), generic
+          internal thread API (Daniel Berrange), RHEL-5 specific Xen
+          configure option and code (Markus Armbruster), save domain
+          state as string in status file (Guido Günther), add locking
+          to all API entry points (Daniel Berrange), new ref counting APIs
+          (Daniel Berrange), IP address for Xen bridges (John Levon),
+          driver format for disk file types (Daniel Berrange), improve
+          QEmu/KVM tun/tap performances (Mark McLoughlin), enable floppies
+          for Xen fully virt (John Levon), support VNC password settings
+          for QEmu/KVM (Daniel Berrange), qemu driver version reporting
+          (Daniel Berrange) 
+   - Cleanups: converting linked lists to arrays (Daniel Berrange),
+          daemon RPC handling refactoring (Daniel Berrange), strings cleanups
+          (Jim Meyering), gethostby* cleanup and test (Jim Meyering), some
+           code fixes (Dave Allan), various code cleanup (Jim Meyering),
+           virsh argument handling cleanup (Jim Meyering), virAsprintf
+           cleanup replacement (Guido Günther), QEmu monitor reads (Cole
+           Robinson), Makefile cleanups (Guido Günther), Xen code cleanups
+           (John Levon), revamp of ELF export scripts (John Levon), domain
+           event callback args (John Levon), enforce use of pid_t (John Levon),
+           virsh pool-*-as XML code merge (Cole Robinson), xgettext warnings
+           (Jim Meyering), add virKillProcess (Guido Günther), add
+           virGetHostname (David Lutterkort), add flags argument to the full
+           XML parsing stack (Guido Günther), various daemon code cleanups
+           (Guido Günther), handling of daemon missing config file (Jim
+           Meyering), rpcgen invocation cleanup (Richard Jones), devhelp
+           builkd makefile cleanups (John Levon), update error handling for
+           threading (Daniel Berrange), remove all non-rentrant POSIX calls
+           usage (Daniel Berrange), many small cleanups (Jim Meyering and
+           Daniel Berrange), examples Makefile generator (John Levon),
+           mis-use of PF_UNIX as a protocol (John Levon), cleanup OOM
+           error paths (Jim Meyering), temporary fix fro valgrind on lxc
+           (Daniel Berrange), QEmu driver init cleanups (Daniel Berrange)
+
+
 0.5.1: Dec  4 2008:
    - Portability: fix missing dep in spec file, fix compilation with new
           NUMA libraries (Daniel Berrange), udev compatibility for RHEL (Chris
@@ -14,7 +585,7 @@
    - Bug fixes: add a delay in storage backend for disks to show up
           (Chris Lalancette), fix parsing for CDRom device with no source
           (Daniel Berrange), use xenstore to list domains to avoid some
-          bugs (Guido G<EFBFBD>nther), remove a leak in xen inotify code (Daniel
+          bugs (Guido Günther), remove a leak in xen inotify code (Daniel
           Berrange), UML driver freeing of uninitialialized variable (Ron
           Yorston), fix UML inotify code (Daniel Berrange), crash when
           adding storage without a format (Cole Robinson)
@@ -22,8 +593,8 @@
           max memory (Jim Fehlig), allow remote://hostname/ URI for automatic
           probe of hypervisors (Daniel Berrange), fix daemon configuration
           regression testing (Jim Meyering ), check /usr/bin/kvm for QEmu
-          driver init (Guido G<EFBFBD>nther), proper active vs. inactive
-          differentiation (Guido G<EFBFBD>nther), improve MTU setting on tap
+          driver init (Guido Günther), proper active vs. inactive
+          differentiation (Guido Günther), improve MTU setting on tap
           interfaces (Eduardo Habkost), increase timeout for initial QEmu
           monitor poll (Cole Robinson)
    - Cleanups:fix improper initialisations (Jim Meyering)
@@ -33,9 +604,9 @@
    - New features: CPU and scheduler support for LXC (Dan Smith), SDL display configuration (Daniel Berrange), domain lifecycle event support for QEmu and Xen with python bindings (Ben Guthro and Daniel Berrange), KVM/QEmu migration support (Rich Jones and Chris Lalancette), User Mode Linux driver (Daniel Berrange), API for node device enumeration using HAL and DeviceKit with python bindings (David Lively), 
    - Portability: RHEL build fixes, VPATH build (Guido Gunther), many MinGW related cleanups and fixes (Richard Jones), compilation without libvirtd (Richard Jones), Add a Windows icon (Richard Jones), sys/poll.h portability fixes (Daniel Berrange), gnulib and mingw cleanups (Jim Meyering), 
    - Documentation: virsh man page cleanups (Mark McLoughlin), doc for NIC model selection (Richard Jones), monitoring section, link to AMQP bindings, inew APIs, UML driver docs (Daniel Berrange), 
-   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido G<EFBFBD>nther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),  
-   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido G<EFBFBD>nther), qemudDomainBlockStats improvement (Guido G<EFBFBD>nther), scsi/virtio hotplug support for KVM (Guido G<EFBFBD>nther), USB hot addition in QEmu (Guido G<EFBFBD>nther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido G<EFBFBD>nther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
-   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido G<EFBFBD>nther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering), 
+   - Bug fixes: Xen interfaces ordering (Jim Fehlig), startup timeout with multiple pty (Cole Robinson), segfault if QEmu without active virtual network (Cole Robinson), qemu small leak (Eduardo Habkost), index creation for more than 26 disks (Sanjay Rao and Chris Wright), virRealloc handling of 0 (Daniel Berrange), missing pointer initialization (Chris Lalancette), bus device index bug (Guido Günther), avoid crash in some error patch (Chris Lalancette), fix a problem in storage back-end (Chris Lalancette), minimum domain memory size check for Xen (Shigeki Sakamoto), switch off QEmu cache if device is shared (Charles Duffy), logical volume definition before scan bug (Chris Lalancette), a couple of memory leaks on QEmu vnc (Jim Meyering), lvs parsing fixes (Cole Robinson),
+   - Improvements: LXC resources control and internal cgroup API (Dan Smith), virDomainCreateLinux renamed virDomainDefineXML, network driver modularization (Daniel Berrange), change the way domain and net are reported in errors (Jim Meyering), partition table scan on iSCSI (Chris Lalancette), qemudDiskDeviceName to handle normal disks (Guido Günther), qemudDomainBlockStats improvement (Guido Günther), scsi/virtio hotplug support for KVM (Guido Günther), USB hot addition in QEmu (Guido Günther), logical pool and storage backend XML dump improvement (Chris Lalancette), MAC addresses prefix per driver (Daniel Berrange), OpenVZ getVersion support (Daniel Berrange), hot removal of scsi/virtio disks for KVM (Guido Günther), test storage driver (Cole Robinson), iSCSI and disk storage driver improvement on path handling (Chris Lalancette), UUID and ID support for Xenner (Daniel Berrange), better logging when when executing commands (Cole Robinson), bridged network for OpenVZ (Daniel Berrange), OpenVZ config file params (Evgeniy Sokolov), allow to build drivers as libtool convenience libs (Daniel Berrange), fully versioned linker script for exported ABI (Daniel Berrange), Push URI probing down into drivers open (Daniel Berrange), move all stateful drivers into the daemon binary (Daniel Berrange), improve domain event with a detail field (Daniel Berrange), domain events for QEMU driver (Daniel Berrange), event unregister callback crash (David Lively), plug a few leaks (Daniel Berrange), internal APIs for handling node device XML config (David Lively), tweaks to node device implementation (Daniel Berrange), OpenVZ vCPUs values init (Evgeniy Sokolov)
+   - Cleanups: C99 initializers (Guido Gunther), test output (Cole Robinson), debug macro centralization (Cole Robinson), various error handling (Guido Günther), safewrite use cleanup (Jim Meyering), centralize error reporting logic (Cole Robinson), avoid printf warnings (Daniel Berrange), use arrays instead of list for internal APIs (Daniel Berrange), remove many format string warnings Jim Meyering), avoid syntax check warnings (Chris Lalancette), improve po-check and list generation (Jim Meyering), .gitignore generation and handling (Jim Meyering), use ARRAY_CARDINALITY (Jim Meyering), gnulib updates and switch to use netdb.h (Jim Meyering), drop usage of socket_errno (Jim Meyering), remove socketcompat.h (Jim Meyering), more tests (Jim Meyering), drop virStringList (Daniel Berrange), reformatting and isolation of the error APIs (Daniel Berrange), cleanup internal.h and move internal APIs in specific headers (Daniel Berrange), move domain events helpers into domain_events.c (Daniel Berrange), cleanup the way optional modules are compiled (Daniel Berrange), add new logging module, optional dlopen of drivers (Daniel Berrange), various new tests (Jim Meyering), cleanups when Xen is not configured in (Daniel Berrange), add some missing functions comments (Jim Meyering),
 
 
 0.4.6: Sep 23 2008:
@@ -47,7 +618,7 @@
           OpenVZ (Evgeniy Sokolov), fix parsing of pool without a source
           (Chris Lalancette and Daniel Berrange)
    - Improvements: add storage disk volume delete (Cole Robinson),
-          KVM dynamic max CPU detection (Guido G<EFBFBD>nther), spec file improvement
+          KVM dynamic max CPU detection (Guido Günther), spec file improvement
           for minimal builds (Ben Guthro), improved error message in XM
           configuration module (Richard Jones), network config in OpenVZ
           support (Evgeniy Sokolov), enable stopping a pool in logical
@@ -62,7 +633,7 @@
           unified XML domain and network parsing for all drivers (Daniel
           Berrange), OpenVZ features improvements (Evgeniy Sokolov),
           OpenVZ and Linux containers support now default, USB device
-          passthrough for QEmu/KVM (Guido G<EFBFBD>nther), storage pool source
+          passthrough for QEmu/KVM (Guido Günther), storage pool source
           discovery (David Lively)
    - Portability: fixes for MinGW (Atsushi SAKAI and Daniel Berrange),
           detection of xen lib improvement (David Lively),
@@ -72,9 +643,9 @@
           SAKAI and Daniel Berrange), HTML generation fix, -lpthread explicit
           linking when needed (Jim Meyering)
    - Documentation: various typo fixes (Anton Protopopov, Toth
-          Istv<EFBFBD>n, Atsushi SAKAI, Nguyen Anh Quynh),
+          István, Atsushi SAKAI, Nguyen Anh Quynh),
           Java bindings docs, remove Xen centric
-          comments (Guido G<EFBFBD>nther), various typo in comments (Chris
+          comments (Guido Günther), various typo in comments (Chris
           Lalancette), docs and API comments fixes (Charles Duffy),
           how to contribute to open source link (Richard Jones),
           memory unit fixups (matthew chan)
@@ -84,14 +655,14 @@
           in QEmu/KVM (Daniel Berrange), fix OpenVZ probe function (Evgeniy
           Sokolov), ID related lookup fixes in OpenVZ (Evgeniy Sokolov),
           pool cration for netfs (Cole Robinson), check for migrate support
-          with QEmu (Guido G<EFBFBD>nther), check against double create with QEmu
-          (Guido G<EFBFBD>nther), broken open failure detection in QEmu (Guido
-          G<EFBFBD>nther), UUID string conversions in QEmu (Guido G<EFBFBD>nther),
+          with QEmu (Guido Günther), check against double create with QEmu
+          (Guido Günther), broken open failure detection in QEmu (Guido
+          Günther), UUID string conversions in QEmu (Guido Günther),
           various small cleanup and bug fixes (Daniel Berrange), ID
           related fixes in the test driver (Daniel Berrange), better error
           reporting on XML parsing (Daniel Berrange), empty CD-ROM source
           device section (Chris Lalancette), avoid crashes for interface
-          without a name in QEmu (Guido G<EFBFBD>nther), provide the real
+          without a name in QEmu (Guido Günther), provide the real
           vncport (Charles Duffy), fix forward delay (Daniel Berrange),
           new VM state is initialized to be SHUTOFF (Daniel Berrange),
           virsh attach-disk bug fixes (Chris Lalancette), veth clash
@@ -123,7 +694,7 @@
           (Daniel Berrange), virsh "edit" command (Richard Jones), save
           UUID of OpenVZ domains (Evgeniy Sokolov), improve xen blocks
           statistics (Chris Lalancette), gnulib updates (Jim Meyering),
-          allow to add disk as USB devices (Guido G<EFBFBD>nther), LXC container
+          allow to add disk as USB devices (Guido Günther), LXC container
           process should survive libvirtd restarts (Daniel Berrange), allow
           to define static host domain configs, number of CPU used by
           OpenVZ domains (Evgeniy Sokolov), private root fs for LXC (Daniel
@@ -255,9 +826,9 @@
       driver (Cole Robinson), xen and hvm added to test driver capabilities
       (Cole Robinson)
    - Code cleanup: remove unused getopt header (Jim Meyering), mark more
-      strings as translatable (Guido G<EFBFBD>nther and Jim Meyering), convert
+      strings as translatable (Guido Günther and Jim Meyering), convert
       error strings to something meaningful and translatable (Jim Meyering),
-      Linux Containers code cleanup, last error initializer (Guido G<EFBFBD>nther)
+      Linux Containers code cleanup, last error initializer (Guido Günther)
 
 
 0.4.1: Mar 3 2008:
@@ -817,4 +1388,3 @@
    - First release
    - Basic management of existing Xen domains
    - Minimal autogenerated Python bindings
-

README-hacking

@@ -0,0 +1,52 @@
+-*- outline -*-
+
+These notes intend to help people working on the checked-out sources.
+These requirements do not apply when building from a distribution tarball.
+See also HACKING for more detailed libvirt contribution guidelines.
+
+* Requirements
+
+We've opted to keep only the highest-level sources in the GIT repository.
+This eases our maintenance burden, (fewer merges etc.), but imposes more
+requirements on anyone wishing to build from the just-checked-out sources.
+Note the requirements to build the released archive are much less and
+are just the requirements of the standard ./configure && make procedure.
+Specific development tools and versions will be checked for and listed by
+the bootstrap script.  See README-prereq for specific notes on obtaining
+these prerequisite tools.
+
+Valgrind <http://valgrind.org/> is also highly recommended, if
+Valgrind supports your architecture. See also README-valgrind.
+
+While building from a just-cloned source tree may require installing a
+few prerequisites, later, a plain `git pull && make' should be sufficient.
+
+* First GIT checkout
+
+You can get a copy of the source repository like this:
+
+        $ git clone git://libvirt.org/libvirt
+        $ cd libvirt
+
+The next step is to get all required pieces from gnulib,
+to run autoreconf, and to invoke ./configure:
+
+        $ ./autogen.sh
+
+And there you are!  Just
+
+        $ make
+        $ make check
+
+At this point, there should be no difference between your local copy,
+and the GIT master copy:
+
+        $ git diff
+
+should output no difference.
+
+Enjoy!
+
+Local Variables:
+indent-tabs-mode: nil
+End:

RENAMES

@@ -2,8 +2,6 @@
 #
 # File renames don't normally go into patches because they make
 # the patches much harder to read, so list them here instead.
-#
-# $Id$
 
 # Clearer naming scheme after Xen-unified patch went in.
 src/xen_internal.c	src/xen_internal_hv.c

acinclude.m4

@@ -45,21 +45,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
 	;;
     esac
 
-    compiler_flags=
+    COMPILER_FLAGS=
     for option in $try_compiler_flags; do
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $option"
-	AC_MSG_CHECKING([whether gcc understands $option])
-	AC_TRY_LINK([], [],
-		has_option=yes,
-		has_option=no,)
-	CFLAGS="$SAVE_CFLAGS"
-	AC_MSG_RESULT($has_option)
-	if test $has_option = yes; then
-	  compiler_flags="$compiler_flags $option"
-	fi
-	unset has_option
-	unset SAVE_CFLAGS
+        gl_COMPILER_FLAGS($option)
     done
     unset option
     unset try_compiler_flags
@@ -85,8 +73,14 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     fi
     AC_MSG_RESULT($complCFLAGS)
 
-    WARN_CFLAGS="$compiler_flags $complCFLAGS"
+    WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS"
     AC_SUBST(WARN_CFLAGS)
+
+    dnl Needed to keep compile quiet on python 2.4
+    COMPILER_FLAGS=
+    gl_COMPILER_FLAGS(-Wno-redundant-decls)
+    WARN_PYTHON_CFLAGS=$COMPILER_FLAGS
+    AC_SUBST(WARN_PYTHON_CFLAGS)
 ])
 
 
@@ -113,4 +107,3 @@ if test -n "$PKG_CONFIG"; then
         fi
 fi[]dnl
 ])])
-

autobuild.sh

@@ -65,6 +65,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
     --build=$(uname -m)-pc-linux \
     --host=i686-pc-mingw32 \
     --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \
+    --enable-compile-warnings=error \
     --without-sasl \
     --without-avahi \
     --without-polkit \
@@ -73,7 +74,11 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
     --without-qemu \
     --without-lxc \
     --without-uml \
+    --without-vbox \
     --without-openvz \
+    --without-one \
+    --without-phyp \
+    --without-netcf \
     --without-libvirtd
 
   make

autogen.sh

@@ -54,13 +54,21 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-autopoint --force
-#rm -rf m4
-libtoolize --copy --force
-aclocal -I m4 -I gnulib/m4
-autoheader
-automake --add-missing
-autoconf
+# Ensure that whenever we pull in a gnulib update or otherwise change to a
+# different version (i.e., when switching branches), we also rerun ./bootstrap.
+curr_status=.git-module-status
+t=$(git submodule status)
+if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
+    : # good, it's up to date
+else
+  echo running bootstrap...
+  ./bootstrap && echo "$t" > $curr_status
+fi
+
+# Automake requires that ChangeLog exist.
+touch ChangeLog
+
+autoreconf -if
 
 cd $THEDIR
 

bootstrap

@@ -1,11 +1,5 @@
 #!/bin/sh
-# Run this after autogen.sh, to pull in all of the gnulib-related bits.
-# It's important to run *after* autogen.sh, since it updates some of
-# the same files autogen.sh does, yet those from gnulib are newer,
-# and match the tests.  So if a gnulib bug has been fixed since the
-# snapshot taken for whatever gettext release you're using, yet you
-# run "make check" against the wrong version, the corresponding unit
-# test in gl-tests/ may well fail.
+# Run this before autogen.sh, to pull in all of the gnulib-related bits.
 
 usage() {
   echo >&2 "\
@@ -40,25 +34,31 @@ do
   esac
 done
 
-cleanup_gnulib() {
-  st=$?
-  rm -fr .gnulib
-  exit $st
-}
+# Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
 -)
-  if [ ! -d .gnulib ]; then
-    echo "$0: getting gnulib files..."
-
-    trap cleanup_gnulib 1 2 13 15
-
-    git clone --depth 1 git://git.sv.gnu.org/gnulib .gnulib ||
-      cleanup_gnulib
-
-    trap - 1 2 13 15
-  fi
+  echo "$0: getting gnulib files..."
+  git submodule init || exit $?
+  git submodule update || exit $?
   GNULIB_SRCDIR=.gnulib
+  ;;
+*)
+  # Redirect the gnulib submodule to the directory on the command line
+  # if possible.
+  if test -d "$GNULIB_SRCDIR"/.git && \
+	git config --file .gitmodules submodule.gnulib.url >/dev/null; then
+    git submodule init
+    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
+    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    echo "$0: getting gnulib files..."
+    git submodule update || exit $?
+    GNULIB_SRCDIR=.gnulib
+  else
+    echo >&2 "$0: invalid gnulib srcdir: $GNULIB_SRCDIR"
+    exit 1
+  fi
+  ;;
 esac
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
@@ -72,7 +72,11 @@ getaddrinfo
 gethostname
 getpass
 gettext
+gitlog-to-changelog
+gnumakefile
 inet_pton
+ioctl
+maintainer-makefile
 mkstemp
 mktempd
 perror
@@ -80,13 +84,16 @@ physmem
 poll
 posix-shell
 recv
+random_r
 send
 setsockopt
 socket
+stpcpy
 strndup
 strerror
 strsep
 sys_stat
+time_r
 useless-if-before-free
 vasprintf
 verify
@@ -105,13 +112,3 @@ $gnulib_tool			\
   --source-base=gnulib/lib	\
   --tests-base=gnulib/tests	\
   --import $modules
-
-rm -f				\
-    .gitignore			\
-    gnulib/lib/.gitignore	\
-    gnulib/m4/.gitignore	\
-    gnulib/tests/.gitignore
-
-(cd gnulib/lib &&
- (cat .cvsignore; \
-  ls -1 *.in.h|sed 's/\.in\.h/.h/') | sort -u > .t; mv .t .cvsignore)

build-aux/.cvsignore

@@ -1,10 +0,0 @@
-compile
-config.guess
-config.rpath
-config.sub
-depcomp
-install-sh
-ltmain.sh
-missing
-mkinstalldirs
-mktempd

build-aux/.gitignore

@@ -8,3 +8,6 @@ ltmain.sh
 missing
 mkinstalldirs
 mktempd
+/useless-if-before-free
+/vc-list-files
+/gitlog-to-changelog

build-aux/useless-if-before-free

@@ -1,180 +0,0 @@
-#!/usr/bin/perl -T
-# Detect instances of "if (p) free (p);".
-# Likewise for "if (p != NULL) free (p);".  And with braces.
-
-my $VERSION = '2008-05-25 17:36'; # UTC
-# The definition above must lie within the first 8 lines in order
-# for the Emacs time-stamp write hook (at end) to update it.
-# If you change this file with Emacs, please let the write hook
-# do its job.  Otherwise, update this string manually.
-
-# Copyright (C) 2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Written by Jim Meyering
-
-use strict;
-use warnings;
-use Getopt::Long;
-
-(my $ME = $0) =~ s|.*/||;
-
-# use File::Coda; # http://meyering.net/code/Coda/
-END {
-  defined fileno STDOUT or return;
-  close STDOUT and return;
-  warn "$ME: failed to close standard output: $!\n";
-  $? ||= 1;
-}
-
-sub usage ($)
-{
-  my ($exit_code) = @_;
-  my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
-  if ($exit_code != 0)
-    {
-      print $STREAM "Try `$ME --help' for more information.\n";
-    }
-  else
-    {
-      print $STREAM <<EOF;
-Usage: $ME [OPTIONS] FILE...
-
-Detect any instance in FILE of a useless "if" test before a free call, e.g.,
-"if (p) free (p);".  Any such test may be safely removed without affecting
-the semantics of the C code in FILE.  Use --name=FOO --name=BAR to also
-detect free-like functions named FOO and BAR.
-
-OPTIONS:
-
-   --list       print only the name of each matching FILE (\0-terminated)
-   --name=N     add name N to the list of `free'-like functions to detect;
-                  may be repeated
-
-   --help       display this help and exit
-   --version    output version information and exit
-
-Exit status:
-
-  0   one or more matches
-  1   no match
-  2   an error
-
-EXAMPLE:
-
-For example, this command prints all removable "if" tests before "free"
-and "kfree" calls in the linux kernel sources:
-
-    git ls-files -z |xargs -0 $ME --name=kfree
-
-EOF
-    }
-  exit $exit_code;
-}
-
-{
-  sub EXIT_MATCH {0}
-  sub EXIT_NO_MATCH {1}
-  sub EXIT_ERROR {2}
-  my $err = EXIT_NO_MATCH;
-
-  my $list;
-  my @name = qw(free);
-  GetOptions
-    (
-     help => sub { usage 0 },
-     version => sub { print "$ME version $VERSION\n"; exit },
-     list => \$list,
-     'name=s@' => \@name,
-    ) or usage 1;
-
-  # Make sure we have the right number of non-option arguments.
-  # Always tell the user why we fail.
-  @ARGV < 1
-    and (warn "$ME: missing FILE argument\n"), usage EXIT_ERROR;
-
-  my $or = join '|', @name;
-  my $regexp = qr/(?:$or)/;
-
-  # Set the input record separator.
-  # Note: this makes it impractical to print line numbers.
-  $/ = '"';
-
-  my $found_match = 0;
- FILE:
-  foreach my $file (@ARGV)
-    {
-      open FH, '<', $file
-        or (warn "$ME: can't open `$file' for reading: $!\n"),
-          $err = EXIT_ERROR, next;
-      while (defined (my $line = <FH>))
-        {
-          while ($line =~
-              /\b(if\s*\(\s*([^)]+?)(?:\s*!=\s*NULL)?\s*\)
-               (?:   \s*$regexp\s*\((?:\s*\([^)]+\))?\s*([^)]+)\)|
-                \s*\{\s*$regexp\s*\((?:\s*\([^)]+\))?\s*([^)]+)\)\s*;\s*\}))/sxg)
-            {
-              # Compare "if" expression and free'd expression,
-              # without regard to white space.
-              (my $e1 = $2) =~ tr/ \t//d;
-              my $e2 = defined $3 ? $3 : $4;
-              $e2 =~ tr/ \t//d;
-              if ($e1 eq $e2)
-                {
-                  $found_match = 1;
-                  $list
-                    and (print "$file\0"), next FILE;
-                  print "$file: $1\n";
-                }
-            }
-        }
-    }
-  continue
-    {
-      close FH;
-    }
-
-  $found_match && $err == EXIT_NO_MATCH
-    and $err = EXIT_MATCH;
-
-  exit $err;
-}
-
-my $foo = <<'EOF';
-# The above is to *find* them.
-# This adjusts them, removing the unnecessary "if (p)" part.
-
-# FIXME: do something like this as an option (doesn't do braces):
-useless-if-before-free -l $(lid -knone free) | xargs -0 \
-  perl -0x3b -pi -e \
-   's/\bif\s*\(\s*(\S+?)(?:\s*!=\s*NULL)?\s*\)\s+(free\s*\((?:\s*\([^)]+\))?\s*\1\s*\))/$2/s'
-
-# Or, with git:
-git ls-files -z |xargs -0 perl -0x3b -pi -e '...'
-
-Be careful that the result of the above transformation is valid.
-If the matched string is followed by "else", then obviously, it won't be.
-
-When modifying files, refuse to process anything other than a regular file.
-EOF
-
-## Local Variables:
-## indent-tabs-mode: nil
-## eval: (add-hook 'write-file-hooks 'time-stamp)
-## time-stamp-start: "my $VERSION = '"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
-## time-stamp-time-zone: "UTC"
-## time-stamp-end: "'; # UTC"
-## End:

build-aux/vc-list-files

@@ -1,107 +0,0 @@
-#!/bin/sh
-# List version-controlled file names.
-
-# Print a version string.
-scriptversion=2008-07-11.19
-
-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# List the specified version-controlled files.
-# With no argument, list them all.  With a single DIRECTORY argument,
-# list the version-controlled files in that directory.
-
-# If there's an argument, it must be a single, "."-relative directory name.
-# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/
-
-postprocess=
-case $1 in
-  --help) cat <<EOF
-Usage: $0 [-C SRCDIR] [DIR]
-
-Output a list of version-controlled files in DIR (default .), relative to
-SRCDIR (default .).  SRCDIR must be the top directory of a checkout.
-
-Options:
-  --help     print this help, then exit
-  --version  print version number, then exit
-  -C SRCDIR  change directory to SRCDIR before generating list
-
-Report bugs and patches to <bug-gnulib@gnu.org>.
-EOF
-    exit ;;
-
-  --version)
-    year=`echo "$scriptversion" | sed 's/[^0-9].*//'`
-    cat <<EOF
-vc-list-files $scriptversion
-Copyright (C) $year Free Software Foundation, Inc,
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-EOF
-    exit ;;
-
-  -C)
-    test "$2" = . || postprocess="| sed 's|^|$2/|'"
-    cd "$2" || exit 1
-    shift; shift ;;
-esac
-
-dir=
-case $# in
-  0) ;;
-  1) dir=$1 ;;
-  *) echo "$0: too many arguments" 1>&2
-     echo "Usage: $0 [-C srcdir] [DIR]" 1>&2; exit 1;;
-esac
-
-test "x$dir" = x && dir=.
-
-if test -d .git; then
-  eval exec git ls-files '"$dir"' $postprocess
-elif test -d .hg; then
-  eval exec hg locate '"$dir/*"' $postprocess
-elif test -d .bzr; then
-  test "$postprocess" = '' && postprocess="| sed 's|^\./||'"
-  eval exec bzr ls --versioned '"$dir"' $postprocess
-elif test -d CVS; then
-  test "$postprocess" = '' && postprocess="| sed 's|^\./||'"
-  if test -x build-aux/cvsu; then
-    eval build-aux/cvsu --find --types=AFGM '"$dir"' $postprocess
-  elif (cvsu --help) >/dev/null 2>&1; then
-    eval cvsu --find --types=AFGM '"$dir"' $postprocess
-  else
-    eval awk -F/ \''{			\
-	if (!$1 && $3 !~ /^-/) {	\
-	  f=FILENAME;			\
-	  if (f ~ /CVS\/Entries$/)	\
-	    f = substr(f, 0, length(f)-11); \
-	  print f $2;			\
-	}}'\''				\
-      `find "$dir" -name Entries -print` /dev/null' $postprocess
-  fi
-else
-  echo "$0: Failed to determine type of version control used in `pwd`" 1>&2
-  exit 1
-fi
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

cfg.mk

@@ -0,0 +1,259 @@
+# Customize Makefile.maint.                           -*- makefile -*-
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Use alpha.gnu.org for alpha and beta releases.
+# Use ftp.gnu.org for major releases.
+gnu_ftp_host-alpha = alpha.gnu.org
+gnu_ftp_host-beta = alpha.gnu.org
+gnu_ftp_host-major = ftp.gnu.org
+gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
+
+url_dir_list = \
+  ftp://$(gnu_rel_host)/gnu/coreutils
+
+# Tests not to run as part of "make distcheck".
+local-checks-to-skip =			\
+  changelog-check			\
+  check-AUTHORS				\
+  makefile-check			\
+  makefile_path_separator_check		\
+  patch-check				\
+  sc_GPL_version			\
+  sc_always_defined_macros		\
+  sc_cast_of_alloca_return_value	\
+  sc_dd_max_sym_length			\
+  sc_error_exit_success			\
+  sc_file_system			\
+  sc_immutable_NEWS			\
+  sc_makefile_path_separator_check	\
+  sc_obsolete_symbols			\
+  sc_prohibit_S_IS_definition		\
+  sc_prohibit_atoi_atof			\
+  sc_prohibit_jm_in_m4			\
+  sc_prohibit_quote_without_use		\
+  sc_prohibit_quotearg_without_use	\
+  sc_prohibit_stat_st_blocks		\
+  sc_root_tests				\
+  sc_space_tab				\
+  sc_sun_os_names			\
+  sc_system_h_headers			\
+  sc_tight_scope			\
+  sc_two_space_separator_in_usage	\
+  sc_error_message_uppercase		\
+  sc_program_name			\
+  sc_require_test_exit_idiom		\
+  sc_makefile_check			\
+  sc_useless_cpp_parens
+
+useless_free_options =		\
+  --name=sexpr_free		\
+  --name=VIR_FREE		\
+  --name=xmlFree		\
+  --name=xmlXPathFreeContext	\
+  --name=xmlXPathFreeObject
+
+# Avoid uses of write(2).  Either switch to streams (fwrite), or use
+# the safewrite wrapper.
+sc_avoid_write:
+	@if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then		\
+	  grep '\<write *(' $$($(VC_LIST_EXCEPT) | grep '\.c$$') &&	\
+	    { echo "$(ME): the above files use write;"			\
+	      " consider using the safewrite wrapper instead"		\
+		  1>&2; exit 1; } || :;					\
+	else :;								\
+	fi
+
+# Use STREQ rather than comparing strcmp == 0, or != 0.
+# Similarly, use STREQLEN or STRPREFIX rather than strncmp.
+sc_prohibit_strcmp_and_strncmp:
+	@grep -nE '! *strn?cmp *\(|\<strn?cmp *\([^)]+\) *=='		\
+	    $$($(VC_LIST_EXCEPT))					\
+	  | grep -vE ':# *define STREQ(LEN)?\(' &&			\
+	  { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \
+		1>&2; exit 1; } || :
+
+# Use virAsprintf rather than a'sprintf since *strp is undefined on error.
+sc_prohibit_asprintf:
+	@re='\<[a]sprintf\>'						\
+	msg='use virAsprintf, not a'sprintf				\
+	  $(_prohibit_regexp)
+
+sc_prohibit_VIR_ERR_NO_MEMORY:
+	@re='\<V''IR_ERR_NO_MEMORY\>'					\
+	msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY		\
+	  $(_prohibit_regexp)
+
+include Makefile.nonreentrant
+sc_prohibit_nonreentrant:
+	@fail=0 ; \
+	for i in $(NON_REENTRANT) ; \
+	do \
+	   grep --before 2 --after 1 -nE "\<$$i\>[:space:]*\(" $$($(VC_LIST_EXCEPT)) && \
+	     fail=1 && echo "$(ME): use $${i}_r, not $${i}" || : ; \
+	done ; \
+	exit $$fail
+
+# Prohibit the inclusion of <ctype.h>.
+sc_prohibit_ctype_h:
+	@grep -E '^# *include  *<ctype\.h>' $$($(VC_LIST_EXCEPT)) &&	\
+	  { echo "$(ME): don't use ctype.h; instead, use c-ctype.h"	\
+		1>&2; exit 1; } || :
+
+# Ensure that no C source file uses TABs for indentation.
+# Also match *.h.in files, to get libvirt.h.in.
+# Exclude files in gnulib, since they're imported.
+sc_TAB_in_indentation:
+	@grep -lE '^ *	' /dev/null					\
+	     $$($(VC_LIST_EXCEPT)					\
+		| grep -E '\.[ch](\.in)?$$'				\
+		| grep -v '^gnulib/') &&				\
+	  { echo '$(ME): found TAB(s) used for indentation in C sources;'\
+	      'use spaces' 1>&2; exit 1; } || :
+
+ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
+|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper
+
+sc_avoid_ctype_macros:
+	@grep -E '\b($(ctype_re)) *\(' /dev/null			\
+	     $$($(VC_LIST_EXCEPT)) &&					\
+	  { echo "$(ME): don't use ctype macros (use c-ctype.h)"	\
+		1>&2; exit 1; } || :
+
+sc_prohibit_virBufferAdd_with_string_literal:
+	@re='\<virBufferAdd *\([^,]+, *"[^"]'				\
+	msg='use virBufferAddLit, not virBufferAdd, with a string literal' \
+	  $(_prohibit_regexp)
+
+# Not only do they fail to deal well with ipv6, but the gethostby*
+# functions are also not thread-safe.
+sc_prohibit_gethostby:
+	@re='\<gethostby(addr|name2?) *\('				\
+	msg='use getaddrinfo, not gethostby*'				\
+	  $(_prohibit_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 \
+# |grep -vE '^(qsort|if|close|assert|fputc|free|N_|vir.*GetName|.*Unlock|virNodeListDevices|virHashRemoveEntry|freeaddrinfo|.*[fF]ree|xdrmem_create|xmlXPathFreeObject|virUUIDFormat|openvzSetProgramSentinal|polkit_action_unref)$'
+
+msg_gen_function =
+msg_gen_function += DEBUG0
+msg_gen_function += DISABLE_fprintf
+msg_gen_function += ERROR
+msg_gen_function += ERROR0
+msg_gen_function += REMOTE_DEBUG
+msg_gen_function += ReportError
+msg_gen_function += VIR_FREE
+msg_gen_function += VIR_INFO
+msg_gen_function += VIR_USE_CPU
+msg_gen_function += errorf
+msg_gen_function += lxcError
+msg_gen_function += networkLog
+msg_gen_function += networkReportError
+msg_gen_function += oneError
+msg_gen_function += openvzError
+msg_gen_function += openvzLog
+msg_gen_function += qemudDispatchClientFailure
+msg_gen_function += qemudLog
+msg_gen_function += qemudReportError
+msg_gen_function += regerror
+msg_gen_function += remoteDispatchFormatError
+msg_gen_function += umlLog
+msg_gen_function += umlReportError
+msg_gen_function += virConfError
+msg_gen_function += virDomainReportError
+msg_gen_function += virSecurityReportError
+msg_gen_function += virHashError
+msg_gen_function += virLibConnError
+msg_gen_function += virLibDomainError
+msg_gen_function += virLog
+msg_gen_function += virNetworkReportError
+msg_gen_function += virNodeDeviceReportError
+msg_gen_function += virProxyError
+msg_gen_function += virRaiseError
+msg_gen_function += virReportErrorHelper
+msg_gen_function += virReportSystemError
+msg_gen_function += virSexprError
+msg_gen_function += virStorageLog
+msg_gen_function += virStorageReportError
+msg_gen_function += virXMLError
+msg_gen_function += virXenInotifyError
+msg_gen_function += virXenStoreError
+msg_gen_function += virXendError
+msg_gen_function += vshCloseLogFile
+msg_gen_function += xenUnifiedError
+msg_gen_function += xenXMError
+
+# Uncomment the following and run "make syntax-check" to see diagnostics
+# that are not yet marked for translation, but that need to be rewritten
+# so that they are translatable.
+# msg_gen_function += error
+# msg_gen_function += fprintf
+# msg_gen_function += testError
+# msg_gen_function += virXenError
+# msg_gen_function += vshPrint
+# msg_gen_function += vshError
+
+func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|')
+func_re := ($(func_or))
+
+# Look for diagnostics that aren't marked for translation.
+# This won't find any for which error's format string is on a separate line.
+# The sed filters eliminate false-positives like these:
+#    _("...: "
+#    "%s", _("no storage vol w..."
+sc_libvirt_unmarked_diagnostics:
+	@grep -nE							\
+            '\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT))	\
+	  | grep -v '_''(' &&						\
+	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
+	    exit 1; } || :
+	@{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
+	   grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
+	   | sed 's/_("[^"][^"]*"//;s/[	 ]"%s"//'			\
+	   | grep '[	 ]"' &&						\
+	  { echo '$(ME): found unmarked diagnostic(s)' 1>&2;		\
+	    exit 1; } || :
+
+# Disallow trailing blank lines.
+sc_prohibit_trailing_blank_lines:
+	@$(VC_LIST_EXCEPT) | xargs perl -ln -0777 -e			\
+	  '/\n\n+$$/ and print $$ARGV' > $@-t
+	@found=0; test -s $@-t && { found=1; cat $@-t 1>&2;		\
+	  echo '$(ME): found trailing blank line(s)' 1>&2; };		\
+	rm -f $@-t;							\
+	test $$found = 0
+
+# We don't use this feature of maint.mk.
+prev_version_file = /dev/null
+
+ifeq (0,$(MAKELEVEL))
+  _curr_status = .git-module-status
+  # The sed filter accommodates those who check out on a commit from which
+  # no tag is reachable.  In that case, git submodule status prints a "-"
+  # in column 1 and does not print a "git describe"-style string after the
+  # submodule name.  Contrast these:
+  # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
+  #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
+  _submodule_hash = sed 's/.//;s/ .*//'
+  _update_required := $(shell						\
+      actual=$$(git submodule status | $(_submodule_hash));		\
+      stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";	\
+      test "$$stamp" = "$$actual"; echo $$?)
+  ifeq (1,$(_update_required))
+    $(error gnulib update required; run ./autogen.sh first)
+  endif
+endif

configure.in

@@ -1,11 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([libvirt], [0.5.1])
+AC_INIT([libvirt], [0.7.0])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER([config.h])
 dnl Make automake keep quiet about wildcards & other GNUmake-isms
 AM_INIT_AUTOMAKE([-Wno-portability])
+
+# Use the silent-rules feature when possible.
+m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+AM_SILENT_RULES([yes])
+
 AC_CANONICAL_HOST
 
 LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'`
@@ -23,11 +28,12 @@ AC_SUBST([LIBVIRT_VERSION_INFO])
 AC_SUBST([LIBVIRT_VERSION_NUMBER])
 
 dnl Required minimum versions of all libs we depend on
-LIBXML_REQUIRED="2.5.0"
+LIBXML_REQUIRED="2.6.0"
 GNUTLS_REQUIRED="1.0.25"
 AVAHI_REQUIRED="0.6.0"
 POLKIT_REQUIRED="0.6"
 PARTED_REQUIRED="1.8.0"
+NETCF_REQUIRED="0.0.1"
 
 dnl Checks for C compiler.
 AC_PROG_CC
@@ -57,9 +63,13 @@ dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL)
 AC_LIBTOOL_WIN32_DLL
 
 AM_PROG_LIBTOOL
-
 AM_PROG_CC_C_O
 
+VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+`/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null` || \
+    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+AC_SUBST(VERSION_SCRIPT_FLAGS)
+
 LIBVIRT_COMPILE_WARNINGS([maximum])
 
 dnl Support large files / 64 bit seek offsets.
@@ -67,25 +77,29 @@ dnl Use --disable-largefile if you don't want this.
 AC_SYS_LARGEFILE
 
 dnl Availability of various common functions (non-fatal if missing).
-AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid])
+AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid posix_fallocate mmap readlink])
+
+dnl Availability of various not common threadsafe functions
+AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r])
 
 dnl Availability of various common headers (non-fatal if missing).
-AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h])
+AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h])
 
 dnl Where are the XDR functions?
 dnl If portablexdr is installed, prefer that.
-dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW) or none (most Unix)
+dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW), -lnsl (Solaris)
+dnl or none (most Unix)
 AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
-	AC_SEARCH_LIBS([xdrmem_create],[rpc xdr])
+	AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
 	])
 
 AC_CHECK_LIB([intl],[gettext],[])
 
 dnl Do we have rpcgen?
 AC_PATH_PROG([RPCGEN], [rpcgen], [no])
-AM_CONDITIONAL([RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"])
+AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"])
 dnl Is this GLIBC's buggy rpcgen?
-AM_CONDITIONAL([GLIBC_RPCGEN],
+AM_CONDITIONAL([HAVE_GLIBC_RPCGEN],
 	       [test "x$ac_cv_path_RPCGEN" != "xno" &&
 	        $ac_cv_path_RPCGEN -t </dev/null >/dev/null 2>&1])
 
@@ -119,6 +133,8 @@ AC_PATH_PROG([UDEVADM], [udevadm], [],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([UDEVSETTLE], [udevsettle], [],
 	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
+AC_PATH_PROG([MODPROBE], [modprobe], [],
+	[/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 
 AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],
         [Location or name of the dnsmasq program])
@@ -132,6 +148,10 @@ if test -n "$UDEVSETTLE"; then
   AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
         [Location or name of the udevsettle program])
 fi
+if test -n "$MODPROBE"; then
+  AC_DEFINE_UNQUOTED([MODPROBE],["$MODPROBE"],
+        [Location or name of the modprobe program])
+fi
 
 dnl Specific dir for HTML output ?
 AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path],
@@ -160,15 +180,25 @@ dnl Allow to build without Xen, QEMU/KVM, test or remote driver
 AC_ARG_WITH([xen],
 [  --with-xen              add XEN support (on)],[],[with_xen=yes])
 AC_ARG_WITH([xen-inotify],
-[  --with-xen-inotify      add XEN inotify support (on)],[],[with_xen_inotify=yes])
+[  --with-xen-inotify      add XEN inotify support (on)],[],[with_xen_inotify=check])
 AC_ARG_WITH([qemu],
 [  --with-qemu             add QEMU/KVM support (on)],[],[with_qemu=yes])
 AC_ARG_WITH([uml],
-[  --with-uml              add UML support (on)],[],[with_uml=yes])
+[  --with-uml              add UML support (on)],[],[with_uml=check])
 AC_ARG_WITH([openvz],
 [  --with-openvz           add OpenVZ support (on)],[],[with_openvz=yes])
+AC_ARG_WITH([libssh],
+[  --with-libssh=[PFX]       libssh location],[],[with_libssh=yes])
+AC_ARG_WITH([phyp],
+[  --with-phyp=[PFX]         add PHYP support (on)],[],[with_phyp=check])
+AC_ARG_WITH([vbox],
+[  --with-vbox             add VirtualBox support (on)],[],[with_vbox=yes])
 AC_ARG_WITH([lxc],
-[  --with-lxc              add Linux Container support (on)],[],[with_lxc=yes])
+[  --with-lxc              add Linux Container support (on)],[],[with_lxc=check])
+AC_ARG_WITH([one],
+[  --with-one              add ONE support (on)],[],[with_one=check])
+AC_ARG_WITH([esx],
+[  --with-esx              add ESX support (on)],[],[with_esx=check])
 AC_ARG_WITH([test],
 [  --with-test             add test driver support (on)],[],[with_test=yes])
 AC_ARG_WITH([remote],
@@ -190,6 +220,7 @@ dnl --enable-debug=(yes|no)
 AC_ARG_ENABLE([debug],
               [AC_HELP_STRING([--enable-debug=no/yes],
                              [enable debugging output])],[],[enable_debug=yes])
+AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes")
 if test x"$enable_debug" = x"yes"; then
    AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled])
 fi
@@ -224,6 +255,14 @@ fi
 AM_CONDITIONAL([LIBVIRT_INIT_SCRIPTS_RED_HAT], test x$with_init_scripts = xredhat)
 AC_MSG_RESULT($with_init_scripts)
 
+dnl RHEL-5 has a peculiar version of Xen, which requires some special casing
+AC_ARG_WITH([rhel5-api],
+	[AC_HELP_STRING([--with-rhel5-api=[ARG]],
+		[build for the RHEL-5 API [default=no]])])
+if test x"$with_rhel5_api" = x"yes"; then
+   AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API])
+fi
+
 dnl
 dnl ensure that Fedora's system-config-firewall knows
 dnl about libvirt's iptables rules
@@ -253,13 +292,10 @@ if test "$with_openvz" = "yes"; then
 fi
 AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"])
 
-if test "$with_libvirtd" = "no" ; then
-  with_lxc=no
+if test "x$with_vbox" = "xyes"; then
+    AC_DEFINE_UNQUOTED([WITH_VBOX], 1, [whether VirtualBox driver is enabled])
 fi
-if test "$with_lxc" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled])
-fi
-AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"])
+AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
 
 if test "$with_libvirtd" = "no" ; then
   with_qemu=no
@@ -269,10 +305,10 @@ if test "$with_qemu" = "yes" ; then
 fi
 AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"])
 
-if test "$with_uml" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled])
+if test "$with_one" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled])
 fi
-AM_CONDITIONAL([WITH_UML], [test "$with_uml" = "yes"])
+AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"])
 
 if test "$with_test" = "yes" ; then
     AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled])
@@ -355,13 +391,69 @@ if test "$with_xen" != "yes"; then
     with_xen_inotify=no
 fi
 if test "$with_xen_inotify" != "no"; then
-    AC_CHECK_HEADER([linux/inotify.h],[],[with_xen_inotify=no])
+    AC_CHECK_HEADER([sys/inotify.h], [
+        with_xen_inotify=yes
+    ], [
+        if test "$with_xen_inotify" = "check"; then
+            with_xen_inotify=no
+            AC_MSG_NOTICE([Header file <sys/inotify.h> is required for Xen Inotify support, disabling it])
+        else
+            AC_MSG_ERROR([Header file <sys/inotify.h> is required for Xen Inotify support!])
+        fi
+    0])
 fi
 if test "$with_xen_inotify" = "yes"; then
     AC_DEFINE_UNQUOTED([WITH_XEN_INOTIFY], 1,[whether Xen inotify sub-driver is enabled])
 fi
 AM_CONDITIONAL([WITH_XEN_INOTIFY], [test "$with_xen_inotify" = "yes"])
 
+dnl
+dnl check for kvm headers
+dnl
+AC_CHECK_HEADERS([linux/kvm.h])
+
+dnl
+dnl check for sufficient headers for LXC
+dnl
+if test "$with_lxc" = "yes" -o "$with_lxc" = "check"; then
+    AC_CHECK_HEADER([sched.h],
+    dnl Header is there, check for unshare()
+    [
+        AC_TRY_LINK([#define _GNU_SOURCE
+            #include <sched.h>], [
+            unshare (1);
+	], [
+            with_lxc=yes
+	], [
+            if test "$with_lxc" = "check"; then
+	        with_lxc=no
+		AC_MSG_NOTICE([Function unshare() not present in <sched.h> header but required for LXC driver, disabling it])
+            else
+	        AC_MSG_ERROR([Function unshare() not present in <sched.h> header, but required for LXC driver])
+            fi
+
+        ])
+
+    dnl Header is not there
+    ],[
+        if test "$with_lxc" = "check"; then
+            with_lxc=no
+            AC_MSG_NOTICE([Header <sched.h> not found but required for LXC driver, disabling it])
+        else
+            AC_MSG_ERROR([Header <sched.h> not found but required for LXC driver])
+        fi
+
+    ])
+fi
+if test "$with_libvirtd" = "no" ; then
+  with_lxc=no
+fi
+if test "$with_lxc" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled])
+fi
+AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"])
+
+
 dnl
 dnl check for kernel headers required by src/bridge.c
 dnl
@@ -370,10 +462,34 @@ if test "$with_qemu" = "yes" -o "$with_lxc" = "yes" ; then
                    AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt]))
 fi
 
+
+dnl OpenNebula driver Compilation setting
 dnl
-dnl check for kvm headers
-dnl
-AC_CHECK_HEADERS([linux/kvm.h])
+
+XMLRPC_REQUIRED=1.14.0
+
+XMLRPC_CFLAGS=
+XMLRPC_LIBS=
+if test "x$with_one" = "xyes" -o "x$with_one" = "xcheck"; then
+    PKG_CHECK_MODULES(XMLRPC, xmlrpc_client >= $XMLRPC_REQUIRED,
+      [with_one=yes], [
+      if test "x$with_one" = "xcheck" ; then
+          with_one=no
+      else
+          AC_MSG_ERROR(
+            [You must install XMLRPC-C >= $XMLRPC_REQUIRED to compile libvirt ONE driver])
+      fi
+    ])
+    if test "x$with_one" = "xyes" ; then
+        AC_DEFINE_UNQUOTED([HAVE_XMLRPC], 1,
+          [whether One is used to broadcast server presence])
+    fi
+fi
+AM_CONDITIONAL([HAVE_XMLRPC], [test "x$with_one" = "xyes"])
+AM_CONDITIONAL([WITH_ONE], [test "x$with_one" = "xyes"])
+AC_SUBST([XMLRPC_CFLAGS])
+AC_SUBST([XMLRPC_LIBS])
+
 
 dnl Need to test if pkg-config exists
 PKG_PROG_PKG_CONFIG
@@ -492,18 +608,26 @@ if test "x$with_sasl" != "xno"; then
         fail=1
     fi])
   if test "x$with_sasl" != "xno" ; then
-    AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl=yes],[
-      if test "x$with_sasl" = "xcheck" ; then
+    AC_CHECK_LIB([sasl2], [sasl_client_init],[
+      SASL_LIBS="$SASL_LIBS -lsasl2"
+      with_sasl=yes
+    ],[
+      AC_CHECK_LIB([sasl], [sasl_client_init],[
+        SASL_LIBS="$SASL_LIBS -lsasl"
+        with_sasl=yes
+      ],[
+        if test "x$with_sasl" = "xcheck" ; then
           with_sasl=no
-      else
+        else
           fail=1
-      fi])
+        fi
+      ])
+    ])
   fi
   test $fail = 1 &&
     AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile libvirt])
   CFLAGS="$old_cflags"
   LIBS="$old_libs"
-  SASL_LIBS="$SASL_LIBS -lsasl2"
   if test "x$with_sasl" = "xyes" ; then
     AC_DEFINE_UNQUOTED([HAVE_SASL], 1,
       [whether Cyrus SASL is available for authentication])
@@ -616,6 +740,45 @@ AM_CONDITIONAL([HAVE_SELINUX], [test "$with_selinux" != "no"])
 AC_SUBST([SELINUX_CFLAGS])
 AC_SUBST([SELINUX_LIBS])
 
+
+AC_ARG_WITH([secdriver-selinux],
+  [  --with-secdriver-selinux         use SELinux security driver],
+  [],
+  [with_secdriver_selinux=check])
+
+if test "$with_selinux" != "yes" ; then
+  if test "$with_secdriver_selinux" = "check" ; then
+    with_secdriver_selinux=no
+  else
+    AC_MSG_ERROR([You must install the SELinux development package in order to compile libvirt])
+  fi
+else
+  old_cflags="$CFLAGS"
+  old_libs="$LIBS"
+  CFLAGS="$CFLAGS $SELINUX_CFLAGS"
+  LIBS="$CFLAGS $SELINUX_LIBS"
+
+  fail=0
+  AC_CHECK_FUNC([selinux_virtual_domain_context_path], [], [fail=1])
+  AC_CHECK_FUNC([selinux_virtual_image_context_path], [], [fail=1])
+  CFLAGS="$old_cflags"
+  LIBS="$old_libs"
+
+  if test "$fail" = "1" ; then
+    if test "$with_secdriver_selinux" = "check" ; then
+      with_secdriver_selinux=no
+    else
+      AC_MSG_ERROR([You must install the SELinux development package in order to compile libvirt])
+    fi
+  else
+    with_secdriver_selinux=yes
+    AC_DEFINE_UNQUOTED([WITH_SECDRIVER_SELINUX], 1, [whether SELinux security driver is available])
+  fi
+fi
+AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no"])
+
+
+
 dnl NUMA lib
 AC_ARG_WITH([numactl],
   [  --with-numactl         use numactl for host topology info],
@@ -651,6 +814,123 @@ AM_CONDITIONAL([HAVE_NUMACTL], [test "$with_numactl" != "no"])
 AC_SUBST([NUMACTL_CFLAGS])
 AC_SUBST([NUMACTL_LIBS])
 
+
+dnl
+dnl Checks for the UML driver
+dnl
+
+if test "$with_uml" = "yes" -o "$with_uml" = "check"; then
+    AC_CHECK_HEADER([sys/inotify.h], [
+        with_uml=yes
+    ], [
+        if test "$with_uml" = "check"; then
+            with_uml=no
+            AC_MSG_NOTICE([<sys/inotify.h> is required for the UML driver, disabling it])
+        else
+            AC_MSG_ERROR([The <sys/inotify.h> is required for the UML driver. Upgrade your libc6.])
+        fi
+    ])
+fi
+if test "$with_libvirtd" = "no" ; then
+  with_uml=no
+fi
+if test "$with_uml" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_UML], 1, [whether UML driver is enabled])
+fi
+AM_CONDITIONAL([WITH_UML], [test "$with_uml" = "yes"])
+
+
+
+dnl
+dnl libssh checks
+dnl
+
+if test "$with_libssh" != "yes" -a "$with_libssh" != "no"; then
+		libssh_path="$with_libssh"
+elif test "$with_libssh" = "yes"; then
+		libssh_path="/usr/local/lib/"
+elif test "$with_libssh" = "no"; then
+		with_phyp="no";
+fi
+
+if test "$with_phyp" = "check"; then
+  AC_CHECK_LIB([ssh],[ssh_new],[
+        LIBSSH_LIBS="$LIBSSH_LIBS -lssh -L$libssh_path"
+        AC_SUBST([LIBSSH_LIBS])],[
+        with_phyp="no"
+		    with_libssh="no";
+				],[])
+
+	if test "$with_phyp" != "no"; then
+  AC_CHECK_HEADERS([libssh/libssh.h],[
+		    with_phyp="yes"
+        LIBSSH_CFLAGS="-I/usr/local/include/libssh"
+        AC_SUBST([LIBSSH_CFLAGS])
+	      AC_DEFINE_UNQUOTED([WITH_PHYP], 1,
+        [whether IBM HMC / IVM driver is enabled])
+				],[
+        with_phyp="no"
+		    with_libssh="no";
+				],[])
+	fi
+elif test "$with_phyp" = "yes"; then
+  AC_CHECK_LIB([ssh],[ssh_new],[
+        LIBSSH_LIBS="$LIBSSH_LIBS -lssh -L$libssh_path"
+        AC_SUBST([LIBSSH_LIBS])],[
+        AC_MSG_ERROR([You must install the libssh to compile Phype driver.])
+				])
+
+  AC_CHECK_HEADERS([libssh/libssh.h],[
+        LIBSSH_CFLAGS="-I/usr/local/include/libssh"
+        AC_SUBST([LIBSSH_CFLAGS])],[
+        AC_MSG_ERROR([Cannot find libssh headers.Is libssh installed ?])
+				],[])
+  AC_DEFINE_UNQUOTED([WITH_PHYP], 1,
+        [whether IBM HMC / IVM driver is enabled])
+fi
+AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
+
+dnl libcap-ng
+AC_ARG_WITH([capng],
+  [  --with-capng         use libcap-ng to reduce libvirtd privileges],
+  [],
+  [with_capng=check])
+
+dnl
+dnl This check looks for 'capng_updatev' since that was
+dnl introduced in 0.4.0 release which need as minimum
+dnl
+CAPNG_CFLAGS=
+CAPNG_LIBS=
+if test "$with_qemu" = "yes" -a "$with_capng" != "no"; then
+  old_cflags="$CFLAGS"
+  old_libs="$LIBS"
+  if test "$with_capng" = "check"; then
+    AC_CHECK_HEADER([cap-ng.h],[],[with_capng=no])
+    AC_CHECK_LIB([cap-ng], [capng_updatev],[],[with_capng=no])
+    if test "$with_capng" != "no"; then
+      with_capng="yes"
+    fi
+  else
+    fail=0
+    AC_CHECK_HEADER([cap-ng.h],[],[fail=1])
+    AC_CHECK_LIB([cap-ng], [capng_updatev],[],[fail=1])
+    test $fail = 1 &&
+      AC_MSG_ERROR([You must install the capng >= 0.4.0 development package in order to compile and run libvirt])
+  fi
+  CFLAGS="$old_cflags"
+  LIBS="$old_libs"
+fi
+if test "$with_capng" = "yes"; then
+  CAPNG_LIBS="-lcap-ng"
+  AC_DEFINE_UNQUOTED([HAVE_CAPNG], 1, [whether capng is available for privilege reduction])
+fi
+AM_CONDITIONAL([HAVE_CAPNG], [test "$with_capng" != "no"])
+AC_SUBST([CAPNG_CFLAGS])
+AC_SUBST([CAPNG_LIBS])
+
+
+
 dnl virsh libraries
 AC_CHECK_HEADERS([readline/readline.h])
 
@@ -704,10 +984,38 @@ if test "$with_network" = "yes" ; then
 fi
 AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"])
 
+with_bridge=no
+if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then
+    with_bridge=yes
+    AC_DEFINE_UNQUOTED([WITH_BRIDGE], 1, [whether bridge code is needed])
+fi
+AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"])
 
-dnl
-dnl Storage driver checks
-dnl
+dnl netcf library
+AC_ARG_WITH([netcf],
+[  --with-netcf         libnetcf support to configure physical host network interfaces],
+[], [with_netcf=check])
+
+NETCF_CFLAGS=
+NETCF_LIBS=
+if test "$with_netcf" = "yes" -o "$with_netcf" = "check"; then
+  PKG_CHECK_MODULES(NETCF, netcf >= $NETCF_REQUIRED,
+    [with_netcf=yes], [
+    if test "$with_netcf" = "check" ; then
+       with_netcf=no
+    else
+       AC_MSG_ERROR(
+         [You must install libnetcf >= $NETCF_REQUIRED to compile libvirt])
+    fi
+  ])
+  if test "$with_netcf" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_NETCF], 1,
+      [whether libnetcf is available to configure physical host network interfaces])
+  fi
+fi
+AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"])
+AC_SUBST([NETCF_CFLAGS])
+AC_SUBST([NETCF_LIBS])
 
 AC_ARG_WITH([storage-fs],
 [  --with-storage-fs           with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check])
@@ -715,6 +1023,8 @@ AC_ARG_WITH([storage-lvm],
 [  --with-storage-lvm          with LVM backend for the storage driver (on)],[],[with_storage_lvm=check])
 AC_ARG_WITH([storage-iscsi],
 [  --with-storage-iscsi        with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check])
+AC_ARG_WITH([storage-scsi],
+[  --with-storage-scsi         with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check])
 AC_ARG_WITH([storage-disk],
 [  --with-storage-disk         with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check])
 
@@ -724,6 +1034,7 @@ if test "$with_libvirtd" = "no"; then
   with_storage_fs=no
   with_storage_lvm=no
   with_storage_iscsi=no
+  with_storage_scsi=no
   with_storage_disk=no
 fi
 if test "$with_storage_dir" = "yes" ; then
@@ -760,21 +1071,6 @@ if test "$with_storage_fs" = "yes"; then
     [Location or name of the showmount program])
 fi
 
-AC_PATH_PROG([QEMU_IMG], [qemu-img], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
-if test -n "$QEMU_IMG" ; then
-  AC_DEFINE_UNQUOTED([HAVE_QEMU_IMG], 1, [whether qemu-img is available for non-raw files])
-  AC_DEFINE_UNQUOTED([QEMU_IMG],["$QEMU_IMG"],
-      [Location or name of the qemu-img program])
-fi
-
-AC_PATH_PROG([QCOW_CREATE], [qcow-create], [], [$PATH:/sbin:/usr/sbin:/bin:/usr/bin])
-if test -n "$QCOW_CREATE" ; then
-  AC_DEFINE_UNQUOTED([HAVE_QCOW_CREATE], 1, [whether qcow-create is available for non-raw files])
-  AC_DEFINE_UNQUOTED([QCOW_CREATE],["$QCOW_CREATE"],
-      [Location or name of the qcow-create program])
-fi
-
-
 if test "$with_storage_lvm" = "yes" -o "$with_storage_lvm" = "check"; then
   AC_PATH_PROG([PVCREATE], [pvcreate], [], [$PATH:/sbin:/usr/sbin])
   AC_PATH_PROG([VGCREATE], [vgcreate], [], [$PATH:/sbin:/usr/sbin])
@@ -852,6 +1148,13 @@ if test "$with_storage_iscsi" = "yes" -o "$with_storage_iscsi" = "check"; then
 fi
 AM_CONDITIONAL([WITH_STORAGE_ISCSI], [test "$with_storage_iscsi" = "yes"])
 
+if test "$with_storage_scsi" = "check"; then
+   with_storage_scsi=yes
+
+   AC_DEFINE_UNQUOTED([WITH_STORAGE_SCSI], 1,
+     [whether SCSI backend for storage driver is enabled])
+fi
+AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"])
 
 
 LIBPARTED_CFLAGS=
@@ -900,6 +1203,35 @@ AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"])
 AC_SUBST([LIBPARTED_CFLAGS])
 AC_SUBST([LIBPARTED_LIBS])
 
+dnl
+dnl check for libcurl (ESX)
+dnl
+
+LIBCURL_CFLAGS=""
+LIBCURL_LIBS=""
+LIBCURL_REQUIRED="7.18.0"
+LIBCURL_FOUND="no"
+
+if test "$with_esx" = "yes" -o "$with_esx" = "check"; then
+    PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [
+        LIBCURL_FOUND=yes
+        with_esx="yes"
+    ], [
+        if test "$with_esx" = "check"; then
+            with_esx=no
+            AC_MSG_NOTICE([libcurl is required for ESX driver, disabling it])
+        else
+            AC_MSG_ERROR([libcurl >= $LIBCURL_REQUIRED is required for the ESX driver])
+        fi
+    ])
+fi
+if test "$with_esx" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled])
+fi
+AM_CONDITIONAL([WITH_ESX], [test "$with_esx" = "yes"])
+
+AC_SUBST([LIBCURL_CFLAGS])
+AC_SUBST([LIBCURL_LIBS])
 
 dnl
 dnl check for python
@@ -1035,6 +1367,22 @@ if test "${enable_oom}" = yes; then
   AC_DEFINE([TEST_OOM], 1, [Whether malloc OOM checking is enabled])
 fi
 
+
+AC_ARG_ENABLE([test-locking],
+[  --enable-test-locking       thread locking tests using CIL],
+[case "${enableval}" in
+   yes|no) ;;
+   *)      AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;;
+ esac],
+              [enableval=no])
+enable_locking=$enableval
+
+if test "$enable_locking" = "yes"; then
+  LOCK_CHECKING_CFLAGS="-Dbool=char -D_Bool=char -save-temps"
+  AC_SUBST([LOCK_CHECKING_CFLAGS])
+fi
+AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"])
+
 dnl Enable building the proxy?
 
 AC_ARG_WITH([xen-proxy],
@@ -1164,6 +1512,7 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then
     CFLAGS="$CFLAGS $HAL_CFLAGS"
     LDFLAGS="$LDFLAGS $HAL_LIBS"
     AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no])
+    AC_CHECK_FUNCS([dbus_watch_get_unix_fd])
     CFLAGS="$old_CFLAGS"
     LDFLAGS="$old_LDFLAGS"
   fi
@@ -1234,6 +1583,21 @@ then
 fi
 AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"])
 
+AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"])
+
+
+AC_ARG_WITH([qemu-user],
+  [  --with-qemu-user       username to run QEMU system instance as],
+  [QEMU_USER=${withval}],
+  [QEMU_USER=root])
+AC_ARG_WITH([qemu-group],
+  [  --with-qemu-group      groupname to run QEMU system instance as],
+  [QEMU_GROUP=${withval}],
+  [QEMU_GROUP=root])
+AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
+AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
+
+
 # Only COPYING.LIB is under version control, yet COPYING
 # is included as part of the distribution tarball.
 # Copy one to the other, but only if this is a srcdir-build.
@@ -1244,21 +1608,23 @@ cp -f COPYING.LIB COPYING
 AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           docs/examples/Makefile docs/devhelp/Makefile \
 	  docs/examples/python/Makefile \
+	  docs/schemas/Makefile \
 	  gnulib/lib/Makefile \
 	  gnulib/tests/Makefile \
           libvirt.pc libvirt.spec mingw32-libvirt.spec \
-          src/libvirt_sym.version \
           po/Makefile.in \
 	  include/libvirt/Makefile include/libvirt/libvirt.h \
 	  python/Makefile python/tests/Makefile \
           qemud/Makefile \
+          tools/Makefile \
           tests/Makefile proxy/Makefile \
           tests/xml2sexprdata/Makefile \
           tests/sexpr2xmldata/Makefile \
           tests/xmconfigdata/Makefile \
           tests/xencapsdata/Makefile \
           tests/confdata/Makefile \
-          examples/domain-events/events-c/Makefile)
+          examples/domain-events/events-c/Makefile \
+          examples/hellolibvirt/Makefile)
 
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Configuration summary])
@@ -1271,11 +1637,16 @@ AC_MSG_NOTICE([   Proxy: $with_xen_proxy])
 AC_MSG_NOTICE([    QEMU: $with_qemu])
 AC_MSG_NOTICE([     UML: $with_uml])
 AC_MSG_NOTICE([  OpenVZ: $with_openvz])
+AC_MSG_NOTICE([    VBox: $with_vbox])
 AC_MSG_NOTICE([     LXC: $with_lxc])
+AC_MSG_NOTICE([    PHYP: $with_phyp])
+AC_MSG_NOTICE([     ONE: $with_one])
+AC_MSG_NOTICE([     ESX: $with_esx])
 AC_MSG_NOTICE([    Test: $with_test])
 AC_MSG_NOTICE([  Remote: $with_remote])
 AC_MSG_NOTICE([ Network: $with_network])
 AC_MSG_NOTICE([Libvirtd: $with_libvirtd])
+AC_MSG_NOTICE([   netcf: $with_netcf])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Storage Drivers])
 AC_MSG_NOTICE([])
@@ -1284,8 +1655,13 @@ AC_MSG_NOTICE([      FS: $with_storage_fs])
 AC_MSG_NOTICE([   NetFS: $with_storage_fs])
 AC_MSG_NOTICE([     LVM: $with_storage_lvm])
 AC_MSG_NOTICE([   iSCSI: $with_storage_iscsi])
+AC_MSG_NOTICE([    SCSI: $with_storage_scsi])
 AC_MSG_NOTICE([    Disk: $with_storage_disk])
 AC_MSG_NOTICE([])
+AC_MSG_NOTICE([Security Drivers])
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([ SELinux: $with_secdriver_selinux])
+AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Driver Loadable Modules])
 AC_MSG_NOTICE([])
 if test "$with_driver_modules" != "no" ; then
@@ -1297,6 +1673,16 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([  libxml: $LIBXML_CFLAGS $LIBXML_LIBS])
+if test "$with_esx" = "yes" ; then
+AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS])
+else
+AC_MSG_NOTICE([ libcurl: no])
+fi
+if test "$with_libssh" != "no" ; then
+AC_MSG_NOTICE([  libssh: $LIBSSH_CFLAGS $LIBSSH_LIBS])
+else
+AC_MSG_NOTICE([  libssh: no])
+fi
 AC_MSG_NOTICE([  gnutls: $GNUTLS_CFLAGS $GNUTLS_LIBS])
 if test "$with_sasl" != "no" ; then
 AC_MSG_NOTICE([    sasl: $SASL_CFLAGS $SASL_LIBS])
@@ -1314,39 +1700,58 @@ else
 AC_MSG_NOTICE([  polkit: no])
 fi
 if test "$with_selinux" = "yes" ; then
-AC_MSG_NOTICE([  selinux: $SELINUX_CFLAGS $SELINUX_LIBS])
+AC_MSG_NOTICE([ selinux: $SELINUX_CFLAGS $SELINUX_LIBS])
 else
-AC_MSG_NOTICE([  selinux: no])
+AC_MSG_NOTICE([ selinux: no])
 fi
 if test "$with_numactl" = "yes" ; then
-AC_MSG_NOTICE([  numactl: $NUMACTL_CFLAGS $NUMACTL_LIBS])
+AC_MSG_NOTICE([ numactl: $NUMACTL_CFLAGS $NUMACTL_LIBS])
 else
-AC_MSG_NOTICE([  numactl: no])
+AC_MSG_NOTICE([ numactl: no])
+fi
+if test "$with_capng" = "yes" ; then
+AC_MSG_NOTICE([   capng: $CAPNG_CFLAGS $CAPNG_LIBS])
+else
+AC_MSG_NOTICE([   capng: no])
 fi
 if test "$with_xen" = "yes" ; then
-AC_MSG_NOTICE([  xen: $XEN_CFLAGS $XEN_LIBS])
+AC_MSG_NOTICE([     xen: $XEN_CFLAGS $XEN_LIBS])
 else
-AC_MSG_NOTICE([  xen: no])
+AC_MSG_NOTICE([     xen: no])
 fi
 if test "$with_hal" = "yes" ; then
-AC_MSG_NOTICE([  hal: $HAL_CFLAGS $HAL_LIBS])
+AC_MSG_NOTICE([     hal: $HAL_CFLAGS $HAL_LIBS])
 else
-AC_MSG_NOTICE([  hal: no])
+AC_MSG_NOTICE([     hal: no])
 fi
 if test "$with_devkit" = "yes" ; then
 AC_MSG_NOTICE([  devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS])
 else
 AC_MSG_NOTICE([  devkit: no])
 fi
+if test "$with_netcf" = "yes" ; then
+AC_MSG_NOTICE([   netcf: $NETCF_CFLAGS $NETCF_LIBS])
+else
+AC_MSG_NOTICE([   netcf: no])
+fi
+if test "$with_one" = "yes" ; then
+AC_MSG_NOTICE([  xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS])
+else
+AC_MSG_NOTICE([  xmlrpc: no])
+fi
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Test suite])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([  Coverage: $enable_coverage])
+AC_MSG_NOTICE([   Coverage: $enable_coverage])
 AC_MSG_NOTICE([  Alloc OOM: $enable_oom])
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Miscellaneous])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([  Debug: $enable_debug])
+AC_MSG_NOTICE([     Debug: $enable_debug])
 AC_MSG_NOTICE([  Warnings: $enable_compile_warnings])
 AC_MSG_NOTICE([  Readline: $lv_use_readline])
 AC_MSG_NOTICE([])
+AC_MSG_NOTICE([Privileges])
+AC_MSG_NOTICE([])
+AC_MSG_NOTICE([      QEMU: $QEMU_USER:$QEMU_GROUP])
+AC_MSG_NOTICE([])

docs/.cvsignore

@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.memdump
-apibuild.pyc

docs/Goals

@@ -26,4 +26,3 @@ the underlying acual implementation of the hypervisor calls.
    releases of the library.
 
 Daniel Veillard <veillard@redhat.com>
-$Date$

docs/Makefile.am

@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS= . examples devhelp
+SUBDIRS= schemas examples devhelp
 
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR=../src
@@ -29,6 +29,9 @@ png = \
   libvirtLogo.png \
   libvirt-net-logical.png \
   libvirt-net-physical.png \
+  libvirt-daemon-arch.png \
+  libvirt-driver-arch.png \
+  libvirt-object-model.png \
   madeWith.png \
   windows-cygwin-1.png \
   windows-cygwin-2.png \
@@ -43,6 +46,8 @@ gif = \
 dot_html_in = $(wildcard *.html.in)
 dot_html = $(dot_html_in:%.html.in=%.html)
 
+patches = $(wildcard api_extension/*.patch)
+
 xml = \
   libvirt-api.xml \
   libvirt-refs.xml \
@@ -50,27 +55,29 @@ xml = \
   testdomfv0.xml \
   testnetdef.xml \
   testnetpriv.xml \
-  testnode.xml
-
-rng = \
-  libvirt.rng \
-  network.rng
+  testnode.xml \
+  testpool.xml \
+  testvol.xml
 
 fig = \
   libvirt-net-logical.fig \
-  libvirt-net-physical.fig
+  libvirt-net-physical.fig \
+  libvirt-daemon-arch.fig \
+  libvirt-driver-arch.fig \
+  libvirt-object-model.fig
 
 EXTRA_DIST=					\
   libvirt-api.xml libvirt-refs.xml apibuild.py	\
   site.xsl newapi.xsl news.xsl page.xsl	ChangeLog.xsl	\
   $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \
-  $(xml) $(rng) $(fig) $(png) \
+  $(xml) $(fig) $(png) \
+  $(patches) \
   virsh.pod ChangeLog.awk
 
 all: web $(top_builddir)/NEWS $(man_MANS)
 
 virsh.1: virsh.pod
-	pod2man -c "Virtualization Support" $(srcdir)/virsh.pod > $@-t
+	pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" $(srcdir)/virsh.pod > $@-t
 	mv $@-t $@
 	cp $@ $(top_builddir)
 
@@ -87,6 +94,9 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl
 	  name=`echo $@ | sed -e 's/.tmp//'`; \
 	  $(XSLTPROC) --nonet $(top_srcdir)/docs/ChangeLog.xsl $< > $@ || (rm $@ && exit 1) ; fi )
 
+%.png: %.fig
+	convert -rotate 90 $< $@
+
 %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in
 	@(if [ -x $(XSLTPROC) ] ; then \
 	  echo "Generating $@"; \
@@ -117,8 +127,11 @@ libvirt-api.xml libvirt-refs.xml: apibuild.py \
 	-(./apibuild.py)
 
 $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
-	-@(if [ -x $(XSLTPROC) ] ; then \
-	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in > $(top_builddir)/NEWS ; fi );
+	-@(if [ -x $(XSLTPROC) ] ; then				\
+	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl	\
+	     $(top_srcdir)/docs/news.html.in			\
+	   | perl -0777 -pe 's/\n\n+$$/\n/'			\
+	   > $@-t && mv $@-t $@ ; fi );
 
 clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
@@ -130,9 +143,8 @@ rebuild: api all
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
-	-@INSTALL@ -m 0644 $(srcdir)/libvir.html $(srcdir)/FAQ.html \
-	    $(srcdir)/redhat.gif $(srcdir)/Libxml2-Logo-90x34.gif \
-	  $(DESTDIR)$(HTML_DIR)
+	-@INSTALL@ -m 0644 $(srcdir)/FAQ.html \
+	    $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html
 	for h in $(apihtml); do \
 	  $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done

docs/api.html

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

docs/api.html.in

@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<html>
+  <body>
+    <h1>The libvirt API concepts</h1>
+
+    <p> This page describes the main principles and architecture choices
+    behind the definition of the libvirt API:
+    <ul>
+      <li>
+        <a href="#Objects">Objects exposed</a>
+      </li>
+      <li>
+        <a href="#Functions">Functions and naming conventions</a>
+      </li>
+      <li>
+        <a href="#Driver">The drivers</a>
+      </li>
+      <li>
+        <a href="#Remote">Daemon and remote access</a>
+      </li>
+    </ul>
+    <h2><a name="Objects" id="Objects">Objects exposed</a></h2>
+    <p> As defined in the <a href="goals.html">goals section</a>, libvirt
+    API need to expose all the resources needed to manage the virtualization
+    support of recent operating systems. The first object manipulated though
+    the API is <code>virConnectPtr</code> which represent a connection to
+    an hypervisor. Any application using libvirt is likely to start using the
+    API by calling one of <a href="html/libvirt-libvirt.html#virConnectOpen"
+    >the virConnectOpen functions</a>. You will note that those functions take
+    a name argument which is actually an URI to select the right hypervisor to
+    open, this is needed to allow remote connections and also select between
+    different possible hypervisors (for example on a Linux system it may be
+    possible to use both KVM and LinuxContainers on the same node). A NULL
+    name will default to a preselected hypervisor but it's probably not a
+    wise thing to do in most cases. See the <a href="uri.html">connection
+    URI</a> page for a full descriptions of the values allowed.<p>
+    <p> Once the application obtained a <code class='docref'>virConnectPtr</code>
+    connection to the
+    hypervisor it can then use it to manage domains and related resources
+    available for virtualization like storage and networking. All those are
+    exposed as first class objects, and connected to the hypervisor connection
+    (and the node or cluster where it is available).</p>
+    <p class="image">
+      <img alt="first class objects exposed by the API"
+           src="libvirt-object-model.png"/>
+    </p>
+    <p> The figure above shows the five main objects exported by the API:</p>
+    <ul>
+      <li>virConnectPtr: represent a connection to an hypervisor.</li>
+      <li>virDomainPtr: represent one domain either active or defined (i.e.
+      existing as permanent config file and storage but not currently running
+      on that node). The function <code class='docref'>virConnectListDomains</code>
+      allows to list all the IDs for the domains active on this hypervisor.</li>
+      <li>virNetworkPtr: represent one network either active or defined (i.e.
+      existing as permanent config file and storage but not currently activated.
+      The function <code class='docref'>virConnectListNetworks</code>
+      allows to list all the virtualization networks actived on this node.</li>
+      <li>virStorageVolPtr: represent one storage volume, usually this is used
+      as a block device available to one of the domains. The function
+      <code class="docref">virStorageVolLookupByPath</code> allows to find
+      the object based on its path on the node.</li>
+      <li>virStoragePoolPtr: represent a storage pool, i.e. a logical area
+      which can be used to allocate and store storage volumes. The function
+      <code class="docref">virStoragePoolLookupByVolume</code> allows to find
+      the storage pool containing a given storage volume.</li>
+    </ul>
+    <p> Most object manipulated by the library can also be represented using
+      XML descriptions. This is used primarily to create those object, but is
+      also helpful to modify or save their description back.</p>
+    <p> Domains, network and storage pools can be either <code>active</code>
+      i.e. either running or available for immediate use, or
+      <code>defined</code> in which case they are inactive but there is
+      a permanent definition available in the system for them. Based on this
+      thay can be activated dynamically in order to be used.</p>
+    <p> Most kind of object can also be named in various ways:<p>
+    <ul>
+      <li>by their <code>name</code>, an user friendly identifier but
+      whose unicity cannot be garanteed between two nodes.</li>
+      <li>by their <code>ID</code>, which is a runtime unique identifier
+      provided by the hypervisor for one given activation of the object,
+      but it becomes invalid once the resource is deactivated.</li >
+      <li>by their <code>UUID</code>, a 16 bytes unique identifier
+      as defined in <a href="http://www.ietf.org/rfc/rfc4122.txt">RFC 4122</a>,
+      which is garanteed to be unique for long term usage and across a
+      set of nodes.</li>
+    </ul>
+    
+    <h2><a name="Functions" id="Functions">Functions and naming
+      conventions</a></h2>
+    <p> The naming of the functions present in the library is usually
+      made of a prefix describing the object associated to the function
+      and a verb describing the action on that object.</p>
+    <p> For each first class object you will find apis
+      for the following actions:</p>
+    <ul>
+      <li><b>Lookup</b>:...LookupByName, 
+      <li><b>Enumeration</b>:virConnectList... and virConnectNumOf...:
+        those are used to enumerate a set of object available to an given
+        hypervisor connection like:
+        <code class='docref'>virConnectListDomains</code>,
+        <code class='docref'>virConnectNumOfDomains</code>,
+        <code class='docref'>virConnectListNetworks</code>,
+        <code class='docref'>virConnectListStoragePools</code>, etc.</li>
+      <li><b>Description</b>: ...GetInfo: those are generic accessor providing
+        a set of informations about an object, they are
+        <code class='docref'>virNodeGetInfo</code>,
+        <code class='docref'>virDomainGetInfo</code>,
+        <code class='docref'>virStoragePoolGetInfo</code>,
+        <code class='docref'>virStorageVolGetInfo</code>.</li>
+      <li><b>Accessors</b>: ...Get... and ...Set...: those are more specific
+        accessors to query or modify the given object, like
+        <code class='docref'>virConnectGetType</code>,
+        <code class='docref'>virDomainGetMaxMemory</code>,
+        <code class='docref'>virDomainSetMemory</code>,
+        <code class='docref'>virDomainGetVcpus</code>,
+        <code class='docref'>virStoragePoolSetAutostart</code>,
+        <code class='docref'>virNetworkGetBridgeName</code>, etc.</li>
+      <li><b>Creation</b>: </li>
+      <li><b>Destruction</b>: ... </li>
+    </ul>
+    <p> For more in-depth details of the storage related APIs see
+      <a href="storage.html">the storage management page</a>, 
+    <h2><a name="Driver" id="Driver">The libvirt drivers</a></h2>
+    <p></p>
+    <p class="image">
+      <img alt="The libvirt driver architecture"
+           src="libvirt-driver-arch.png"/>
+    </p>
+    <h2><a name="Remote" id="Remote">Daemon and remote access</a></h2>
+    <p></p>
+    <p class="image">
+      <img alt="The libvirt daemon and remote architecture"
+           src="libvirt-daemon-arch.png"/>
+    </p>
+  </body>
+</html>

docs/api_extension.html

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

docs/api_extension.html.in

@@ -0,0 +1,302 @@
+<html>
+  <head>
+    <title>Implementing a new API in Libvirt</title>
+  </head>
+
+  <body>
+    <h1>Implementing a new API in Libvirt</h1>
+
+    <ul id="toc"></ul>
+
+    <p>
+      This document walks you through the process of implementing a new
+      API in libvirt.  It uses as an example the addition of the node device
+      create and destroy APIs.
+    </p>
+
+    <p>
+      Before you begin coding, it is critical that you propose your
+      changes on the libvirt mailing list and get feedback on your ideas to
+      make sure what you're proposing fits with the general direction of the
+      project.  Even before doing a proof of concept implementation, send an
+      email giving an overview of the functionality you think should be
+      added to libvirt.  Someone may already be working on the feature you
+      want.  Also, recognize that everything you write is likely to undergo
+      significant rework as you discuss it with the other developers, so
+      don't wait too long before getting feedback.
+    </p>
+
+    <p>
+      Adding a new API to libvirt is not difficult, but there are quite a
+      few steps.  This document assumes that you are familiar with C
+      programming and have checked out the libvirt code from the source code
+      repository and successfully built the existing tree.  Instructions on
+      how to check out and build the code can be found at:
+    </p>
+
+    <p>
+      <a href="http://libvirt.org/downloads.html">http://libvirt.org/downloads.html</a>
+    </p>
+
+    <p>
+      Once you have a working development environment, the steps to create a
+      new API are:
+    </p>
+    <ol>
+      <li>define the public API</li>
+      <li>define the internal driver API</li>
+      <li>implement the public API</li>
+      <li>define the wire protocol format</li>
+      <li>implement the RPC client</li>
+      <li>implement the server side dispatcher</li>
+      <li>implement the driver methods</li>
+      <li>add virsh support</li>
+    </ol>
+
+    <p>
+      It is, of course, possible to implement the pieces in any order, but
+      if the development tasks are completed in the order listed, the code
+      will compile after each step.  Given the number of changes required,
+      verification after each step is highly recommended.
+    </p>
+
+    <p>
+      Submit new code in the form shown in the example code: one patch
+      per step.  That's not to say submit patches before you have working
+      functionality--get the whole thing working and make sure you're happy
+      with it.  Then use git or some other version control system that lets
+      you rewrite your commit history and break patches into pieces so you
+      don't drop a big blob of code on the mailing list at one go.  For
+      example, I didn't follow my own advice when I originally submitted the
+      example code to the libvirt list but rather submitted it in several
+      large chunks.  I've used git's ability to rewrite my commit history to
+      break the code apart into the example patches shown.
+    </p>
+
+    <p>
+      Don't mix anything else into the patches you submit.  The patches
+      should be the minimal changes required to implement the functionality
+      you're adding.  If you notice a bug in unrelated code (i.e., code you
+      don't have to touch to implement your API change) during development,
+      create a patch that just addresses that bug and submit it
+      separately.
+    </p>
+
+    <p>With that said, let's begin.</p>
+
+    <h2><a name='publicapi'>Defining the public API</a></h2>
+
+    <p>The first task is to define the public API and add it to:</p>
+
+    <p><code>include/libvirt/libvirt.h.in</code></p>
+
+    <p>
+      This task is in many ways the most important to get right, since once
+      the API has been committed to the repository, it's libvirt's policy
+      never to change it.  Mistakes in the implementation are bugs that you
+      can fix.  Make a mistake in the API definition and you're stuck with
+      it, so think carefully about the interface and don't be afraid to
+      rework it as you go through the process of implementing it.
+    </p>
+
+    <p>Once you have defined the API, you have to add the symbol names to:</p>
+
+    <p><code>src/libvirt_public.syms</code></p>
+
+    <p class="example">See <a href="api_extension/0001-Step-1-of-8-Define-the-public-API.patch">0001-Step-1-of-8-Define-the-public-API.patch</a> for example code.</p>
+
+
+    <h2><a name='internalapi'>Defining the internal API</a></h2>
+
+    <p>
+      Each public API call is associated with a driver, such as a host
+      virtualization driver, a network virtualization driver, a storage
+      virtualization driver, a state driver, or a device monitor.  Adding
+      the internal API is ordinarily a matter of adding a new member to the
+      struct representing one of these drivers.
+    </p>
+
+    <p>
+      Of course, it's possible that the new API will involve the creation of
+      an entire new driver type, in which case the changes will include the
+      creation of a new struct type to represent the new driver type.
+    </p>
+
+    <p>The driver structs are defined in:</p>
+
+    <p><code>src/driver.h</code></p>
+
+    <p>
+      To define the internal API, first typedef the driver function
+      prototype and then add a new field for it to the relevant driver
+      struct.
+    </p>
+
+    <p class="example">See <a href="api_extension/0002-Step-2-of-8-Define-the-internal-driver-API.patch">0002-Step-2-of-8-Define-the-internal-driver-API.patch</a></p>
+
+    <h2><a name='implpublic'>Implementing the public API</a></h2>
+
+    <p>
+      Implementing the public API is largely a formality in which we wire up
+      public API to the internal driver API.  The public API implementation
+      takes care of some basic validity checks before passing control to the
+      driver implementation.  In RFC 2119 vocabulary, this function:
+    </p>
+
+    <ol class="ordinarylist">
+      <li>SHOULD log a message with VIR_DEBUG() indicating that it is
+	being called and its parameters;</li>
+      <li>MUST call virResetLastError();</li>
+      <li>SHOULD confirm that the connection is valid with
+	VIR_IS_CONNECT(conn);</li>
+      <li><strong>SECURITY: If the API requires a connection with write
+	  privileges, MUST confirm that the connection flags do not
+	  indicate that the connection is read-only;</strong></li>
+      <li>SHOULD do basic validation of the parameters that are being
+	passed in;</li>
+      <li>MUST confirm that the driver for this connection exists and that
+	it implements this function;</li>
+      <li>MUST call the internal API;</li>
+      <li>SHOULD log a message with VIR_DEBUG() indicating that it is
+	returning, its return value, and status.</li>
+      <li>MUST return status to the caller.</li>
+    </ol>
+
+    <p>The public API calls are implemented in:</p>
+
+    <p><code>src/libvirt.c</code></p>
+
+    <p class="example">See <a href="api_extension/0003-Step-3-of-8-Implement-the-public-API.patch">0003-Step-3-of-8-Implement-the-public-API.patch</a></p>
+
+
+    <h2><a name='wireproto'>Defining the wire protocol format</a></h2>
+
+    <p>
+      Defining the wire protocol is essentially a straightforward exercise
+      which is probably most easily understood by referring to the existing
+      remote protocol wire format definitions and the example patch.  It
+      involves making two additions to:
+    </p>
+
+    <p><code>qemud/remote_protocol.x</code></p>
+
+    <p>
+      First, create two new structs for each new function that you're adding
+      to the API.  One struct describes the parameters to be passed to the
+      remote function, and a second struct describes the value returned by
+      the remote function.  The one exception to this rule is that functions
+      that return only integer status do not require a struct for returned
+      data.
+    </p>
+
+    <p>
+      Second, add values to the remote_procedure enum for each new function
+      added to the API.
+    </p>
+
+    <p class="example">See <a href="api_extension/0004-Step-4-of-8-Define-the-wire-protocol-format.patch">0004-Step-4-of-8-Define-the-wire-protocol-format.patch</a></p>
+
+    <p>
+      Once these changes are in place, it's necessary to run 'make rpcgen'
+      in the qemud directory to create the .c and .h files required by the
+      remote protocol code. This must be done on a Linux host using the
+      GLibC rpcgen program. Other rpcgen versions may generate code which
+      results in bogus compile time warnings
+    </p>
+
+
+    <h2><a name='rpcclient'>Implement the RPC client</a></h2>
+
+    <p>
+      Implementing the RPC client is also relatively mechanical, so refer to
+      the exising code and example patch for guidance.  The RPC client uses
+      the rpcgen generated .h files.  The remote method calls go in:
+    </p>
+
+    <p><code>src/remote_internal.c</code></p>
+
+    <p>Each remote method invocation does the following:</p>
+
+    <ol class="ordinarylist">
+      <li>locks the remote driver;</li>
+      <li>sets up the method arguments;</li>
+      <li>invokes the remote function;</li>
+      <li>checks the return value, if necessary;</li>
+      <li>extracts any returned data;</li>
+      <li>frees any returned data;</li>
+      <li>unlocks the remote driver.</li>
+    </ol>
+
+    <p>
+      Once you have created the remote method calls, you have to add fields
+      for them to the driver structs for the appropriate remote driver.
+    </p>
+
+    <p class="example">See <a href="api_extension/0005-Step-5-of-8-Implement-the-RPC-client.patch">0005-Step-5-of-8-Implement-the-RPC-client.patch</a></p>
+
+    <h2><a name="serverdispatch">Implement the server side dispatcher</a></h2>
+
+    <p>
+      Implementing the server side of the remote function calls is simply a
+      matter of deserializing the parameters passed in from the remote
+      caller and passing them to the corresponding internal API function.
+      The server side dispatchers are implemented in:
+    </p>
+
+    <p><code>qemud/remote.c</code></p>
+
+    <p>Again, this step uses the .h files generated by make rpcgen.</p>
+
+    <p class="example">See <a href="api_extension/0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch">0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch</a></p>
+
+
+    <h2><a name="driverimpl">Implement the driver methods</a></h2>
+
+    <p>
+      So, after all that, we get to the fun part.  All functionality in
+      libvirt is implemented inside a driver.  Thus, here is where you
+      implement whatever functionality you're adding to libvirt.  You'll
+      either need to add additional files to the src directory or extend
+      files that are already there, depending on what functionality you're
+      adding.
+    </p>
+
+    <p>
+      In the example code, the extension is only an additional two function
+      calls in the node device API, so most of the new code is additions to
+      existing files.  The only new files are there for multi-platform
+      implementation convenience, as some of the new code is Linux specific.
+    </p>
+
+    <p>
+      The example code is probably uninteresting unless you're concerned
+      with libvirt storage, but I've included it here to show how new files
+      are added to the build environment.
+    </p>
+
+    <p class="example">See <a href="api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch">0007-Step-7-of-8-Implement-the-driver-methods.patch</a></p>
+
+    <h2><a name="virsh">Implement virsh commands</a></h2>
+
+    <p>
+      Once you have the new functionality in place, the easiest way to test
+      it and also to provide it to end users is to implement support for it
+      in virsh.
+    </p>
+
+    <p>
+      A virsh command is composed of a few pieces of code.  You need to
+      define an array of vshCmdInfo structs for each new command that
+      contain the help text and the command description text.  You also need
+      an array of vshCmdOptDef structs to describe the command options.
+      Once you have those pieces of data in place you can write the function
+      implementing the virsh command.  Finally, you need to add the new
+      command to the commands[] array.
+    </p>
+
+    <p class="example">See <a href="api_extension/0008-Step-8-of-8-Add-virsh-support.patch">0008-Step-8-of-8-Add-virsh-support.patch</a></p>
+
+    <p>Once you have working functionality, run make check and make
+      syntax-check before generating patches.</p>
+  </body>
+</html>

docs/api_extension/0001-Step-1-of-8-Define-the-public-API.patch

@@ -0,0 +1,44 @@
+From 2ae8fd62a1e5e085b7902da9bc207b806d84fd91 Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:16:11 -0400
+Subject: [PATCH] Step 1 of 8 Define the public API
+
+---
+ include/libvirt/libvirt.h.in |    6 ++++++
+ src/libvirt_public.syms      |    6 ++++++
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
+index a028b21..2f7076f 100644
+--- a/include/libvirt/libvirt.h.in
++++ b/include/libvirt/libvirt.h.in
+@@ -1124,6 +1124,12 @@ int                     virNodeDeviceDettach    (virNodeDevicePtr dev);
+ int                     virNodeDeviceReAttach   (virNodeDevicePtr dev);
+ int                     virNodeDeviceReset      (virNodeDevicePtr dev);
+ 
++virNodeDevicePtr        virNodeDeviceCreateXML  (virConnectPtr conn,
++                                                 const char *xmlDesc,
++                                                 unsigned int flags);
++
++int                     virNodeDeviceDestroy    (virNodeDevicePtr dev);
++
+ /*
+  * Domain Event Notification
+  */
+diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
+index f7ebbc3..b8f9128 100644
+--- a/src/libvirt_public.syms
++++ b/src/libvirt_public.syms
+@@ -258,4 +258,10 @@ LIBVIRT_0.6.1 {
+ 	virNodeGetSecurityModel;
+ } LIBVIRT_0.6.0;
+ 
++LIBVIRT_0.6.3 {
++    global:
++	virNodeDeviceCreateXML;
++	virNodeDeviceDestroy;
++} LIBVIRT_0.6.1;
++
+ # .... define new API here using predicted next version number ....
+-- 
+1.6.0.6

docs/api_extension/0002-Step-2-of-8-Define-the-internal-driver-API.patch

@@ -0,0 +1,36 @@
+From b26d7fc2d64e7e6e4d3ea2b43361015d3620d7a6 Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:19:14 -0400
+Subject: [PATCH] Step 2 of 8 Define the internal driver API
+
+---
+ src/driver.h |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/driver.h b/src/driver.h
+index 39dc413..c357b76 100644
+--- a/src/driver.h
++++ b/src/driver.h
+@@ -684,6 +684,11 @@ typedef int (*virDevMonDeviceListCaps)(virNodeDevicePtr dev,
+                                        char **const names,
+                                        int maxnames);
+ 
++typedef virNodeDevicePtr (*virDrvNodeDeviceCreateXML)(virConnectPtr conn,
++                                                      const char *xmlDesc,
++                                                      unsigned int flags);
++typedef int (*virDrvNodeDeviceDestroy)(virNodeDevicePtr dev);
++
+ /**
+  * _virDeviceMonitor:
+  *
+@@ -702,6 +707,8 @@ struct _virDeviceMonitor {
+     virDevMonDeviceGetParent deviceGetParent;
+     virDevMonDeviceNumOfCaps deviceNumOfCaps;
+     virDevMonDeviceListCaps deviceListCaps;
++    virDrvNodeDeviceCreateXML deviceCreateXML;
++    virDrvNodeDeviceDestroy deviceDestroy;
+ };
+ 
+ /*
+-- 
+1.6.0.6

docs/api_extension/0003-Step-3-of-8-Implement-the-public-API.patch

@@ -0,0 +1,119 @@
+From fc585594a207dfb9149e7d3d01c9eb1c79b6d52d Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:22:23 -0400
+Subject: [PATCH] Step 3 of 8 Implement the public API
+
+---
+ src/libvirt.c |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 97 insertions(+), 0 deletions(-)
+
+diff --git a/src/libvirt.c b/src/libvirt.c
+index f3d4484..ded18a7 100644
+--- a/src/libvirt.c
++++ b/src/libvirt.c
+@@ -7509,6 +7509,103 @@ error:
+ }
+ 
+ 
++/**
++ * virNodeDeviceCreateXML:
++ * @conn: pointer to the hypervisor connection
++ * @xmlDesc: string containing an XML description of the device to be created
++ * @flags: callers should always pass 0
++ *
++ * Create a new device on the VM host machine, for example, virtual
++ * HBAs created using vport_create.
++ *
++ * Returns a node device object if successful, NULL in case of failure
++ */
++virNodeDevicePtr
++virNodeDeviceCreateXML(virConnectPtr conn,
++                       const char *xmlDesc,
++                       unsigned int flags)
++{
++    VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%d", conn, xmlDesc, flags);
++
++    virResetLastError();
++
++    if (!VIR_IS_CONNECT(conn)) {
++        virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__);
++        return NULL;
++    }
++
++    if (conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
++
++    if (xmlDesc == NULL) {
++        virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
++        goto error;
++    }
++
++    if (conn->deviceMonitor &&
++        conn->deviceMonitor->deviceCreateXML) {
++        virNodeDevicePtr dev = conn->deviceMonitor->deviceCreateXML(conn, xmlDesc, flags);
++        if (dev == NULL)
++            goto error;
++        return dev;
++    }
++
++    virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
++
++error:
++    /* Copy to connection error object for back compatability */
++    virSetConnError(conn);
++    return NULL;
++}
++
++
++/**
++ * virNodeDeviceDestroy:
++ * @dev: a device object
++ *
++ * Destroy the device object. The virtual device is removed from the host operating system.
++ * This function may require privileged access
++ *
++ * Returns 0 in case of success and -1 in case of failure.
++ */
++int
++virNodeDeviceDestroy(virNodeDevicePtr dev)
++{
++    DEBUG("dev=%p", dev);
++
++    virResetLastError();
++
++    if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) {
++        virLibNodeDeviceError(NULL, VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__);
++        return (-1);
++    }
++
++    if (dev->conn->flags & VIR_CONNECT_RO) {
++        virLibConnError(dev->conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
++        goto error;
++    }
++
++    if (dev->conn->deviceMonitor &&
++        dev->conn->deviceMonitor->deviceDestroy) {
++        int retval = dev->conn->deviceMonitor->deviceDestroy(dev);
++        if (retval < 0) {
++            goto error;
++        }
++
++        return 0;
++    }
++
++    virLibConnError (dev->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
++
++error:
++    /* Copy to connection error object for back compatability */
++    virSetConnError(dev->conn);
++    return -1;
++}
++
++
+ /*
+  * Domain Event Notification
+  */
+-- 
+1.6.0.6

docs/api_extension/0004-Step-4-of-8-Define-the-wire-protocol-format.patch

@@ -0,0 +1,47 @@
+From bce8f1243b0454c0d70e3db832a039d22faab09a Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Wed, 20 May 2009 13:58:58 -0400
+Subject: [PATCH] Step 4 of 8 Define the wire protocol format
+
+---
+ qemud/remote_protocol.x |   18 +++++++++++++++++-
+ 1 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/qemud/remote_protocol.x b/qemud/remote_protocol.x
+index 2d8e6a2..2c79949 100644
+--- a/qemud/remote_protocol.x
++++ b/qemud/remote_protocol.x
+@@ -1109,6 +1109,19 @@ struct remote_node_device_reset_args {
+     remote_nonnull_string name;
+ };
+ 
++struct remote_node_device_create_xml_args {
++    remote_nonnull_string xml_desc;
++    int flags;
++};
++
++struct remote_node_device_create_xml_ret {
++    remote_nonnull_node_device dev;
++};
++
++struct remote_node_device_destroy_args {
++    remote_nonnull_string name;
++};
++
+ 
+ /**
+  * Events Register/Deregister:
+@@ -1270,7 +1283,10 @@ enum remote_procedure {
+     REMOTE_PROC_NODE_DEVICE_RESET = 120,
+ 
+     REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL = 121,
+-    REMOTE_PROC_NODE_GET_SECURITY_MODEL = 122
++    REMOTE_PROC_NODE_GET_SECURITY_MODEL = 122,
++
++    REMOTE_PROC_NODE_DEVICE_CREATE_XML = 123,
++    REMOTE_PROC_NODE_DEVICE_DESTROY = 124
+ };
+ 
+ /* Custom RPC structure. */
+-- 
+1.6.0.6

docs/api_extension/0005-Step-5-of-8-Implement-the-RPC-client.patch

@@ -0,0 +1,84 @@
+From ff272552c297966ace3492aefe91fc830152251a Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:26:12 -0400
+Subject: [PATCH] Step 5 of 8 Implement the RPC client
+
+---
+ src/remote_internal.c |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 55 insertions(+), 0 deletions(-)
+
+diff --git a/src/remote_internal.c b/src/remote_internal.c
+index 4b3afb0..e665ef8 100644
+--- a/src/remote_internal.c
++++ b/src/remote_internal.c
+@@ -4978,6 +4978,59 @@ done:
+ }
+ 
+ 
++static virNodeDevicePtr
++remoteNodeDeviceCreateXML(virConnectPtr conn,
++                          const char *xmlDesc,
++                          unsigned int flags)
++{
++    remote_node_device_create_xml_args args;
++    remote_node_device_create_xml_ret ret;
++    virNodeDevicePtr dev = NULL;
++    struct private_data *priv = conn->privateData;
++
++    remoteDriverLock(priv);
++
++    memset(&ret, 0, sizeof ret);
++    args.xml_desc = (char *)xmlDesc;
++    args.flags = flags;
++
++    if (call(conn, priv, 0, REMOTE_PROC_NODE_DEVICE_CREATE_XML,
++             (xdrproc_t) xdr_remote_node_device_create_xml_args, (char *) &args,
++             (xdrproc_t) xdr_remote_node_device_create_xml_ret, (char *) &ret) == -1)
++        goto done;
++
++    dev = get_nonnull_node_device(conn, ret.dev);
++    xdr_free ((xdrproc_t) xdr_remote_node_device_create_xml_ret, (char *) &ret);
++
++done:
++    remoteDriverUnlock(priv);
++    return dev;
++}
++
++static int
++remoteNodeDeviceDestroy(virNodeDevicePtr dev)
++{
++    int rv = -1;
++    remote_node_device_destroy_args args;
++    struct private_data *priv = dev->conn->privateData;
++
++    remoteDriverLock(priv);
++
++    args.name = dev->name;
++
++    if (call(dev->conn, priv, 0, REMOTE_PROC_NODE_DEVICE_DESTROY,
++             (xdrproc_t) xdr_remote_node_device_destroy_args, (char *) &args,
++             (xdrproc_t) xdr_void, (char *) NULL) == -1)
++        goto done;
++
++    rv = 0;
++
++done:
++    remoteDriverUnlock(priv);
++    return rv;
++}
++
++
+ /*----------------------------------------------------------------------*/
+ 
+ static int
+@@ -6982,6 +7035,8 @@ static virDeviceMonitor dev_monitor = {
+     .deviceGetParent = remoteNodeDeviceGetParent,
+     .deviceNumOfCaps = remoteNodeDeviceNumOfCaps,
+     .deviceListCaps = remoteNodeDeviceListCaps,
++    .deviceCreateXML = remoteNodeDeviceCreateXML,
++    .deviceDestroy = remoteNodeDeviceDestroy
+ };
+ 
+ 
+-- 
+1.6.0.6

docs/api_extension/0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch

@@ -0,0 +1,70 @@
+From 4c5166df583459574526841234d61d6ae5be19a0 Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:26:55 -0400
+Subject: [PATCH] Step 6 of 8 Implement the server side dispatcher
+
+---
+ qemud/remote.c |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 48 insertions(+), 0 deletions(-)
+
+diff --git a/qemud/remote.c b/qemud/remote.c
+index e27820f..8d24a3a 100644
+--- a/qemud/remote.c
++++ b/qemud/remote.c
+@@ -4323,6 +4323,54 @@ remoteDispatchNodeDeviceReset (struct qemud_server *server ATTRIBUTE_UNUSED,
+ }
+ 
+ 
++static int
++remoteDispatchNodeDeviceCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED,
++                                  struct qemud_client *client ATTRIBUTE_UNUSED,
++                                  virConnectPtr conn,
++                                  remote_error *rerr,
++                                  remote_node_device_create_xml_args *args,
++                                  remote_node_device_create_xml_ret *ret)
++{
++    virNodeDevicePtr dev;
++
++    dev = virNodeDeviceCreateXML (conn, args->xml_desc, args->flags);
++    if (dev == NULL) {
++        remoteDispatchConnError(rerr, conn);
++        return -1;
++    }
++
++    make_nonnull_node_device (&ret->dev, dev);
++    virNodeDeviceFree(dev);
++
++    return 0;
++}
++
++
++static int
++remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED,
++                                struct qemud_client *client ATTRIBUTE_UNUSED,
++                                virConnectPtr conn,
++                                remote_error *rerr,
++                                remote_node_device_destroy_args *args,
++                                void *ret ATTRIBUTE_UNUSED)
++{
++    virNodeDevicePtr dev;
++
++    dev = virNodeDeviceLookupByName(conn, args->name);
++    if (dev == NULL) {
++        remoteDispatchFormatError(rerr, "%s", _("node_device not found"));
++        return -1;
++    }
++
++    if (virNodeDeviceDestroy(dev) == -1) {
++        remoteDispatchConnError(rerr, conn);
++        return -1;
++    }
++
++    return 0;
++}
++
++
+ /**************************
+  * Async Events
+  **************************/
+-- 
+1.6.0.6

docs/api_extension/0008-Step-8-of-8-Add-virsh-support.patch

@@ -0,0 +1,132 @@
+From 193cc4abbb6c2fc5557d3699f86ff0103d5a21ef Mon Sep 17 00:00:00 2001
+From: David Allan <dallan@redhat.com>
+Date: Tue, 19 May 2009 16:47:31 -0400
+Subject: [PATCH 8/8] Step 8 of 8 Add virsh support
+
+---
+ src/virsh.c |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 103 insertions(+), 0 deletions(-)
+
+diff --git a/src/virsh.c b/src/virsh.c
+index cb32ede..ab2a2b7 100644
+--- a/src/virsh.c
++++ b/src/virsh.c
+@@ -2962,6 +2962,107 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd)
+ 
+ 
+ /*
++ * "nodedev-create" command
++ */
++static const vshCmdInfo info_node_device_create[] = {
++    {"help", gettext_noop("create a device defined "
++                          "by an XML file on the node")},
++    {"desc", gettext_noop("Create a device on the node.  Note that this "
++                          "command creates devices on the physical host "
++                          "that can then be assigned to a virtual machine.")},
++    {NULL, NULL}
++};
++
++static const vshCmdOptDef opts_node_device_create[] = {
++    {"file", VSH_OT_DATA, VSH_OFLAG_REQ,
++     gettext_noop("file containing an XML description of the device")},
++    {NULL, 0, 0, NULL}
++};
++
++static int
++cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd)
++{
++    virNodeDevicePtr dev = NULL;
++    char *from;
++    int found = 0;
++    int ret = TRUE;
++    char *buffer;
++
++    if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
++        return FALSE;
++
++    from = vshCommandOptString(cmd, "file", &found);
++    if (!found) {
++        return FALSE;
++    }
++
++    if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) {
++        return FALSE;
++    }
++
++    dev = virNodeDeviceCreateXML(ctl->conn, buffer, 0);
++    free (buffer);
++
++    if (dev != NULL) {
++        vshPrint(ctl, _("Node device %s created from %s\n"),
++                 virNodeDeviceGetName(dev), from);
++    } else {
++        vshError(ctl, FALSE, _("Failed to create node device from %s"), from);
++        ret = FALSE;
++    }
++
++    return ret;
++}
++
++
++/*
++ * "nodedev-destroy" command
++ */
++static const vshCmdInfo info_node_device_destroy[] = {
++    {"help", gettext_noop("destroy a device on the node")},
++    {"desc", gettext_noop("Destroy a device on the node.  Note that this "
++                          "command destroys devices on the physical host ")},
++    {NULL, NULL}
++};
++
++static const vshCmdOptDef opts_node_device_destroy[] = {
++    {"name", VSH_OT_DATA, VSH_OFLAG_REQ,
++     gettext_noop("name of the device to be destroyed")},
++    {NULL, 0, 0, NULL}
++};
++
++static int
++cmdNodeDeviceDestroy(vshControl *ctl, const vshCmd *cmd)
++{
++    virNodeDevicePtr dev = NULL;
++    int ret = TRUE;
++    int found = 0;
++    char *name;
++
++    if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) {
++        return FALSE;
++    }
++
++    name = vshCommandOptString(cmd, "name", &found);
++    if (!found) {
++        return FALSE;
++    }
++
++    dev = virNodeDeviceLookupByName(ctl->conn, name);
++
++    if (virNodeDeviceDestroy(dev) == 0) {
++        vshPrint(ctl, _("Destroyed node device '%s'\n"), name);
++    } else {
++        vshError(ctl, FALSE, _("Failed to destroy node device '%s'"), name);
++        ret = FALSE;
++    }
++
++    virNodeDeviceFree(dev);
++    return ret;
++}
++
++
++/*
+  * XML Building helper for pool-define-as and pool-create-as
+  */
+ static const vshCmdOptDef opts_pool_X_as[] = {
+@@ -5895,6 +5996,8 @@ static const vshCmdDef commands[] = {
+     {"nodedev-dettach", cmdNodeDeviceDettach, opts_node_device_dettach, info_node_device_dettach},
+     {"nodedev-reattach", cmdNodeDeviceReAttach, opts_node_device_reattach, info_node_device_reattach},
+     {"nodedev-reset", cmdNodeDeviceReset, opts_node_device_reset, info_node_device_reset},
++    {"nodedev-create", cmdNodeDeviceCreate, opts_node_device_create, info_node_device_create},
++    {"nodedev-destroy", cmdNodeDeviceDestroy, opts_node_device_destroy, info_node_device_destroy},
+ 
+     {"pool-autostart", cmdPoolAutostart, opts_pool_autostart, info_pool_autostart},
+     {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build},
+-- 
+1.6.0.6

docs/apibuild.py

@@ -27,6 +27,9 @@ included_files = {
 ignored_words = {
   "ATTRIBUTE_UNUSED": (0, "macro keyword"),
   "VIR_DEPRECATED": (0, "macro keyword"),
+  "WINAPI": (0, "Windows keyword"),
+  "__declspec": (3, "Windows keyword"),
+  "__stdcall": (0, "Windows keyword"),
 }
 
 ignored_functions = {
@@ -36,6 +39,7 @@ ignored_functions = {
   "virDomainMigratePrepare": "private function for migration",
   "virDomainMigratePrepare2": "private function for migration",
   "virDrvSupportsFeature": "private function for remote access",
+  "DllMain": "specific function for Win32",
 }
 
 def escape(raw):

docs/apps.html

@@ -141,7 +141,7 @@
       </dd></dl>
         <h2>Monitoring plugins</h2>
         <dl><dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt><dd>
-	The plugins provided by Guido Günther allows to monitor various things
+	The plugins provided by Guido Günther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd><dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt><dd>

docs/apps.html.in

@@ -107,7 +107,7 @@
     <dl>
       <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt>
       <dd>
-	The plugins provided by Guido Günther allows to monitor various things
+	The plugins provided by Guido Günther allow to monitor various things
         like network and block I/O with
         <a href="http://munin.projects.linpro.no/">Munin</a>.
       </dd>

docs/archdomain.html

@@ -47,6 +47,14 @@
                   <div>
                     <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
                     <ul class="l2"><li>
+                        <div>
+                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
+                        </div>
+                      </li><li>
                         <div>
                           <span class="active">Domains</span>
                         </div>
@@ -80,6 +88,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/archnetwork.html

@@ -47,6 +47,14 @@
                   <div>
                     <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
                     <ul class="l2"><li>
+                        <div>
+                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
+                        </div>
+                      </li><li>
                         <div>
                           <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
                         </div>
@@ -80,6 +88,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/archnode.html

@@ -47,6 +47,14 @@
                   <div>
                     <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
                     <ul class="l2"><li>
+                        <div>
+                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
+                        </div>
+                      </li><li>
                         <div>
                           <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
                         </div>
@@ -80,6 +88,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/archstorage.html

@@ -47,6 +47,14 @@
                   <div>
                     <a title="Overview of the logical subsystems in the libvirt API" class="active" href="intro.html">Architecture</a>
                     <ul class="l2"><li>
+                        <div>
+                          <a title="Terminology and goals of libvirt API" class="inactive" href="goals.html">Goals</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="The libvirt API concepts" class="inactive" href="api.html">API concepts</a>
+                        </div>
+                      </li><li>
                         <div>
                           <a title="Managing virtual machines" class="inactive" href="archdomain.html">Domains</a>
                         </div>
@@ -80,6 +88,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/auth.html

@@ -58,6 +58,10 @@
                         <div>
                           <a title="Access the libvirt daemon from a native Windows client" class="inactive" href="windows.html">Windows port</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="The library and the daemon logging support" class="inactive" href="logging.html">Logging</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -80,6 +84,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/bindings.html

@@ -72,6 +72,10 @@
                         </div>
                       </li></ul>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/bugs.html

@@ -83,17 +83,17 @@
       the <code>Virtualization Tools</code> product and the <code>libvirt</code>
       component.
     </p>
-        <ul><li><a href="">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20Tools&amp;component=libvirt">New libvirt ticket</a></li></ul>
+        <ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Virtualization%20Tools">View libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20Tools&amp;component=libvirt">New libvirt ticket</a></li></ul>
         <h2>Linux Distribution specific bug reports</h2>
         <ul><li>
 	If you are using official binaries from a <strong>Fedora distribution</strong>, enter
 	tickets against the <code>Fedora</code> product and the <code>libvirt</code>
 	component.
-	<ul><li><a href="">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li></ul></li><li>
+	<ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Fedora">View Fedora libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li></ul></li><li>
 	If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>,
 	tickets against the <code>Red Hat Enterprise Linux 5</code> product and
 	the <code>libvirt</code> component.
-	<ul><li><a href="">View Red Hat Enterprise Linux libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li></ul></li><li>
+	<ul><li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Red%20Hat%20Enterprise%20Linux%205">View Red Hat Enterprise Linux libvirt tickets</a></li><li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li></ul></li><li>
 	If you are using official binaries from another Linux distribution first
 	follow their own bug reporting guidelines.
       </li></ul>

docs/bugs.html.in

@@ -23,7 +23,7 @@
     </p>
 
     <ul>
-      <li><a href="">View libvirt tickets</a></li>
+      <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Virtualization%20Tools">View libvirt tickets</a></li>
       <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Virtualization%20Tools&amp;component=libvirt">New libvirt ticket</a></li>
     </ul>
 
@@ -34,7 +34,7 @@
 	tickets against the <code>Fedora</code> product and the <code>libvirt</code>
 	component.
 	<ul>
-	  <li><a href="">View Fedora libvirt tickets</a></li>
+	  <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Fedora">View Fedora libvirt tickets</a></li>
 	  <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&amp;component=libvirt">New Fedora libvirt ticket</a></li>
 	</ul>
       </li>
@@ -43,7 +43,7 @@
 	tickets against the <code>Red Hat Enterprise Linux 5</code> product and
 	the <code>libvirt</code> component.
 	<ul>
-	  <li><a href="">View Red Hat Enterprise Linux libvirt tickets</a></li>
+	  <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&amp;product=Red%20Hat%20Enterprise%20Linux%205">View Red Hat Enterprise Linux libvirt tickets</a></li>
 	  <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%205&amp;component=libvirt">New Red Hat Enterprise Linux libvirt ticket</a></li>
 	</ul>
       </li>

docs/deployment.html

@@ -58,6 +58,10 @@
                         <div>
                           <a title="Access the libvirt daemon from a native Windows client" class="inactive" href="windows.html">Windows port</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="The library and the daemon logging support" class="inactive" href="logging.html">Logging</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -80,6 +84,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/devhelp/.cvsignore

@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-libvirt.devhelp

docs/devhelp/Makefile.am

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

docs/devhelp/devhelp.xsl

@@ -123,5 +123,3 @@
   </xsl:template>
 
 </xsl:stylesheet>
-
-

docs/devhelp/html.xsl

@@ -575,5 +575,3 @@ it indexes the project page, the APIs as well as the mailing-list archives. </p>
   </xsl:template>
 
 </xsl:stylesheet>
-
-

docs/devhelp/libvirt-libvirt.html

@@ -41,13 +41,16 @@
       <pre class="synopsis">#define <a href="#VIR_NODEINFO_MAXCPUS">VIR_NODEINFO_MAXCPUS</a>(nodeinfo);
 #define <a href="#LIBVIR_VERSION_NUMBER">LIBVIR_VERSION_NUMBER</a>;
 #define <a href="#VIR_USE_CPU">VIR_USE_CPU</a>(cpumap, cpu);
+#define <a href="#VIR_SECURITY_DOI_BUFLEN">VIR_SECURITY_DOI_BUFLEN</a>;
 #define <a href="#VIR_CPU_MAPLEN">VIR_CPU_MAPLEN</a>(cpu);
-#define <a href="#VIR_UUID_BUFLEN">VIR_UUID_BUFLEN</a>;
+#define <a href="#VIR_SECURITY_LABEL_BUFLEN">VIR_SECURITY_LABEL_BUFLEN</a>;
 #define <a href="#VIR_CPU_USABLE">VIR_CPU_USABLE</a>(cpumaps, maplen, vcpu, cpu);
 #define <a href="#VIR_COPY_CPUMAP">VIR_COPY_CPUMAP</a>(cpumaps, maplen, vcpu, cpumap);
 #define <a href="#VIR_DOMAIN_SCHED_FIELD_LENGTH">VIR_DOMAIN_SCHED_FIELD_LENGTH</a>;
+#define <a href="#VIR_SECURITY_MODEL_BUFLEN">VIR_SECURITY_MODEL_BUFLEN</a>;
 #define <a href="#VIR_UUID_STRING_BUFLEN">VIR_UUID_STRING_BUFLEN</a>;
 #define <a href="#VIR_GET_CPUMAP">VIR_GET_CPUMAP</a>(cpumaps, maplen, vcpu);
+#define <a href="#VIR_UUID_BUFLEN">VIR_UUID_BUFLEN</a>;
 #define <a href="#VIR_UNUSE_CPU">VIR_UNUSE_CPU</a>(cpumap, cpu);
 typedef struct _virDomainBlockStats <a href="#virDomainBlockStatsStruct">virDomainBlockStatsStruct</a>;
 typedef enum <a href="#virDomainMigrateFlags">virDomainMigrateFlags</a>;
@@ -70,6 +73,7 @@ typedef <a href="libvirt-libvirt.html#virDomainInterfaceStatsStruct">virDomainIn
 typedef <a href="libvirt-libvirt.html#virConnectAuth">virConnectAuth</a> * <a href="#virConnectAuthPtr">virConnectAuthPtr</a>;
 typedef struct _virStorageVolInfo <a href="#virStorageVolInfo">virStorageVolInfo</a>;
 typedef enum <a href="#virSchedParameterType">virSchedParameterType</a>;
+typedef struct _virSecurityLabel <a href="#virSecurityLabel">virSecurityLabel</a>;
 typedef <a href="libvirt-libvirt.html#virStorageVolInfo">virStorageVolInfo</a> * <a href="#virStorageVolInfoPtr">virStorageVolInfoPtr</a>;
 typedef <a href="libvirt-libvirt.html#virConnectCredential">virConnectCredential</a> * <a href="#virConnectCredentialPtr">virConnectCredentialPtr</a>;
 typedef <a href="libvirt-libvirt.html#virStoragePool">virStoragePool</a> * <a href="#virStoragePoolPtr">virStoragePoolPtr</a>;
@@ -80,9 +84,11 @@ typedef struct _virNodeDevice <a href="#virNodeDevice">virNodeDevice</a>;
 typedef <a href="libvirt-libvirt.html#virConnect">virConnect</a> * <a href="#virConnectPtr">virConnectPtr</a>;
 typedef struct _virStorageVol <a href="#virStorageVol">virStorageVol</a>;
 typedef <a href="libvirt-libvirt.html#virNodeDevice">virNodeDevice</a> * <a href="#virNodeDevicePtr">virNodeDevicePtr</a>;
+typedef struct _virInterface <a href="#virInterface">virInterface</a>;
 typedef struct _virSchedParameter <a href="#virSchedParameter">virSchedParameter</a>;
 typedef enum <a href="#virConnectFlags">virConnectFlags</a>;
 typedef enum <a href="#virDomainEventDefinedDetailType">virDomainEventDefinedDetailType</a>;
+typedef <a href="libvirt-libvirt.html#virInterface">virInterface</a> * <a href="#virInterfacePtr">virInterfacePtr</a>;
 typedef enum <a href="#virDomainMemoryFlags">virDomainMemoryFlags</a>;
 typedef enum <a href="#virDomainEventStoppedDetailType">virDomainEventStoppedDetailType</a>;
 typedef <a href="libvirt-libvirt.html#virStorageVol">virStorageVol</a> * <a href="#virStorageVolPtr">virStorageVolPtr</a>;
@@ -92,6 +98,7 @@ typedef struct _virVcpuInfo <a href="#virVcpuInfo">virVcpuInfo</a>;
 typedef <a href="libvirt-libvirt.html#virSchedParameter">virSchedParameter</a> * <a href="#virSchedParameterPtr">virSchedParameterPtr</a>;
 typedef struct _virConnectAuth <a href="#virConnectAuth">virConnectAuth</a>;
 typedef struct _virConnectCredential <a href="#virConnectCredential">virConnectCredential</a>;
+typedef <a href="libvirt-libvirt.html#virSecurityModel">virSecurityModel</a> * <a href="#virSecurityModelPtr">virSecurityModelPtr</a>;
 typedef enum <a href="#virDomainEventSuspendedDetailType">virDomainEventSuspendedDetailType</a>;
 typedef <a href="libvirt-libvirt.html#virVcpuInfo">virVcpuInfo</a> * <a href="#virVcpuInfoPtr">virVcpuInfoPtr</a>;
 typedef enum <a href="#virStoragePoolBuildFlags">virStoragePoolBuildFlags</a>;
@@ -103,6 +110,8 @@ typedef enum <a href="#virConnectCredentialType">virConnectCredentialType</a>;
 typedef enum <a href="#virStoragePoolState">virStoragePoolState</a>;
 typedef <a href="libvirt-libvirt.html#virStoragePoolInfo">virStoragePoolInfo</a> * <a href="#virStoragePoolInfoPtr">virStoragePoolInfoPtr</a>;
 typedef enum <a href="#virDomainCreateFlags">virDomainCreateFlags</a>;
+typedef <a href="libvirt-libvirt.html#virSecurityLabel">virSecurityLabel</a> * <a href="#virSecurityLabelPtr">virSecurityLabelPtr</a>;
+typedef struct _virSecurityModel <a href="#virSecurityModel">virSecurityModel</a>;
 char *	<a href="#virStoragePoolGetXMLDesc">virStoragePoolGetXMLDesc</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 unsigned int flags);
 const char *	<a href="#virStorageVolGetKey">virStorageVolGetKey</a>	(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol);
 typedef void <a href="#virEventUpdateTimeoutFunc">virEventUpdateTimeoutFunc</a>	(int timer, <br/>					 int timeout);
@@ -115,55 +124,66 @@ int	<a href="#virNodeGetCellsFreeMemory">virNodeGetCellsFreeMemory</a>	(<a href=
 int	<a href="#virInitialize">virInitialize</a>			(void);
 const char *	<a href="#virNodeDeviceGetName">virNodeDeviceGetName</a>	(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 int	<a href="#virStoragePoolSetAutostart">virStoragePoolSetAutostart</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 int autostart);
-<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolCreateXML">virStorageVolCreateXML</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>						 const char * xmldesc, <br/>						 unsigned int flags);
+char *	<a href="#virConnectDomainXMLFromNative">virConnectDomainXMLFromNative</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * nativeFormat, <br/>					 const char * nativeConfig, <br/>					 unsigned int flags);
+int	<a href="#virNodeDeviceDettach">virNodeDeviceDettach</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
+int	<a href="#virDomainGetSecurityLabel">virDomainGetSecurityLabel</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virSecurityLabelPtr">virSecurityLabelPtr</a> seclabel);
 int	<a href="#virConnectDomainEventDeregister">virConnectDomainEventDeregister</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virConnectDomainEventCallback">virConnectDomainEventCallback</a> cb);
 int	<a href="#virDomainGetSchedulerParameters">virDomainGetSchedulerParameters</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virSchedParameterPtr">virSchedParameterPtr</a> params, <br/>					 int * nparams);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainLookupByUUIDString">virDomainLookupByUUIDString</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * uuidstr);
 int	<a href="#virConnectNumOfDefinedNetworks">virConnectNumOfDefinedNetworks</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
-int	<a href="#virConnectNumOfDomains">virConnectNumOfDomains</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+int	<a href="#virConnectListDefinedInterfaces">virConnectListDefinedInterfaces</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames);
 int	<a href="#virNetworkGetUUID">virNetworkGetUUID</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 unsigned char * uuid);
+char *	<a href="#virInterfaceGetXMLDesc">virInterfaceGetXMLDesc</a>		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virStoragePoolGetConnect">virStoragePoolGetConnect</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
 int	<a href="#virConnectGetVersion">virConnectGetVersion</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 unsigned long * hvVer);
 int	<a href="#virDomainFree">virDomainFree</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
+int	<a href="#virStorageVolRef">virStorageVolRef</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol);
 const char *	<a href="#virStoragePoolGetName">virStoragePoolGetName</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
 int	<a href="#virDomainSetAutostart">virDomainSetAutostart</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 int autostart);
 <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a>	<a href="#virStoragePoolDefineXML">virStoragePoolDefineXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * xml, <br/>						 unsigned int flags);
 <a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolLookupByPath">virStorageVolLookupByPath</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * path);
 <a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolLookupByName">virStorageVolLookupByName</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>							 const char * name);
-<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainCreateLinux">virDomainCreateLinux</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xmlDesc, <br/>					 unsigned int flags);
+int	<a href="#virNetworkCreate">virNetworkCreate</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 int	<a href="#virDomainSetMaxMemory">virDomainSetMaxMemory</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned long memory);
 void	<a href="#virEventRegisterImpl">virEventRegisterImpl</a>		(<a href="libvirt-libvirt.html#virEventAddHandleFunc">virEventAddHandleFunc</a> addHandle, <br/>					 <a href="libvirt-libvirt.html#virEventUpdateHandleFunc">virEventUpdateHandleFunc</a> updateHandle, <br/>					 <a href="libvirt-libvirt.html#virEventRemoveHandleFunc">virEventRemoveHandleFunc</a> removeHandle, <br/>					 <a href="libvirt-libvirt.html#virEventAddTimeoutFunc">virEventAddTimeoutFunc</a> addTimeout, <br/>					 <a href="libvirt-libvirt.html#virEventUpdateTimeoutFunc">virEventUpdateTimeoutFunc</a> updateTimeout, <br/>					 <a href="libvirt-libvirt.html#virEventRemoveTimeoutFunc">virEventRemoveTimeoutFunc</a> removeTimeout);
+<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	<a href="#virInterfaceDefineXML">virInterfaceDefineXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xml, <br/>					 unsigned int flags);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainMigrate">virDomainMigrate</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> dconn, <br/>					 unsigned long flags, <br/>					 const char * dname, <br/>					 const char * uri, <br/>					 unsigned long bandwidth);
 int	<a href="#virDomainSuspend">virDomainSuspend</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
-int	<a href="#virNetworkCreate">virNetworkCreate</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
+<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainCreateLinux">virDomainCreateLinux</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xmlDesc, <br/>					 unsigned int flags);
 char *	<a href="#virNodeDeviceGetXMLDesc">virNodeDeviceGetXMLDesc</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev, <br/>					 unsigned int flags);
 typedef void <a href="#virEventUpdateHandleFunc">virEventUpdateHandleFunc</a>	(int watch, <br/>					 int event);
 int	<a href="#virDomainDestroy">virDomainDestroy</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int	<a href="#virConnectNumOfNetworks">virConnectNumOfNetworks</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a>	<a href="#virStoragePoolLookupByUUIDString">virStoragePoolLookupByUUIDString</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * uuidstr);
+int	<a href="#virInterfaceCreate">virInterfaceCreate</a>		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags);
 char *	<a href="#virDomainGetXMLDesc">virDomainGetXMLDesc</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 int flags);
 int	<a href="#virStoragePoolGetUUID">virStoragePoolGetUUID</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 unsigned char * uuid);
 int	<a href="#virNodeDeviceFree">virNodeDeviceFree</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 int	<a href="#virStorageVolGetInfo">virStorageVolGetInfo</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol, <br/>					 <a href="libvirt-libvirt.html#virStorageVolInfoPtr">virStorageVolInfoPtr</a> info);
 int	<a href="#virDomainGetInfo">virDomainGetInfo</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virDomainInfoPtr">virDomainInfoPtr</a> info);
+<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a>	<a href="#virNodeDeviceCreateXML">virNodeDeviceCreateXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * xmlDesc, <br/>						 unsigned int flags);
 int	<a href="#virNetworkDestroy">virNetworkDestroy</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a>	<a href="#virStoragePoolLookupByName">virStoragePoolLookupByName</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * name);
 <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a>	<a href="#virStoragePoolCreateXML">virStoragePoolCreateXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * xmlDesc, <br/>						 unsigned int flags);
 int	<a href="#virNetworkGetAutostart">virNetworkGetAutostart</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 int * autostart);
 char *	<a href="#virNetworkGetBridgeName">virNetworkGetBridgeName</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 char *	<a href="#virStorageVolGetXMLDesc">virStorageVolGetXMLDesc</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol, <br/>					 unsigned int flags);
+char *	<a href="#virConnectDomainXMLToNative">virConnectDomainXMLToNative</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * nativeFormat, <br/>					 const char * domainXml, <br/>					 unsigned int flags);
 int	<a href="#virDomainSetSchedulerParameters">virDomainSetSchedulerParameters</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virSchedParameterPtr">virSchedParameterPtr</a> params, <br/>					 int nparams);
 const char *	<a href="#virConnectGetType">virConnectGetType</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolCreateXML">virStorageVolCreateXML</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>						 const char * xmldesc, <br/>						 unsigned int flags);
 int	<a href="#virDomainSave">virDomainSave</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 const char * to);
 int	<a href="#virDomainCreate">virDomainCreate</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int	<a href="#virConnectListDomains">virConnectListDomains</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 int * ids, <br/>					 int maxids);
 int	<a href="#virDomainCoreDump">virDomainCoreDump</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 const char * to, <br/>					 int flags);
 int	<a href="#virDomainSetMemory">virDomainSetMemory</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned long memory);
+const char *	<a href="#virInterfaceGetName">virInterfaceGetName</a>	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
 int	<a href="#virStoragePoolCreate">virStoragePoolCreate</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 unsigned int flags);
 int	<a href="#virNodeGetInfo">virNodeGetInfo</a>			(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virNodeInfoPtr">virNodeInfoPtr</a> info);
 int	<a href="#virNetworkSetAutostart">virNetworkSetAutostart</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 int autostart);
 unsigned long	<a href="#virDomainGetMaxMemory">virDomainGetMaxMemory</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int	<a href="#virStoragePoolFree">virStoragePoolFree</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
+int	<a href="#virConnectNumOfDefinedInterfaces">virConnectNumOfDefinedInterfaces</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 typedef void <a href="#virFreeCallback">virFreeCallback</a>			(void * opaque);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	<a href="#virNetworkDefineXML">virNetworkDefineXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xml);
 int	<a href="#virNodeDeviceListCaps">virNodeDeviceListCaps</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev, <br/>					 char ** const names, <br/>					 int maxnames);
@@ -178,34 +198,44 @@ int	<a href="#virStoragePoolListVolumes">virStoragePoolListVolumes</a>	(<a href=
 char *	<a href="#virConnectGetHostname">virConnectGetHostname</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 typedef int <a href="#virEventRemoveTimeoutFunc">virEventRemoveTimeoutFunc</a>	(int timer);
 const char *	<a href="#virDomainGetName">virDomainGetName</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
+int	<a href="#virStoragePoolRef">virStoragePoolRef</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
 char *	<a href="#virNetworkGetXMLDesc">virNetworkGetXMLDesc</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 int flags);
 int	<a href="#virConnectNumOfStoragePools">virConnectNumOfStoragePools</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virInterfaceGetConnect">virInterfaceGetConnect</a>	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
 const char *	<a href="#virNetworkGetName">virNetworkGetName</a>	(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 int	<a href="#virConnectListDefinedDomains">virConnectListDefinedDomains</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames);
 char *	<a href="#virConnectGetCapabilities">virConnectGetCapabilities</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainLookupByName">virDomainLookupByName</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * name);
 char *	<a href="#virConnectFindStoragePoolSources">virConnectFindStoragePoolSources</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * type, <br/>						 const char * srcSpec, <br/>						 unsigned int flags);
 int	<a href="#virDomainPinVcpu">virDomainPinVcpu</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned int vcpu, <br/>					 unsigned char * cpumap, <br/>					 int maplen);
+int	<a href="#virNodeGetSecurityModel">virNodeGetSecurityModel</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virSecurityModelPtr">virSecurityModelPtr</a> secmodel);
 int	<a href="#virDomainRestore">virDomainRestore</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * from);
+int	<a href="#virNodeDeviceDestroy">virNodeDeviceDestroy</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 char *	<a href="#virStorageVolGetPath">virStorageVolGetPath</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	<a href="#virNetworkLookupByUUIDString">virNetworkLookupByUUIDString</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * uuidstr);
 typedef int <a href="#virConnectDomainEventCallback">virConnectDomainEventCallback</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/>					 int event, <br/>					 int detail, <br/>					 void * opaque);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainLookupByID">virDomainLookupByID</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 int id);
 int	<a href="#virStorageVolDelete">virStorageVolDelete</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol, <br/>					 unsigned int flags);
 int	<a href="#virStorageVolFree">virStorageVolFree</a>		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol);
+int	<a href="#virConnectListInterfaces">virConnectListInterfaces</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames);
 int	<a href="#virDomainMemoryPeek">virDomainMemoryPeek</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/>					 unsigned long long start, <br/>					 size_t size, <br/>					 void * buffer, <br/>					 unsigned int flags);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	<a href="#virNetworkLookupByUUID">virNetworkLookupByUUID</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const unsigned char * uuid);
 int	<a href="#virConnectListDefinedNetworks">virConnectListDefinedNetworks</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames);
+int	<a href="#virConnectRef">virConnectRef</a>			(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 int	<a href="#virDomainGetUUID">virDomainGetUUID</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned char * uuid);
 <a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	<a href="#virNetworkCreateXML">virNetworkCreateXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xmlDesc);
+int	<a href="#virNetworkUndefine">virNetworkUndefine</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
+int	<a href="#virConnectDomainEventRegister">virConnectDomainEventRegister</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virConnectDomainEventCallback">virConnectDomainEventCallback</a> cb, <br/>					 void * opaque, <br/>					 <a href="libvirt-libvirt.html#virFreeCallback">virFreeCallback</a> freecb);
 int	<a href="#virDomainGetVcpus">virDomainGetVcpus</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virVcpuInfoPtr">virVcpuInfoPtr</a> info, <br/>					 int maxinfo, <br/>					 unsigned char * cpumaps, <br/>					 int maplen);
 <a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a>	<a href="#virNodeDeviceLookupByName">virNodeDeviceLookupByName</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * name);
 int	<a href="#virStoragePoolGetInfo">virStoragePoolGetInfo</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 <a href="libvirt-libvirt.html#virStoragePoolInfoPtr">virStoragePoolInfoPtr</a> info);
 int	<a href="#virDomainResume">virDomainResume</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
-int	<a href="#virNodeListDevices">virNodeListDevices</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * cap, <br/>					 char ** const names, <br/>					 int maxnames, <br/>					 unsigned int flags);
+int	<a href="#virInterfaceRef">virInterfaceRef</a>			(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
+const char *	<a href="#virInterfaceGetMACString">virInterfaceGetMACString</a>	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
+int	<a href="#virConnectNumOfDomains">virConnectNumOfDomains</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 int	<a href="#virStoragePoolRefresh">virStoragePoolRefresh</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 unsigned int flags);
 int	<a href="#virConnectNumOfDefinedDomains">virConnectNumOfDefinedDomains</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
-<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolLookupByKey">virStorageVolLookupByKey</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * key);
+<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolCreateXMLFrom">virStorageVolCreateXMLFrom</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>							 const char * xmldesc, <br/>							 <a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> clonevol, <br/>							 unsigned int flags);
 int	<a href="#virDomainUndefine">virDomainUndefine</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int	<a href="#virDomainReboot">virDomainReboot</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned int flags);
 int	<a href="#virNetworkGetUUIDString">virNetworkGetUUIDString</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 char * buf);
@@ -213,9 +243,11 @@ int	<a href="#virNetworkGetUUIDString">virNetworkGetUUIDString</a>		(<a href="li
 int	<a href="#virDomainGetMaxVcpus">virDomainGetMaxVcpus</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 typedef void <a href="#virEventHandleCallback">virEventHandleCallback</a>		(int watch, <br/>					 int fd, <br/>					 int events, <br/>					 void * opaque);
 char *	<a href="#virDomainGetSchedulerType">virDomainGetSchedulerType</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 int * nparams);
+int	<a href="#virNodeDeviceReset">virNodeDeviceReset</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 int	<a href="#virDomainDetachDevice">virDomainDetachDevice</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 const char * xml);
 int	<a href="#virStoragePoolNumOfVolumes">virStoragePoolNumOfVolumes</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
 int	<a href="#virStoragePoolGetUUIDString">virStoragePoolGetUUIDString</a>	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 char * buf);
+int	<a href="#virNodeDeviceReAttach">virNodeDeviceReAttach</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 int	<a href="#virStoragePoolUndefine">virStoragePoolUndefine</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
 typedef int <a href="#virConnectAuthCallbackPtr">virConnectAuthCallbackPtr</a>	(<a href="libvirt-libvirt.html#virConnectCredentialPtr">virConnectCredentialPtr</a> cred, <br/>					 unsigned int ncred, <br/>					 void * cbdata);
 int	<a href="#virDomainAttachDevice">virDomainAttachDevice</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 const char * xml);
@@ -224,12 +256,15 @@ char *	<a href="#virConnectGetURI">virConnectGetURI</a>		(<a href="libvirt-libvi
 int	<a href="#virNetworkFree">virNetworkFree</a>			(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a>	<a href="#virStoragePoolLookupByUUID">virStoragePoolLookupByUUID</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const unsigned char * uuid);
 typedef int <a href="#virEventAddHandleFunc">virEventAddHandleFunc</a>		(int fd, <br/>					 int event, <br/>					 <a href="libvirt-libvirt.html#virEventHandleCallback">virEventHandleCallback</a> cb, <br/>					 void * opaque, <br/>					 <a href="libvirt-libvirt.html#virFreeCallback">virFreeCallback</a> ff);
-int	<a href="#virNetworkUndefine">virNetworkUndefine</a>		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
+int	<a href="#virNetworkRef">virNetworkRef</a>			(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network);
 int	<a href="#virConnectListDefinedStoragePools">virConnectListDefinedStoragePools</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 char ** const names, <br/>						 int maxnames);
 typedef void <a href="#virEventTimeoutCallback">virEventTimeoutCallback</a>		(int timer, <br/>					 void * opaque);
+int	<a href="#virInterfaceFree">virInterfaceFree</a>		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
 int	<a href="#virNodeDeviceNumOfCaps">virNodeDeviceNumOfCaps</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
+<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	<a href="#virInterfaceLookupByMACString">virInterfaceLookupByMACString</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * macstr);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virNetworkGetConnect">virNetworkGetConnect</a>	(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> net);
 unsigned long long	<a href="#virNodeGetFreeMemory">virNodeGetFreeMemory</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+int	<a href="#virInterfaceDestroy">virInterfaceDestroy</a>		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virStorageVolGetConnect">virStorageVolGetConnect</a>	(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol);
 int	<a href="#virNodeNumOfDevices">virNodeNumOfDevices</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * cap, <br/>					 unsigned int flags);
 int	<a href="#virStoragePoolDestroy">virStoragePoolDestroy</a>		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool);
@@ -241,16 +276,22 @@ int	<a href="#virConnectGetMaxVcpus">virConnectGetMaxVcpus</a>		(<a href="libvir
 int	<a href="#virDomainGetUUIDString">virDomainGetUUIDString</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 char * buf);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virDomainGetConnect">virDomainGetConnect</a>	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom);
 int	<a href="#virConnectNumOfDefinedStoragePools">virConnectNumOfDefinedStoragePools</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+int	<a href="#virNodeListDevices">virNodeListDevices</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * cap, <br/>					 char ** const names, <br/>					 int maxnames, <br/>					 unsigned int flags);
 const char *	<a href="#virNodeDeviceGetParent">virNodeDeviceGetParent</a>	(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
 <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	<a href="#virConnectOpen">virConnectOpen</a>		(const char * name);
 <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	<a href="#virDomainCreateXML">virDomainCreateXML</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xmlDesc, <br/>					 unsigned int flags);
+int	<a href="#virNodeDeviceRef">virNodeDeviceRef</a>		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev);
+int	<a href="#virInterfaceUndefine">virInterfaceUndefine</a>		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface);
 int	<a href="#virDomainSetVcpus">virDomainSetVcpus</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned int nvcpus);
-int	<a href="#virConnectDomainEventRegister">virConnectDomainEventRegister</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virConnectDomainEventCallback">virConnectDomainEventCallback</a> cb, <br/>					 void * opaque, <br/>					 <a href="libvirt-libvirt.html#virFreeCallback">virFreeCallback</a> freecb);
+int	<a href="#virDomainRef">virDomainRef</a>			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
+int	<a href="#virConnectNumOfInterfaces">virConnectNumOfInterfaces</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
 unsigned int	<a href="#virDomainGetID">virDomainGetID</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain);
 int	<a href="#virDomainBlockPeek">virDomainBlockPeek</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/>					 const char * path, <br/>					 unsigned long long offset, <br/>					 size_t size, <br/>					 void * buffer, <br/>					 unsigned int flags);
 typedef int <a href="#virEventAddTimeoutFunc">virEventAddTimeoutFunc</a>		(int timeout, <br/>					 <a href="libvirt-libvirt.html#virEventTimeoutCallback">virEventTimeoutCallback</a> cb, <br/>					 void * opaque, <br/>					 <a href="libvirt-libvirt.html#virFreeCallback">virFreeCallback</a> ff);
+<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	<a href="#virInterfaceLookupByName">virInterfaceLookupByName</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * name);
 int	<a href="#virDomainInterfaceStats">virDomainInterfaceStats</a>		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> dom, <br/>					 const char * path, <br/>					 <a href="libvirt-libvirt.html#virDomainInterfaceStatsPtr">virDomainInterfaceStatsPtr</a> stats, <br/>					 size_t size);
 int	<a href="#virConnectListNetworks">virConnectListNetworks</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames);
+<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	<a href="#virStorageVolLookupByKey">virStorageVolLookupByKey</a>	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>							 const char * key);
 </pre>
     </div>
     <div class="refsect1" lang="en">
@@ -285,6 +326,18 @@ int	<a href="#virConnectListNetworks">virConnectListNetworks</a>		(<a href="libv
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="VIR_NODEINFO_MAXCPUS">Macro </a>VIR_NODEINFO_MAXCPUS</h3><pre class="programlisting">#define <a href="#VIR_NODEINFO_MAXCPUS">VIR_NODEINFO_MAXCPUS</a>(nodeinfo);
 </pre><p>This macro is to calculate the total number of CPUs supported but not necessary active in the host.</p><div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>nodeinfo</tt></i>:</span></td><td><a href="libvirt-libvirt.html#virNodeInfo">virNodeInfo</a> instance</td></tr></tbody></table></div>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="VIR_SECURITY_DOI_BUFLEN">Macro </a>VIR_SECURITY_DOI_BUFLEN</h3><pre class="programlisting">#define <a href="#VIR_SECURITY_DOI_BUFLEN">VIR_SECURITY_DOI_BUFLEN</a>;
+</pre><p>Macro providing the maximum length of the <a href="libvirt-libvirt.html#virSecurityModel">virSecurityModel</a> doi string.</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="VIR_SECURITY_LABEL_BUFLEN">Macro </a>VIR_SECURITY_LABEL_BUFLEN</h3><pre class="programlisting">#define <a href="#VIR_SECURITY_LABEL_BUFLEN">VIR_SECURITY_LABEL_BUFLEN</a>;
+</pre><p>Macro providing the maximum length of the <a href="libvirt-libvirt.html#virSecurityLabel">virSecurityLabel</a> label string. Note that this value is based on that used by Labeled NFS.</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="VIR_SECURITY_MODEL_BUFLEN">Macro </a>VIR_SECURITY_MODEL_BUFLEN</h3><pre class="programlisting">#define <a href="#VIR_SECURITY_MODEL_BUFLEN">VIR_SECURITY_MODEL_BUFLEN</a>;
+</pre><p>Macro providing the maximum length of the <a href="libvirt-libvirt.html#virSecurityModel">virSecurityModel</a> model string.</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="VIR_UNUSE_CPU">Macro </a>VIR_UNUSE_CPU</h3><pre class="programlisting">#define <a href="#VIR_UNUSE_CPU">VIR_UNUSE_CPU</a>(cpumap, cpu);
@@ -476,7 +529,8 @@ The content of this structure is not made public by the API.
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainMemoryFlags">Enum </a>virDomainMemoryFlags</h3><pre class="programlisting">enum <a href="#virDomainMemoryFlags">virDomainMemoryFlags</a> {
-    <a name="VIR_MEMORY_VIRTUAL">VIR_MEMORY_VIRTUAL</a> = 1 /*  addresses are virtual addresses */
+    <a name="VIR_MEMORY_VIRTUAL">VIR_MEMORY_VIRTUAL</a> = 1 /* addresses are virtual addresses */
+    <a name="VIR_MEMORY_PHYSICAL">VIR_MEMORY_PHYSICAL</a> = 2 /*  addresses are physical addresses */
 };
 </pre><p/>
 </div>
@@ -517,6 +571,16 @@ The content of this structure is not made public by the API.
     <a name="VIR_EVENT_HANDLE_HANGUP">VIR_EVENT_HANDLE_HANGUP</a> = 8
 };
 </pre><p/>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterface">Structure </a>virInterface</h3><pre class="programlisting">struct _virInterface {
+The content of this structure is not made public by the API.
+} virInterface;
+</pre><p/>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfacePtr">Typedef </a>virInterfacePtr</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virInterface">virInterface</a> * virInterfacePtr;
+</pre><p>a <a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> is pointer to a <a href="libvirt-libvirt.html#virInterface">virInterface</a> private structure, this is the type used to reference a virtual interface in the API.</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNetwork">Structure </a>virNetwork</h3><pre class="programlisting">struct _virNetwork {
@@ -576,6 +640,26 @@ The content of this structure is not made public by the API.
     <a name="VIR_DOMAIN_SCHED_FIELD_BOOLEAN">VIR_DOMAIN_SCHED_FIELD_BOOLEAN</a> = 6 /*  boolean(character) case */
 };
 </pre><p/>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virSecurityLabel">Structure </a>virSecurityLabel</h3><pre class="programlisting">struct _virSecurityLabel {
+The content of this structure is not made public by the API.
+} virSecurityLabel;
+</pre><p/>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virSecurityLabelPtr">Typedef </a>virSecurityLabelPtr</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virSecurityLabel">virSecurityLabel</a> * virSecurityLabelPtr;
+</pre><p>a <a href="libvirt-libvirt.html#virSecurityLabelPtr">virSecurityLabelPtr</a> is a pointer to a virSecurityLabel.</p>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virSecurityModel">Structure </a>virSecurityModel</h3><pre class="programlisting">struct _virSecurityModel {
+The content of this structure is not made public by the API.
+} virSecurityModel;
+</pre><p/>
+</div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virSecurityModelPtr">Typedef </a>virSecurityModelPtr</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virSecurityModel">virSecurityModel</a> * virSecurityModelPtr;
+</pre><p>a <a href="libvirt-libvirt.html#virSecurityModelPtr">virSecurityModelPtr</a> is a pointer to a virSecurityModel.</p>
 </div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStoragePool">Structure </a>virStoragePool</h3><pre class="programlisting">struct _virStoragePool {
@@ -739,8 +823,16 @@ The content of this structure is not made public by the API.
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the connection</td></tr><tr><td><span class="term"><i><tt>cb</tt></i>:</span></td><td>callback to the function handling domain events</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 on success, -1 on failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectDomainEventRegister"/>virConnectDomainEventRegister ()</h3><pre class="programlisting">int	virConnectDomainEventRegister	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virConnectDomainEventCallback">virConnectDomainEventCallback</a> cb, <br/>					 void * opaque, <br/>					 <a href="libvirt-libvirt.html#virFreeCallback">virFreeCallback</a> freecb)<br/>
-</pre><p>Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the connection</td></tr><tr><td><span class="term"><i><tt>cb</tt></i>:</span></td><td>callback to the function handling domain events</td></tr><tr><td><span class="term"><i><tt>opaque</tt></i>:</span></td><td>opaque data to pass on to the callback</td></tr><tr><td><span class="term"><i><tt>freecb</tt></i>:</span></td><td>optional function to deallocate opaque when not used anymore</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 on success, -1 on failure</td></tr></tbody></table></div></div>
+</pre><p>Adds a Domain Event Callback. Registering for a domain callback will enable delivery of the events The <a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> object handle passed into the callback upon delivery of an event is only valid for the duration of execution of the callback. If the callback wishes to keep the domain object after the callback</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the connection</td></tr><tr><td><span class="term"><i><tt>cb</tt></i>:</span></td><td>callback to the function handling domain events</td></tr><tr><td><span class="term"><i><tt>opaque</tt></i>:</span></td><td>opaque data to pass on to the callback</td></tr><tr><td><span class="term"><i><tt>freecb</tt></i>:</span></td><td>optional function to deallocate opaque when not used anymore</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>it shall take a reference to it, by calling virDomainRef. The reference can be released once the object is no longer required by calling virDomainFree. Returns 0 on success, -1 on failure</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectDomainXMLFromNative"/>virConnectDomainXMLFromNative ()</h3><pre class="programlisting">char *	virConnectDomainXMLFromNative	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * nativeFormat, <br/>					 const char * nativeConfig, <br/>					 unsigned int flags)<br/>
+</pre><p>Reads native configuration data describing a domain, and generates libvirt domain XML. The format of the native data is hypervisor dependant.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>a connection object</td></tr><tr><td><span class="term"><i><tt>nativeFormat</tt></i>:</span></td><td>configuration format importing from</td></tr><tr><td><span class="term"><i><tt>nativeConfig</tt></i>:</span></td><td>the configuration data to import</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>currently unused, pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectDomainXMLToNative"/>virConnectDomainXMLToNative ()</h3><pre class="programlisting">char *	virConnectDomainXMLToNative	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * nativeFormat, <br/>					 const char * domainXml, <br/>					 unsigned int flags)<br/>
+</pre><p>Reads a domain XML configuration document, and generates generates a native configuration file describing the domain. The format of the native data is hypervisor dependant.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>a connection object</td></tr><tr><td><span class="term"><i><tt>nativeFormat</tt></i>:</span></td><td>configuration format exporting to</td></tr><tr><td><span class="term"><i><tt>domainXml</tt></i>:</span></td><td>the domain configuration to export</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>currently unused, pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectFindStoragePoolSources"/>virConnectFindStoragePoolSources ()</h3><pre class="programlisting">char *	virConnectFindStoragePoolSources	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * type, <br/>						 const char * srcSpec, <br/>						 unsigned int flags)<br/>
 </pre><p>Talks to a storage backend and attempts to auto-discover the set of available storage pool sources. e.g. For iSCSI this would be a set of iSCSI targets. For NFS this would be a list of exported paths. The srcSpec (optional for some storage pool types, e.g. local ones) is an instance of the storage pool's source element specifying where to look for the pools. srcSpec is not required for some types (e.g., those querying local storage resources only)</p>
@@ -773,6 +865,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virConnectListDefinedDomains"/>virConnectListDefinedDomains ()</h3><pre class="programlisting">int	virConnectListDefinedDomains	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames)<br/>
 </pre><p>list the defined but inactive domains, stores the pointers to the names in @names</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>names</tt></i>:</span></td><td>pointer to an array to store the names</td></tr><tr><td><span class="term"><i><tt>maxnames</tt></i>:</span></td><td>size of the array</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of names provided in the array or -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectListDefinedInterfaces"/>virConnectListDefinedInterfaces ()</h3><pre class="programlisting">int	virConnectListDefinedInterfaces	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames)<br/>
+</pre><p>Collect the list of defined (inactive) physical host interfaces, and store their names in @names.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>names</tt></i>:</span></td><td>array to collect the list of names of interfaces</td></tr><tr><td><span class="term"><i><tt>maxnames</tt></i>:</span></td><td>size of @names</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of interfaces found or -1 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectListDefinedNetworks"/>virConnectListDefinedNetworks ()</h3><pre class="programlisting">int	virConnectListDefinedNetworks	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames)<br/>
 </pre><p>list the inactive networks, stores the pointers to the names in @names</p>
@@ -785,6 +881,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virConnectListDomains"/>virConnectListDomains ()</h3><pre class="programlisting">int	virConnectListDomains		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 int * ids, <br/>					 int maxids)<br/>
 </pre><p>Collect the list of active domains, and store their ID in @maxids</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>ids</tt></i>:</span></td><td>array to collect the list of IDs of active domains</td></tr><tr><td><span class="term"><i><tt>maxids</tt></i>:</span></td><td>size of @ids</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of domain found or -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectListInterfaces"/>virConnectListInterfaces ()</h3><pre class="programlisting">int	virConnectListInterfaces	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames)<br/>
+</pre><p>Collect the list of active physical host interfaces, and store their names in @names</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>names</tt></i>:</span></td><td>array to collect the list of names of interfaces</td></tr><tr><td><span class="term"><i><tt>maxnames</tt></i>:</span></td><td>size of @names</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of interfaces found or -1 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectListNetworks"/>virConnectListNetworks ()</h3><pre class="programlisting">int	virConnectListNetworks		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 char ** const names, <br/>					 int maxnames)<br/>
 </pre><p>Collect the list of active networks, and store their names in @names</p>
@@ -797,6 +897,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virConnectNumOfDefinedDomains"/>virConnectNumOfDefinedDomains ()</h3><pre class="programlisting">int	virConnectNumOfDefinedDomains	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>Provides the number of defined but inactive domains.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of domain found or -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectNumOfDefinedInterfaces"/>virConnectNumOfDefinedInterfaces ()</h3><pre class="programlisting">int	virConnectNumOfDefinedInterfaces	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
+</pre><p>Provides the number of defined (inactive) interfaces on the physical host.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of defined interface found or -1 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectNumOfDefinedNetworks"/>virConnectNumOfDefinedNetworks ()</h3><pre class="programlisting">int	virConnectNumOfDefinedNetworks	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>Provides the number of inactive networks.</p>
@@ -809,6 +913,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virConnectNumOfDomains"/>virConnectNumOfDomains ()</h3><pre class="programlisting">int	virConnectNumOfDomains		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>Provides the number of active domains.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of domain found or -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectNumOfInterfaces"/>virConnectNumOfInterfaces ()</h3><pre class="programlisting">int	virConnectNumOfInterfaces	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
+</pre><p>Provides the number of active interfaces on the physical host.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of active interfaces found or -1 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectNumOfNetworks"/>virConnectNumOfNetworks ()</h3><pre class="programlisting">int	virConnectNumOfNetworks		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
 </pre><p>Provides the number of active networks.</p>
@@ -820,15 +928,19 @@ The content of this structure is not made public by the API.
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectOpen"/>virConnectOpen ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	virConnectOpen		(const char * name)<br/>
 </pre><p>This function should be called first to get a connection to the Hypervisor and xen store</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>URI of the hypervisor</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the hypervisor connection or NULL in case of error URIs are documented at http://libvirt.org/uri.html</td></tr></tbody></table></div></div>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>URI of the hypervisor</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the hypervisor connection or NULL in case of error If @name is NULL then probing will be done to determine a suitable default driver to activate. This involves trying each hypervisor in turn until one successfully opens. If the LIBVIRT_DEFAULT_URI environment variable is set, then it will be used in preference to probing for a driver. If connecting to an unprivileged hypervisor driver which requires the libvirtd daemon to be active, it will automatically be launched if not already running. This can be prevented by setting the environment variable LIBVIRT_AUTOSTART=0 URIs are documented at http://libvirt.org/uri.html</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectOpenAuth"/>virConnectOpenAuth ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	virConnectOpenAuth	(const char * name, <br/>					 <a href="libvirt-libvirt.html#virConnectAuthPtr">virConnectAuthPtr</a> auth, <br/>					 int flags)<br/>
-</pre><p>This function should be called first to get a connection to the Hypervisor. If necessary, authentication will be performed fetching credentials via the callback</p>
+</pre><p>This function should be called first to get a connection to the Hypervisor. If necessary, authentication will be performed fetching credentials via the callback See <a href="libvirt-libvirt.html#virConnectOpen">virConnectOpen</a> for notes about environment variables which can have an effect on opening drivers</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>URI of the hypervisor</td></tr><tr><td><span class="term"><i><tt>auth</tt></i>:</span></td><td>Authenticate callback parameters</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>Open flags</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the hypervisor connection or NULL in case of error URIs are documented at http://libvirt.org/uri.html</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnectOpenReadOnly"/>virConnectOpenReadOnly ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	virConnectOpenReadOnly	(const char * name)<br/>
-</pre><p>This function should be called first to get a restricted connection to the library functionalities. The set of APIs usable are then restricted on the available methods to control the domains.</p>
+</pre><p>This function should be called first to get a restricted connection to the library functionalities. The set of APIs usable are then restricted on the available methods to control the domains. See <a href="libvirt-libvirt.html#virConnectOpen">virConnectOpen</a> for notes about environment variables which can have an effect on opening drivers</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>URI of the hypervisor</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the hypervisor connection or NULL in case of error URIs are documented at http://libvirt.org/uri.html</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virConnectRef"/>virConnectRef ()</h3><pre class="programlisting">int	virConnectRef			(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
+</pre><p>Increment the reference count on the connection. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virConnectClose">virConnectClose</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a connection would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>the connection to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainAttachDevice"/>virDomainAttachDevice ()</h3><pre class="programlisting">int	virDomainAttachDevice		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 const char * xml)<br/>
 </pre><p>Create a virtual device attachment to backend.</p>
@@ -859,7 +971,7 @@ The content of this structure is not made public by the API.
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the domain</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new domain object or NULL in case of failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainDefineXML"/>virDomainDefineXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a>	virDomainDefineXML	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xml)<br/>
-</pre><p>Define a domain, but does not start it. This definition is persistent, until explicitly undefined with virDomainUndefine().</p>
+</pre><p>Define a domain, but does not start it. This definition is persistent, until explicitly undefined with virDomainUndefine(). A previous definition for this domain would be overriden if it already exists.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>xml</tt></i>:</span></td><td>the XML description for the domain, preferably in UTF-8</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, a pointer to the domain otherwise</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainDestroy"/>virDomainDestroy ()</h3><pre class="programlisting">int	virDomainDestroy		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)<br/>
@@ -913,6 +1025,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virDomainGetSchedulerType"/>virDomainGetSchedulerType ()</h3><pre class="programlisting">char *	virDomainGetSchedulerType	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 int * nparams)<br/>
 </pre><p>Get the scheduler type.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>pointer to domain object</td></tr><tr><td><span class="term"><i><tt>nparams</tt></i>:</span></td><td>number of scheduler parameters(return value)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error. The caller must free the returned string.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virDomainGetSecurityLabel"/>virDomainGetSecurityLabel ()</h3><pre class="programlisting">int	virDomainGetSecurityLabel	(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 <a href="libvirt-libvirt.html#virSecurityLabelPtr">virSecurityLabelPtr</a> seclabel)<br/>
+</pre><p>Extract security label of an active domain. The 'label' field in the @seclabel argument will be initialized to the empty string if the domain is not running under a security model.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>seclabel</tt></i>:</span></td><td>pointer to a <a href="libvirt-libvirt.html#virSecurityLabel">virSecurityLabel</a> structure</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainGetUUID"/>virDomainGetUUID ()</h3><pre class="programlisting">int	virDomainGetUUID		(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned char * uuid)<br/>
 </pre><p>Get the UUID for a domain</p>
@@ -965,6 +1081,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virDomainReboot"/>virDomainReboot ()</h3><pre class="programlisting">int	virDomainReboot			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain, <br/>					 unsigned int flags)<br/>
 </pre><p>Reboot a domain, the domain object is still usable there after but the domain OS is being stopped for a restart. Note that the guest OS may ignore the request.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>a domain object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>extra flags for the reboot operation, not used yet</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virDomainRef"/>virDomainRef ()</h3><pre class="programlisting">int	virDomainRef			(<a href="libvirt-libvirt.html#virDomainPtr">virDomainPtr</a> domain)<br/>
+</pre><p>Increment the reference count on the domain. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virDomainFree">virDomainFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a domain would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>domain</tt></i>:</span></td><td>the domain to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDomainRestore"/>virDomainRestore ()</h3><pre class="programlisting">int	virDomainRestore		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * from)<br/>
 </pre><p>This method will restore a domain saved to disk by virDomainSave().</p>
@@ -1021,6 +1141,54 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virInitialize"/>virInitialize ()</h3><pre class="programlisting">int	virInitialize			(void)<br/>
 </pre><p>Initialize the library. It's better to call this routine at startup in multithreaded applications to avoid potential race when initializing the library.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceCreate"/>virInterfaceCreate ()</h3><pre class="programlisting">int	virInterfaceCreate		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags)<br/>
+</pre><p>Activate an interface (ie call "ifup")</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>pointer to a defined interface</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>and OR'ed set of extraction flags, not used yet</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceDefineXML"/>virInterfaceDefineXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	virInterfaceDefineXML	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * xml, <br/>					 unsigned int flags)<br/>
+</pre><p>Define an interface (or modify existing interface configuration)</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>xml</tt></i>:</span></td><td>the XML description for the interface, preferably in UTF-8</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>and OR'ed set of extraction flags, not used yet</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>NULL in case of error, a pointer to the interface otherwise</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceDestroy"/>virInterfaceDestroy ()</h3><pre class="programlisting">int	virInterfaceDestroy		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags)<br/>
+</pre><p>deactivate an interface (ie call "ifdown") This does not remove the interface from the config, and does not free the associated <a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> object.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>an interface object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>and OR'ed set of extraction flags, not used yet</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceFree"/>virInterfaceFree ()</h3><pre class="programlisting">int	virInterfaceFree		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Free the interface object. The interface itself is unaltered. The data structure is freed and should not be used thereafter.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>a interface object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceGetConnect"/>virInterfaceGetConnect ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	virInterfaceGetConnect	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Provides the connection pointer associated with an interface. The reference counter on the connection is not increased by this call. WARNING: When writing libvirt bindings in other languages, do not use this function. Instead, store the connection and the interface object together.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>pointer to a interface</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the <a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> or NULL in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceGetMACString"/>virInterfaceGetMACString ()</h3><pre class="programlisting">const char *	virInterfaceGetMACString	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Get the MAC for a interface as string. For more information about MAC see RFC4122.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>a interface object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the MAC address (in null-terminated ASCII format) or NULL, the string need not be deallocated its lifetime will be the same as the interface object.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceGetName"/>virInterfaceGetName ()</h3><pre class="programlisting">const char *	virInterfaceGetName	(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Get the public name for that interface</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>a interface object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the name or NULL, the string need not be deallocated its lifetime will be the same as the interface object.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceGetXMLDesc"/>virInterfaceGetXMLDesc ()</h3><pre class="programlisting">char *	virInterfaceGetXMLDesc		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface, <br/>					 unsigned int flags)<br/>
+</pre><p>Provide an XML description of the interface. The description may be reused later to recreate the interface with virInterfaceCreateXML().</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>a interface object</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>and OR'ed set of extraction flags, not used yet</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. the caller must free() the returned value.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceLookupByMACString"/>virInterfaceLookupByMACString ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	virInterfaceLookupByMACString	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * macstr)<br/>
+</pre><p>Try to lookup an interface on the given hypervisor based on its MAC.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>macstr</tt></i>:</span></td><td>the MAC for the interface (null-terminated ASCII format)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new interface object or NULL in case of failure. If the interface cannot be found, then <a href="libvirt-virterror.html#VIR_ERR_NO_INTERFACE">VIR_ERR_NO_INTERFACE</a> error is raised.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceLookupByName"/>virInterfaceLookupByName ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a>	virInterfaceLookupByName	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * name)<br/>
+</pre><p>Try to lookup an interface on the given hypervisor based on its name.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>name</tt></i>:</span></td><td>name for the interface</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new interface object or NULL in case of failure. If the interface cannot be found, then <a href="libvirt-virterror.html#VIR_ERR_NO_INTERFACE">VIR_ERR_NO_INTERFACE</a> error is raised.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceRef"/>virInterfaceRef ()</h3><pre class="programlisting">int	virInterfaceRef			(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Increment the reference count on the interface. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virInterfaceFree">virInterfaceFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a interface would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>the interface to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virInterfaceUndefine"/>virInterfaceUndefine ()</h3><pre class="programlisting">int	virInterfaceUndefine		(<a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> iface)<br/>
+</pre><p>Undefine an interface, ie remove it from the config. This does not free the associated <a href="libvirt-libvirt.html#virInterfacePtr">virInterfacePtr</a> object.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>iface</tt></i>:</span></td><td>pointer to a defined interface</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNetworkCreate"/>virNetworkCreate ()</h3><pre class="programlisting">int	virNetworkCreate		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network)<br/>
 </pre><p>Create and start a defined network. If the call succeed the network moves from the defined to the running networks pools.</p>
@@ -1081,6 +1249,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virNetworkLookupByUUIDString"/>virNetworkLookupByUUIDString ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a>	virNetworkLookupByUUIDString	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * uuidstr)<br/>
 </pre><p>Try to lookup a network on the given hypervisor based on its UUID.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>uuidstr</tt></i>:</span></td><td>the string UUID for the network</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a new network object or NULL in case of failure. If the network cannot be found, then <a href="libvirt-virterror.html#VIR_ERR_NO_NETWORK">VIR_ERR_NO_NETWORK</a> error is raised.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNetworkRef"/>virNetworkRef ()</h3><pre class="programlisting">int	virNetworkRef			(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network)<br/>
+</pre><p>Increment the reference count on the network. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virNetworkFree">virNetworkFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a network would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>network</tt></i>:</span></td><td>the network to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNetworkSetAutostart"/>virNetworkSetAutostart ()</h3><pre class="programlisting">int	virNetworkSetAutostart		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network, <br/>					 int autostart)<br/>
 </pre><p>Configure the network to be automatically started when the host machine boots.</p>
@@ -1089,6 +1261,18 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virNetworkUndefine"/>virNetworkUndefine ()</h3><pre class="programlisting">int	virNetworkUndefine		(<a href="libvirt-libvirt.html#virNetworkPtr">virNetworkPtr</a> network)<br/>
 </pre><p>Undefine a network but does not stop it if it is running</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>network</tt></i>:</span></td><td>pointer to a defined network</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceCreateXML"/>virNodeDeviceCreateXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a>	virNodeDeviceCreateXML	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>						 const char * xmlDesc, <br/>						 unsigned int flags)<br/>
+</pre><p>Create a new device on the VM host machine, for example, virtual HBAs created using vport_create.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>xmlDesc</tt></i>:</span></td><td>string containing an XML description of the device to be created</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>callers should always pass 0</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a node device object if successful, NULL in case of failure</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceDestroy"/>virNodeDeviceDestroy ()</h3><pre class="programlisting">int	virNodeDeviceDestroy		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
+</pre><p>Destroy the device object. The virtual device is removed from the host operating system. This function may require privileged access</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>a device object</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceDettach"/>virNodeDeviceDettach ()</h3><pre class="programlisting">int	virNodeDeviceDettach		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
+</pre><p>Dettach the node device from the node itself so that it may be assigned to a guest domain. Depending on the hypervisor, this may involve operations such as unbinding any device drivers from the device, binding the device to a dummy device driver and resetting the device. If the device is currently in use by the node, this method may fail. Once the device is not assigned to any guest, it may be re-attached to the node using the virNodeDeviceReattach() method.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>pointer to the node device</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNodeDeviceFree"/>virNodeDeviceFree ()</h3><pre class="programlisting">int	virNodeDeviceFree		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
 </pre><p>Drops a reference to the node device, freeing it if this was the last reference.</p>
@@ -1117,18 +1301,34 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virNodeDeviceNumOfCaps"/>virNodeDeviceNumOfCaps ()</h3><pre class="programlisting">int	virNodeDeviceNumOfCaps		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
 </pre><p>Accessor for the number of capabilities supported by the device.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>the device</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of capabilities supported by the device.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceReAttach"/>virNodeDeviceReAttach ()</h3><pre class="programlisting">int	virNodeDeviceReAttach		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
+</pre><p>Re-attach a previously dettached node device to the node so that it may be used by the node again. Depending on the hypervisor, this may involve operations such as resetting the device, unbinding it from a dummy device driver and binding it to its appropriate driver. If the device is currently in use by a guest, this method may fail.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>pointer to the node device</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceRef"/>virNodeDeviceRef ()</h3><pre class="programlisting">int	virNodeDeviceRef		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
+</pre><p>Increment the reference count on the dev. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virNodeDeviceFree">virNodeDeviceFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a dev would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>the dev to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeDeviceReset"/>virNodeDeviceReset ()</h3><pre class="programlisting">int	virNodeDeviceReset		(<a href="libvirt-libvirt.html#virNodeDevicePtr">virNodeDevicePtr</a> dev)<br/>
+</pre><p>Reset a previously dettached node device to the node before or after assigning it to a guest. The exact reset semantics depends on the hypervisor and device type but, for example, KVM will attempt to reset PCI devices with a Function Level Reset, Secondary Bus Reset or a Power Management D-State reset. If the reset will affect other devices which are currently in use, this function may fail.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>dev</tt></i>:</span></td><td>pointer to the node device</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNodeGetCellsFreeMemory"/>virNodeGetCellsFreeMemory ()</h3><pre class="programlisting">int	virNodeGetCellsFreeMemory	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 unsigned long long * freeMems, <br/>					 int startCell, <br/>					 int maxCells)<br/>
 </pre><p>This call returns the amount of free memory in one or more NUMA cells. The @freeMems array must be allocated by the caller and will be filled with the amount of free memory in kilobytes for each cell requested, starting with startCell (in freeMems[0]), up to either (startCell + maxCells), or the number of additional cells in the node, whichever is smaller.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>freeMems</tt></i>:</span></td><td>pointer to the array of unsigned long long</td></tr><tr><td><span class="term"><i><tt>startCell</tt></i>:</span></td><td>index of first cell to return freeMems info on.</td></tr><tr><td><span class="term"><i><tt>maxCells</tt></i>:</span></td><td>Maximum number of cells for which freeMems information can be returned.</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of entries filled in freeMems, or -1 in case of error.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNodeGetFreeMemory"/>virNodeGetFreeMemory ()</h3><pre class="programlisting">unsigned long long	virNodeGetFreeMemory	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
-</pre><p>provides the free memory available on the Node</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the available free memory in kilobytes or 0 in case of error</td></tr></tbody></table></div></div>
+</pre><p>provides the free memory available on the Node Note: most libvirt APIs provide memory sizes in kilobytes, but in this function the returned value is in bytes. Divide by 1024 as necessary.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the available free memory in bytes or 0 in case of error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNodeGetInfo"/>virNodeGetInfo ()</h3><pre class="programlisting">int	virNodeGetInfo			(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virNodeInfoPtr">virNodeInfoPtr</a> info)<br/>
 </pre><p>Extract hardware information about the node.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>info</tt></i>:</span></td><td>pointer to a <a href="libvirt-libvirt.html#virNodeInfo">virNodeInfo</a> structure allocated by the user</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success and -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virNodeGetSecurityModel"/>virNodeGetSecurityModel ()</h3><pre class="programlisting">int	virNodeGetSecurityModel		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-libvirt.html#virSecurityModelPtr">virSecurityModelPtr</a> secmodel)<br/>
+</pre><p>Extract the security model of a hypervisor. The 'model' field in the @secmodel argument may be initialized to the empty string if the driver has not activated a security model.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>a connection object</td></tr><tr><td><span class="term"><i><tt>secmodel</tt></i>:</span></td><td>pointer to a <a href="libvirt-libvirt.html#virSecurityModel">virSecurityModel</a> structure</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virNodeListDevices"/>virNodeListDevices ()</h3><pre class="programlisting">int	virNodeListDevices		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 const char * cap, <br/>					 char ** const names, <br/>					 int maxnames, <br/>					 unsigned int flags)<br/>
 </pre><p>Collect the list of node devices, and store their names in @names If the optional 'cap' argument is non-NULL, then the count will be restricted to devices with the specified capability</p>
@@ -1217,6 +1417,10 @@ The content of this structure is not made public by the API.
         <div class="refsect2" lang="en"><h3><a name="virStoragePoolNumOfVolumes"/>virStoragePoolNumOfVolumes ()</h3><pre class="programlisting">int	virStoragePoolNumOfVolumes	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool)<br/>
 </pre><p>Fetch the number of storage volumes within a pool</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>pointer to storage pool</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of storage pools, or -1 on failure</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virStoragePoolRef"/>virStoragePoolRef ()</h3><pre class="programlisting">int	virStoragePoolRef		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool)<br/>
+</pre><p>Increment the reference count on the pool. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virStoragePoolFree">virStoragePoolFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a pool would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>the pool to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStoragePoolRefresh"/>virStoragePoolRefresh ()</h3><pre class="programlisting">int	virStoragePoolRefresh		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>					 unsigned int flags)<br/>
 </pre><p>Request that the pool refresh its list of volumes. This may involve communicating with a remote server, and/or initializing new devices at the OS layer</p>
@@ -1228,18 +1432,22 @@ The content of this structure is not made public by the API.
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStoragePoolUndefine"/>virStoragePoolUndefine ()</h3><pre class="programlisting">int	virStoragePoolUndefine		(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool)<br/>
 </pre><p>Undefine an inactive storage pool</p>
-<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>pointer to storage pool</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a <a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> object, or NULL if creation failed</td></tr></tbody></table></div></div>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>pointer to storage pool</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 on success, -1 on failure</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStorageVolCreateXML"/>virStorageVolCreateXML ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	virStorageVolCreateXML	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>						 const char * xmldesc, <br/>						 unsigned int flags)<br/>
 </pre><p>Create a storage volume within a pool based on an XML description. Not all pools support creation of volumes</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>pointer to storage pool</td></tr><tr><td><span class="term"><i><tt>xmldesc</tt></i>:</span></td><td>description of volume to create</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>flags for creation (unused, pass 0)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the storage volume, or NULL on error</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virStorageVolCreateXMLFrom"/>virStorageVolCreateXMLFrom ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a>	virStorageVolCreateXMLFrom	(<a href="libvirt-libvirt.html#virStoragePoolPtr">virStoragePoolPtr</a> pool, <br/>							 const char * xmldesc, <br/>							 <a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> clonevol, <br/>							 unsigned int flags)<br/>
+</pre><p>Create a storage volume in the parent pool, using the 'clonevol' volume as input. Information for the new volume (name, perms) are passed via a typical volume XML description.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>pool</tt></i>:</span></td><td>pointer to parent pool for the new volume</td></tr><tr><td><span class="term"><i><tt>xmldesc</tt></i>:</span></td><td>description of volume to create</td></tr><tr><td><span class="term"><i><tt>clonevol</tt></i>:</span></td><td>storage volume to use as input</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>flags for creation (unused, pass 0)</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the storage volume, or NULL on error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStorageVolDelete"/>virStorageVolDelete ()</h3><pre class="programlisting">int	virStorageVolDelete		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol, <br/>					 unsigned int flags)<br/>
 </pre><p>Delete the storage volume from the pool</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>vol</tt></i>:</span></td><td>pointer to storage volume</td></tr><tr><td><span class="term"><i><tt>flags</tt></i>:</span></td><td>future flags, use 0 for now</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 on success, or -1 on error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStorageVolFree"/>virStorageVolFree ()</h3><pre class="programlisting">int	virStorageVolFree		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol)<br/>
-</pre><p>Release the storage volume handle. The underlying storage volume contains to exist</p>
+</pre><p>Release the storage volume handle. The underlying storage volume continues to exist.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>vol</tt></i>:</span></td><td>pointer to storage volume</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 on success, or -1 on error</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virStorageVolGetConnect"/>virStorageVolGetConnect ()</h3><pre class="programlisting"><a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a>	virStorageVolGetConnect	(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol)<br/>
@@ -1278,6 +1486,10 @@ The content of this structure is not made public by the API.
 </pre><p>Fetch a pointer to a storage volume based on its locally (host) unique path</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to hypervisor connection</td></tr><tr><td><span class="term"><i><tt>path</tt></i>:</span></td><td>locally unique path</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a storage volume, or NULL if not found / error</td></tr></tbody></table></div></div>
         <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virStorageVolRef"/>virStorageVolRef ()</h3><pre class="programlisting">int	virStorageVolRef		(<a href="libvirt-libvirt.html#virStorageVolPtr">virStorageVolPtr</a> vol)<br/>
+</pre><p>Increment the reference count on the vol. For each additional call to this method, there shall be a corresponding call to <a href="libvirt-libvirt.html#virStorageVolFree">virStorageVolFree</a> to release the reference count, once the caller no longer needs the reference to this object. This method is typically useful for applications where multiple threads are using a connection, and it is required that the connection remain open until all threads have finished using it. ie, each new thread using a vol would increment the reference count.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>vol</tt></i>:</span></td><td>the vol to hold a reference on</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 in case of success, -1 in case of failure.</td></tr></tbody></table></div></div>
+        <hr/>
       </div>
     </div>
   </body>

docs/devhelp/libvirt-virterror.html

@@ -43,6 +43,7 @@ typedef enum <a href="#virErrorLevel">virErrorLevel</a>;
 typedef enum <a href="#virErrorDomain">virErrorDomain</a>;
 typedef enum <a href="#virErrorNumber">virErrorNumber</a>;
 typedef struct _virError <a href="#virError">virError</a>;
+void	<a href="#virFreeError">virFreeError</a>			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err);
 int	<a href="#virCopyLastError">virCopyLastError</a>		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to);
 void	<a href="#virConnSetErrorFunc">virConnSetErrorFunc</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler);
 void	<a href="#virResetLastError">virResetLastError</a>		(void);
@@ -54,6 +55,7 @@ void	<a href="#virDefaultErrorFunc">virDefaultErrorFunc</a>		(<a href="libvirt-v
 void	<a href="#virSetErrorFunc">virSetErrorFunc</a>			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler);
 int	<a href="#virConnCopyLastError">virConnCopyLastError</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to);
 void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn);
+<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	<a href="#virSaveLastError">virSaveLastError</a>	(void);
 </pre>
     </div>
     <div class="refsect1" lang="en">
@@ -103,7 +105,13 @@ void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvi
     <a name="VIR_FROM_DOMAIN">VIR_FROM_DOMAIN</a> = 20 /* Error from domain config */
     <a name="VIR_FROM_UML">VIR_FROM_UML</a> = 21 /* Error at the UML driver */
     <a name="VIR_FROM_NODEDEV">VIR_FROM_NODEDEV</a> = 22 /* Error from node device monitor */
-    <a name="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a> = 23 /*  Error from xen inotify layer */
+    <a name="VIR_FROM_XEN_INOTIFY">VIR_FROM_XEN_INOTIFY</a> = 23 /* Error from xen inotify layer */
+    <a name="VIR_FROM_SECURITY">VIR_FROM_SECURITY</a> = 24 /* Error from security framework */
+    <a name="VIR_FROM_VBOX">VIR_FROM_VBOX</a> = 25 /* Error from VirtualBox driver */
+    <a name="VIR_FROM_INTERFACE">VIR_FROM_INTERFACE</a> = 26 /* Error when operating on an interface */
+    <a name="VIR_FROM_ONE">VIR_FROM_ONE</a> = 27 /* Error from OpenNebula driver */
+    <a name="VIR_FROM_ESX">VIR_FROM_ESX</a> = 28 /* Error from ESX driver */
+    <a name="VIR_FROM_PHYP">VIR_FROM_PHYP</a> = 29 /*  Error from IBM power hypervisor */
 };
 </pre><p/>
 </div>
@@ -170,7 +178,13 @@ void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvi
     <a name="VIR_ERR_NO_STORAGE_VOL">VIR_ERR_NO_STORAGE_VOL</a> = 50 /* storage pool not found */
     <a name="VIR_WAR_NO_NODE">VIR_WAR_NO_NODE</a> = 51 /* failed to start node driver */
     <a name="VIR_ERR_INVALID_NODE_DEVICE">VIR_ERR_INVALID_NODE_DEVICE</a> = 52 /* invalid node device object */
-    <a name="VIR_ERR_NO_NODE_DEVICE">VIR_ERR_NO_NODE_DEVICE</a> = 53 /*  node device not found */
+    <a name="VIR_ERR_NO_NODE_DEVICE">VIR_ERR_NO_NODE_DEVICE</a> = 53 /* node device not found */
+    <a name="VIR_ERR_NO_SECURITY_MODEL">VIR_ERR_NO_SECURITY_MODEL</a> = 54 /* security model not found */
+    <a name="VIR_ERR_OPERATION_INVALID">VIR_ERR_OPERATION_INVALID</a> = 55 /* operation is not applicable at this time */
+    <a name="VIR_WAR_NO_INTERFACE">VIR_WAR_NO_INTERFACE</a> = 56 /* failed to start interface driver */
+    <a name="VIR_ERR_NO_INTERFACE">VIR_ERR_NO_INTERFACE</a> = 57 /* interface driver not running */
+    <a name="VIR_ERR_INVALID_INTERFACE">VIR_ERR_INVALID_INTERFACE</a> = 58 /* invalid interface object */
+    <a name="VIR_ERR_MULTIPLE_INTERFACES">VIR_ERR_MULTIPLE_INTERFACES</a> = 59 /*  more than one matching interface found */
 };
 </pre><p/>
 </div>
@@ -184,15 +198,15 @@ void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvi
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>userData</tt></i>:</span></td><td>user provided data for the error callback</td></tr><tr><td><span class="term"><i><tt>error</tt></i>:</span></td><td>the error being raised.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnCopyLastError"/>virConnCopyLastError ()</h3><pre class="programlisting">int	virConnCopyLastError		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 <a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to)<br/>
-</pre><p>Copy the content of the last error caught on that connection One will need to free the result with virResetError()</p>
+</pre><p>Copy the content of the last error caught on that connection This method is not protected against access from multiple threads. In a multi-threaded application, always use the global virGetLastError() API which is backed by thread local storage. If the connection object was discovered to be invalid by an API call, then the error will be reported against the global error object. Since 0.6.0, all errors reported in the per-connection object are also duplicated in the global error object. As such an application can always use virGetLastError(). This method remains for backwards compatability. One will need to free the result with virResetError()</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>to</tt></i>:</span></td><td>target to receive the copy</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no error was found and the error code otherwise and -1 in case of parameter error.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnGetLastError"/>virConnGetLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virConnGetLastError	(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
-</pre><p>Provide a pointer to the last error caught on that connection Simpler but may not be suitable for multithreaded accesses, in which case use virConnCopyLastError()</p>
+</pre><p>Provide a pointer to the last error caught on that connection This method is not protected against access from multiple threads. In a multi-threaded application, always use the global virGetLastError() API which is backed by thread local storage. If the connection object was discovered to be invalid by an API call, then the error will be reported against the global error object. Since 0.6.0, all errors reported in the per-connection object are also duplicated in the global error object. As such an application can always use virGetLastError(). This method remains for backwards compatability.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the last error or NULL if none occurred.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnResetLastError"/>virConnResetLastError ()</h3><pre class="programlisting">void	virConnResetLastError		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn)<br/>
-</pre><p>Reset the last error caught on that connection</p>
+</pre><p>The error object is kept in thread local storage, so separate threads can safely access this concurrently. Reset the last error caught on that connection</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virConnSetErrorFunc"/>virConnSetErrorFunc ()</h3><pre class="programlisting">void	virConnSetErrorFunc		(<a href="libvirt-libvirt.html#virConnectPtr">virConnectPtr</a> conn, <br/>					 void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler)<br/>
@@ -200,15 +214,19 @@ void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvi
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>conn</tt></i>:</span></td><td>pointer to the hypervisor connection</td></tr><tr><td><span class="term"><i><tt>userData</tt></i>:</span></td><td>pointer to the user data provided in the handler callback</td></tr><tr><td><span class="term"><i><tt>handler</tt></i>:</span></td><td>the function to get called in case of error or NULL</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virCopyLastError"/>virCopyLastError ()</h3><pre class="programlisting">int	virCopyLastError		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> to)<br/>
-</pre><p>Copy the content of the last error caught at the library level One will need to free the result with virResetError()</p>
+</pre><p>Copy the content of the last error caught at the library level The error object is kept in thread local storage, so separate threads can safely access this concurrently. One will need to free the result with virResetError()</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>to</tt></i>:</span></td><td>target to receive the copy</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>0 if no error was found and the error code otherwise and -1 in case of parameter error.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virDefaultErrorFunc"/>virDefaultErrorFunc ()</h3><pre class="programlisting">void	virDefaultErrorFunc		(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
 </pre><p>Default routine reporting an error to stderr.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>pointer to the error.</td></tr></tbody></table></div></div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virFreeError"/>virFreeError ()</h3><pre class="programlisting">void	virFreeError			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
+</pre><p>Resets and frees the given error.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>error to free</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virGetLastError"/>virGetLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virGetLastError		(void)<br/>
-</pre><p>Provide a pointer to the last error caught at the library level Simpler but may not be suitable for multithreaded accesses, in which case use virCopyLastError()</p>
+</pre><p>Provide a pointer to the last error caught at the library level The error object is kept in thread local storage, so separate threads can safely access this concurrently.</p>
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the last error or NULL if none occurred.</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virResetError"/>virResetError ()</h3><pre class="programlisting">void	virResetError			(<a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a> err)<br/>
@@ -216,8 +234,12 @@ void	<a href="#virConnResetLastError">virConnResetLastError</a>		(<a href="libvi
 <div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>err</tt></i>:</span></td><td>pointer to the <a href="libvirt-virterror.html#virError">virError</a> to clean up</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virResetLastError"/>virResetLastError ()</h3><pre class="programlisting">void	virResetLastError		(void)<br/>
-</pre><p>Reset the last error caught at the library level.</p>
+</pre><p>Reset the last error caught at the library level. The error object is kept in thread local storage, so separate threads can safely access this concurrently, only resetting their own error object.</p>
 </div>
+        <hr/>
+        <div class="refsect2" lang="en"><h3><a name="virSaveLastError"/>virSaveLastError ()</h3><pre class="programlisting"><a href="libvirt-virterror.html#virErrorPtr">virErrorPtr</a>	virSaveLastError	(void)<br/>
+</pre><p>Save the last error into a new error object.</p>
+<div class="variablelist"><table border="0"><col align="left"/><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>a pointer to the copied error or NULL if allocation failed. It is the caller's responsibility to free the error with virFreeError().</td></tr></tbody></table></div></div>
         <hr/>
         <div class="refsect2" lang="en"><h3><a name="virSetErrorFunc"/>virSetErrorFunc ()</h3><pre class="programlisting">void	virSetErrorFunc			(void * userData, <br/>					 <a href="libvirt-virterror.html#virErrorFunc">virErrorFunc</a> handler)<br/>
 </pre><p>Set a library global error handling function, if @handler is NULL, it will reset to default printing on stderr. The error raised there are those for which no handler at the connection level could caught.</p>

docs/docs.html

@@ -63,6 +63,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/downloads.html

@@ -75,35 +75,44 @@
         <ul><li><a href="ftp://libvirt.org/libvirt/">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/">libvirt.org HTTP server</a></li></ul>
         <h2>Hourly development snapshots</h2>
         <p>
-      Once an hour, an automated snapshot is made from the latest CVS server
+      Once an hour, an automated snapshot is made from the git server
       source tree. These snapshots should be usable, but we make no guarantees
       about their stability:
     </p>
-        <ul><li><a href="ftp://libvirt.org/libvirt/libvirt-cvs-snapshot.tar.gz">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/libvirt-cvs-snapshot.tar.gz">libvirt.org HTTP server</a></li></ul>
-        <h2>CVS repository access</h2>
-        <p>
-      The master source repository uses <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
-      and anonymous access is provided. Prior to accessing the server is it necessary
-      to authenticate using the password <code>anoncvs</code>. This can be accomplished with the
-      <code>cvs login</code> command:
+        <ul><li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.gz">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li></ul>
+        <h2>GIT source repository</h2>
+        <p> Libvirt code source is now maintained in a <a href="http://git-scm.com/">git</a> repository available on
+      <a href="http://libvirt.org/git/">libvirt.org</a>:
     </p>
         <pre>
 
-      # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs login
+      git clone git://libvirt.org/libvirt.git
     </pre>
         <p>
-      Once authenticated, a checkout can be obtained using
+      It can also be browsed at
     </p>
         <pre>
 
+      <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a>
+    </pre>
+        <h2>CVS repository access (Deprecated) </h2>
+        <p>
+      The master source repository used to be under <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
+      with anonymous access at:
+       </p>
+        <pre>
+
       # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt
     </pre>
-        <p>
-      The libvirt build process uses GNU autotools, so after obtaining a checkout
-      it is necessary to generate the configure script and Makefile.in templates
-      using the <code>autogen.sh</code> command. As an example, to do a complete
-      build and install it into your home directory run:
-    </p>
+        <p> The server is maintainened temporarilly for existing uses, but all
+      changes are only commited to git now and we expect to deprecate the CVS
+      server during summer 2009. </p>
+        <h2>Building from a source code checkout</h2>
+        <p> The libvirt build process uses GNU autotools, so after obtaining a
+    checkout it is necessary to generate the configure script and Makefile.in
+    templates using the <code>autogen.sh</code> command, passing the extra
+    arguments as as for configure. As an example, to do a complete build and
+    install it into your home directory run:</p>
         <pre>
 
       ./autogen.sh --prefix=$HOME/usr
@@ -112,8 +121,12 @@
     </pre>
         <h2>GIT repository mirror</h2>
         <p>
-      The CVS source repository is also mirrored using GIT, and is available
-      for anonymous access via:
+      Jim Mereying was maintaining a CVS to git mirror on
+      <a href="http://git.et.redhat.com/?p=libvirt.git">git.et.redhat.com</a>.
+      Existing users should migrate to the new libvirt.org git server, as the
+      old one is now deprecated.  For the sake of old links including now-
+      rewritten SHA1s, we'll leave the old repository on-line for some time.
+      It is available as:
     </p>
         <pre>
 
@@ -123,7 +136,6 @@
       It can also be browsed at
     </p>
         <pre>
-
       <a href="http://git.et.redhat.com/?p=libvirt.git;a=summary">http://git.et.redhat.com/?p=libvirt.git;a=summary</a>
     </pre>
       </div>

docs/downloads.html.in

@@ -17,47 +17,52 @@
     <h2>Hourly development snapshots</h2>
 
     <p>
-      Once an hour, an automated snapshot is made from the latest CVS server
+      Once an hour, an automated snapshot is made from the git server
       source tree. These snapshots should be usable, but we make no guarantees
       about their stability:
     </p>
 
     <ul>
-      <li><a href="ftp://libvirt.org/libvirt/libvirt-cvs-snapshot.tar.gz">libvirt.org FTP server</a></li>
-      <li><a href="http://libvirt.org/sources/libvirt-cvs-snapshot.tar.gz">libvirt.org HTTP server</a></li>
+      <li><a href="ftp://libvirt.org/libvirt/libvirt-git-snapshot.tar.gz">libvirt.org FTP server</a></li>
+      <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li>
     </ul>
 
-    <h2>CVS repository access</h2>
-
-    <p>
-      The master source repository uses <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
-      and anonymous access is provided. Prior to accessing the server is it necessary
-      to authenticate using the password <code>anoncvs</code>. This can be accomplished with the
-      <code>cvs login</code> command:
+      <h2>GIT source repository</h2>
+      <p> Libvirt code source is now maintained in a <a
+      href="http://git-scm.com/">git</a> repository available on
+      <a href="http://libvirt.org/git/">libvirt.org</a>:
     </p>
+        <pre>
 
-    <pre>
-
-      # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs login
+      git clone git://libvirt.org/libvirt.git
     </pre>
-
-    <p>
-      Once authenticated, a checkout can be obtained using
+        <p>
+      It can also be browsed at
     </p>
+        <pre>
 
-    <pre>
+      <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a>
+    </pre>
+        <h2>CVS repository access (Deprecated) </h2>
+        <p>
+      The master source repository used to be under <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
+      with anonymous access at:
+       </p>
+        <pre>
 
       # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt
     </pre>
+      <p> The server is maintainened temporarilly for existing uses, but all
+      changes are only commited to git now and we expect to deprecate the CVS
+      server during summer 2009. </p>
 
-    <p>
-      The libvirt build process uses GNU autotools, so after obtaining a checkout
-      it is necessary to generate the configure script and Makefile.in templates
-      using the <code>autogen.sh</code> command. As an example, to do a complete
-      build and install it into your home directory run:
-    </p>
-
-    <pre>
+       <h2>Building from a source code checkout</h2>
+    <p> The libvirt build process uses GNU autotools, so after obtaining a
+    checkout it is necessary to generate the configure script and Makefile.in
+    templates using the <code>autogen.sh</code> command, passing the extra
+    arguments as as for configure. As an example, to do a complete build and
+    install it into your home directory run:</p>
+        <pre>
 
       ./autogen.sh --prefix=$HOME/usr
       make
@@ -67,21 +72,21 @@
     <h2>GIT repository mirror</h2>
 
     <p>
-      The CVS source repository is also mirrored using GIT, and is available
-      for anonymous access via:
+      Jim Mereying was maintaining a CVS to git mirror on
+      <a href="http://git.et.redhat.com/?p=libvirt.git">git.et.redhat.com</a>.
+      Existing users should migrate to the new libvirt.org git server, as the
+      old one is now deprecated.  For the sake of old links including now-
+      rewritten SHA1s, we'll leave the old repository on-line for some time.
+      It is available as:
     </p>
-
     <pre>
 
       git clone git://git.et.redhat.com/libvirt.git
     </pre>
-
     <p>
       It can also be browsed at
     </p>
-
     <pre>
-
       <a href="http://git.et.redhat.com/?p=libvirt.git;a=summary">http://git.et.redhat.com/?p=libvirt.git;a=summary</a>
     </pre>
 

docs/drivers.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -137,7 +149,7 @@
         <p>
       The hypervisor drivers currently supported by libvirt are:
     </p>
-        <ul><li><strong><a href="drvxen.html">Xen</a></strong></li><li><strong><a href="drvqemu.html">QEMU</a></strong></li><li><strong><a href="drvlxc.html">LXC</a></strong></li><li><strong><a href="drvtest.html">Test</a></strong></li><li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li></ul>
+        <ul><li><strong><a href="drvxen.html">Xen</a></strong></li><li><strong><a href="drvqemu.html">QEMU</a></strong></li><li><strong><a href="drvlxc.html">LXC</a></strong></li><li><strong><a href="drvtest.html">Test</a></strong></li><li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li><li><strong><a href="drvvbox.html">VirtualBox</a></strong></li><li><strong><a href="drvone.html">OpenNebula</a></strong></li></ul>
       </div>
     </div>
     <div id="footer">

docs/drivers.html.in

@@ -22,6 +22,8 @@
       <li><strong><a href="drvlxc.html">LXC</a></strong></li>
       <li><strong><a href="drvtest.html">Test</a></strong></li>
       <li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li>
+      <li><strong><a href="drvvbox.html">VirtualBox</a></strong></li>
+      <li><strong><a href="drvone.html">OpenNebula</a></strong></li>
     </ul>
   </body>
 </html>

docs/drvlxc.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -126,6 +138,81 @@
       </div>
       <div id="content">
         <h1>LXC container driver</h1>
+        <p>
+The libvirt LXC driver manages "Linux Containers".  Containers are sets of processes
+with private namespaces which can (but don't always) look like separate machines, but
+do not have their own OS.  Here are two example configurations.  The first is a very
+light-weight "application container" which does not have it's own root image.  You would
+start it using
+</p>
+        <h3>Example config version 1</h3>
+        <p></p>
+        <pre>
+&lt;domain type='lxc'&gt;
+	&lt;name&gt;vm1&lt;/name&gt;
+	&lt;memory&gt;500000&lt;/memory&gt;
+	&lt;os&gt;
+		&lt;type&gt;exe&lt;/type&gt;
+		&lt;init&gt;/bin/sh&lt;/init&gt;
+	&lt;/os&gt;
+	&lt;vcpu&gt;1&lt;/vcpu&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;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt;
+		&lt;interface type='network'&gt;
+			&lt;source network='default'/&gt;
+		&lt;/interface&gt;
+		&lt;console type='pty' /&gt;
+	&lt;/devices&gt;
+&lt;/domain&gt;
+</pre>
+        <p>
+The next example assumes there is a private root filesystem
+(perhaps hand-crafted using busybox, or installed from media,
+debootstrap, whatever) under /opt/vm-1-root:
+</p>
+        <p></p>
+        <pre>
+&lt;domain type='lxc'&gt;
+	&lt;name&gt;vm1&lt;/name&gt;
+	&lt;memory&gt;32768&lt;/memory&gt;
+	&lt;os&gt;
+		&lt;type&gt;exe&lt;/type&gt;
+		&lt;init&gt;/init&lt;/init&gt;
+	&lt;/os&gt;
+	&lt;vcpu&gt;1&lt;/vcpu&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;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt;
+		&lt;filesystem type='mount'&gt;
+			&lt;source dir='/opt/vm-1-root'/&gt;
+			&lt;target dir='/'/&gt;
+		&lt;/filesystem&gt;
+		&lt;interface type='network'&gt;
+			&lt;source network='default'/&gt;
+		&lt;/interface&gt;
+		&lt;console type='pty' /&gt;
+	&lt;/devices&gt;
+&lt;/domain&gt;
+</pre>
+        <p>
+In both cases, you can define and start a container using:</p>
+        <pre>
+virsh --connect lxc:/// define v1.xml
+virsh --connect lxc:/// start v1.xml
+</pre>
+        <pre>
+virsh --connect lxc:/// console v1
+</pre>
+        <p>Now doing 'ps -ef' will only show processes in the container, for
+instance.
+</p>
       </div>
     </div>
     <div id="footer">

docs/drvlxc.html.in

@@ -1,5 +1,84 @@
 <html>
   <body>
     <h1>LXC container driver</h1>
+<p>
+The libvirt LXC driver manages "Linux Containers".  Containers are sets of processes
+with private namespaces which can (but don't always) look like separate machines, but
+do not have their own OS.  Here are two example configurations.  The first is a very
+light-weight "application container" which does not have it's own root image.  You would
+start it using
+</p>
+
+<h3>Example config version 1</h3>
+<p></p>
+<pre>
+&lt;domain type='lxc'&gt;
+	&lt;name&gt;vm1&lt;/name&gt;
+	&lt;memory&gt;500000&lt;/memory&gt;
+	&lt;os&gt;
+		&lt;type&gt;exe&lt;/type&gt;
+		&lt;init&gt;/bin/sh&lt;/init&gt;
+	&lt;/os&gt;
+	&lt;vcpu&gt;1&lt;/vcpu&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;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt;
+		&lt;interface type='network'&gt;
+			&lt;source network='default'/&gt;
+		&lt;/interface&gt;
+		&lt;console type='pty' /&gt;
+	&lt;/devices&gt;
+&lt;/domain&gt;
+</pre>
+
+<p>
+The next example assumes there is a private root filesystem
+(perhaps hand-crafted using busybox, or installed from media,
+debootstrap, whatever) under /opt/vm-1-root:
+</p>
+<p></p>
+<pre>
+&lt;domain type='lxc'&gt;
+	&lt;name&gt;vm1&lt;/name&gt;
+	&lt;memory&gt;32768&lt;/memory&gt;
+	&lt;os&gt;
+		&lt;type&gt;exe&lt;/type&gt;
+		&lt;init&gt;/init&lt;/init&gt;
+	&lt;/os&gt;
+	&lt;vcpu&gt;1&lt;/vcpu&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;emulator&gt;/usr/libexec/libvirt_lxc&lt;/emulator&gt;
+		&lt;filesystem type='mount'&gt;
+			&lt;source dir='/opt/vm-1-root'/&gt;
+			&lt;target dir='/'/&gt;
+		&lt;/filesystem&gt;
+		&lt;interface type='network'&gt;
+			&lt;source network='default'/&gt;
+		&lt;/interface&gt;
+		&lt;console type='pty' /&gt;
+	&lt;/devices&gt;
+&lt;/domain&gt;
+</pre>
+
+<p>
+In both cases, you can define and start a container using:</p>
+<pre>
+virsh --connect lxc:/// define v1.xml
+virsh --connect lxc:/// start v1.xml
+</pre>
+and then get a console  using:
+<pre>
+virsh --connect lxc:/// console v1
+</pre>
+<p>Now doing 'ps -ef' will only show processes in the container, for
+instance.
+</p>
   </body>
 </html>

docs/drvone.html

@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+        This file is autogenerated from drvone.html.in
+        Do not edit this file. Changes will be lost.
+      -->
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <link rel="stylesheet" type="text/css" href="main.css" />
+    <link rel="SHORTCUT ICON" href="32favicon.png" />
+    <title>libvirt: OpenNebula Virtual Infrastructure Manager driver</title>
+    <meta name="description" content="libvirt, virtualization, virtualization API" />
+  </head>
+  <body>
+    <div id="header">
+      <div id="headerLogo"></div>
+      <div id="headerSearch">
+        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
+            <input id="query" name="query" type="text" size="12" value="" />
+            <input id="submit" name="submit" type="submit" value="Search" />
+          </div></form>
+      </div>
+    </div>
+    <div id="body">
+      <div id="menu">
+        <ul class="l0"><li>
+            <div>
+              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
+              <ul class="l1"><li>
+                  <div>
+                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Hypervisor specific driver information" class="active" href="drivers.html">Drivers</a>
+                    <ul class="l2"><li>
+                        <div>
+                          <a title="Driver the Xen hypervisor" class="inactive" href="drvxen.html">Xen</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for QEMU, KQEMU, KVM and Xenner" class="inactive" href="drvqemu.html">QEMU / KVM</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the Linux native container API" class="inactive" href="drvlxc.html">Linux Container</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Psuedo-driver simulating APIs in memory for test suites" class="inactive" href="drvtest.html">Test</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver providing secure remote to the libvirt APIs" class="inactive" href="drvremote.html">Remote</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the OpenVZ container technology" class="inactive" href="drvopenvz.html">OpenVZ</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the User Mode Linux technology" class="inactive" href="drvuml.html">UML</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <span class="active">OpenNebula</span>
+                        </div>
+                      </li></ul>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
+                </li></ul>
+            </div>
+          </li><li>
+            <div>
+              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
+            </div>
+          </li></ul>
+      </div>
+      <div id="content">
+        <h1>OpenNebula Virtual Infrastructure Manager driver</h1>
+        <p><a name="toc" id="toc"></a><a href="http://opennebula.org/">OpenNebula</a>
+is a Virtual Infrastructure Manager that controls Virtual Machines (VM) in a pool of distributed resources
+by orchestrating network, storage and virtualization technologies. The OpenNebula driver lets you manage your private or hybrid (<a href="http://aws.amazon.com/ec2/">Amazon EC2</a> or <a href="http://www.elastichosts.com/">Elastic Hosts</a> based) cloud using a standard libvirt interface, including the API as well as the related
+tools and VM description files.</p>
+        <h2>
+<a name="prereq" id="prereq"></a>Deployment pre-requisites</h2>
+        <ul><li>
+<p style="margin-bottom: 0in">A working OpenNebula installation,
+	version 1.2 or higher.
+	</p>
+	</li></ul>
+        <h2>
+<a name="uris" id="uris"></a>Connections to OpenNebula driver</h2>
+        <p>The Uri of the driver protocol is "one". Some example
+connection Uris for the driver are:
+</p>
+        <pre>    one:///                      (local access)
+    one+unix:///                 (local access)
+    one://example.com/           (remote access)
+    one+tcp://example.com/       (remote access, SASl/Kerberos)
+    one+ssh://user@example.com/  (remote access, SSH tunnelled)
+    </pre>
+        <h2>
+<a name="xmlconfig" id="xmlconfig"></a>Example domain XML config</h2>
+        <p>There are some limitations on the XML attributes that may be
+specified when interfacing OpenNebula. The following xml example
+details the attributes and options supported by the OpenNebula
+driver:</p>
+        <h3>Paravirtualized guest direct kernel boot 
+</h3>
+        <pre>    &lt;domain type='one'&gt;
+    &lt;name&gt;vm01&lt;/name&gt;
+    &lt;memory&gt;32768&lt;/memory&gt;
+    &lt;vcpu&gt;1&lt;/vcpu&gt;
+
+    &lt;os&gt;
+        &lt;type&gt;linux&lt;/type&gt;
+        &lt;kernel&gt;/boot/vmlinuz-2.6.24-17-xen&lt;/kernel&gt;
+        &lt;initrd&gt;/boot/initrd.img-2.6.24-17-xen&lt;/initrd&gt;
+        &lt;cmdline&gt;&lt;/cmdline&gt;
+        &lt;root&gt;sda1&lt;/root&gt;
+    &lt;/os&gt;
+
+    &lt;devices&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/images/sgehosts/01/disk.img'/&gt;
+            &lt;target dev='sda1'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/images/sgehosts/01/swap.img'/&gt;
+            &lt;target dev='sda2'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='cdrom'&gt;
+            &lt;source file='/images/iso/cdrom.iso'/&gt;
+            &lt;target dev='hdc'/&gt;
+            &lt;readonly/&gt;
+        &lt;/disk&gt;
+
+
+        &lt;!--BRIDGE--&gt;
+        &lt;interface type='bridge'&gt;
+            &lt;source bridge='eth0'/&gt;
+            &lt;mac address='00:16:3e:5d:c7:9e'/&gt;
+        &lt;/interface&gt;
+
+        &lt;!--ONE Network--&gt; 
+        &lt;interface type='network'&gt;
+          &lt;source network='onenetwork'/&gt;
+        &lt;/interface&gt;
+    &lt;/devices&gt;
+    &lt;/domain&gt;
+    </pre>
+        <p>
+<b>Note:</b> The "&lt;interface type='network'&gt;" will
+attach the interface to a previously configured network (named
+<tt>onenetwork</tt>) within the <a href="http://opennebula.org/">OpenNebula</a> system, typically with the
+<tt>onevnet</tt> CLI command.</p>
+        <p><b>Note</b>: OpenNebula supports the simultaneous use of different hypervisors, so you can specify any os type (linux or hvm) supported by your cluster.    
+</p>
+        <h2>Links</h2>
+        <ul><li><a href="http://www.opennebula.org/doku.php?id=documentation">OpenNebula Documentation</a>
+</li><li><a href="http://www.opennebula.org/doku.php?id=documentation:rel1.2:ug">OpenNebula User Guide</a>
+</li></ul>
+      </div>
+    </div>
+    <div id="footer">
+      <p id="sponsor">
+	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
+    </div>
+  </body>
+</html>

docs/drvone.html.in

@@ -0,0 +1,107 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
+<title></title>
+<meta name="GENERATOR" content="OpenOffice.org 3.0  (Linux)">
+<meta name="CREATED" content="0;0">
+<meta name="CHANGED" content="20090701;13170700">
+</head>
+<body lang="en-US" dir="LTR">
+<h1>OpenNebula Virtual Infrastructure Manager driver</h1>
+<p><a name="toc"></a><a href="http://opennebula.org/">OpenNebula</a>
+is a Virtual Infrastructure Manager that controls Virtual Machines (VM) in a pool of distributed resources
+by orchestrating network, storage and virtualization technologies. The OpenNebula driver lets you manage your private or hybrid (<a href="http://aws.amazon.com/ec2/">Amazon EC2</a> or <a href="http://www.elastichosts.com/">Elastic Hosts</a> based) cloud using a standard libvirt interface, including the API as well as the related
+tools and VM description files.</p>
+<h2>
+<a name="prereq"></a>Deployment pre-requisites</h2>
+<ul>
+<li>
+<p style="margin-bottom: 0in">A working OpenNebula installation,
+	version 1.2 or higher.
+	</p>
+	</li>
+</ul>
+<h2>
+<a name="uris"></a>Connections to OpenNebula driver</h2>
+<p>The Uri of the driver protocol is "one". Some example
+connection Uris for the driver are:
+</p>
+<pre>    one:///                      (local access)
+    one+unix:///                 (local access)
+    one://example.com/           (remote access)
+    one+tcp://example.com/       (remote access, SASl/Kerberos)
+    one+ssh://user@example.com/  (remote access, SSH tunnelled)
+    </pre>
+<h2>
+<a name="xmlconfig"></a>Example domain XML config</h2>
+<p>There are some limitations on the XML attributes that may be
+specified when interfacing OpenNebula. The following xml example
+details the attributes and options supported by the OpenNebula
+driver:</p> 
+
+<h3>Paravirtualized guest direct kernel boot 
+</h3>
+<pre>    &lt;domain type='one'&gt;
+    &lt;name&gt;vm01&lt;/name&gt;
+    &lt;memory&gt;32768&lt;/memory&gt;
+    &lt;vcpu&gt;1&lt;/vcpu&gt;
+
+    &lt;os&gt;
+        &lt;type&gt;linux&lt;/type&gt;
+        &lt;kernel&gt;/boot/vmlinuz-2.6.24-17-xen&lt;/kernel&gt;
+        &lt;initrd&gt;/boot/initrd.img-2.6.24-17-xen&lt;/initrd&gt;
+        &lt;cmdline&gt;&lt;/cmdline&gt;
+        &lt;root&gt;sda1&lt;/root&gt;
+    &lt;/os&gt;
+
+    &lt;devices&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/images/sgehosts/01/disk.img'/&gt;
+            &lt;target dev='sda1'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/images/sgehosts/01/swap.img'/&gt;
+            &lt;target dev='sda2'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='cdrom'&gt;
+            &lt;source file='/images/iso/cdrom.iso'/&gt;
+            &lt;target dev='hdc'/&gt;
+            &lt;readonly/&gt;
+        &lt;/disk&gt;
+
+
+        &lt;!--BRIDGE--&gt;
+        &lt;interface type='bridge'&gt;
+            &lt;source bridge='eth0'/&gt;
+            &lt;mac address='00:16:3e:5d:c7:9e'/&gt;
+        &lt;/interface&gt;
+
+        &lt;!--ONE Network--&gt; 
+        &lt;interface type='network'&gt;
+          &lt;source network='onenetwork'/&gt;
+        &lt;/interface&gt;
+    &lt;/devices&gt;
+    &lt;/domain&gt;
+    </pre>
+<p>
+<b>Note:</b> The "&lt;interface type='network'&gt;" will
+attach the interface to a previously configured network (named
+<tt>onenetwork</tt>) within the <a href="http://opennebula.org/">OpenNebula</a> system, typically with the
+<tt>onevnet</tt> CLI command.</p>
+
+<p><b>Note</b>: OpenNebula supports the simultaneous use of different hypervisors, so you can specify any os type (linux or hvm) supported by your cluster.    
+</p>
+
+<h2>Links</h2>
+<ul>
+<li><a href="http://www.opennebula.org/doku.php?id=documentation">OpenNebula Documentation</a>
+</li>
+<li><a href="http://www.opennebula.org/doku.php?id=documentation:rel1.2:ug">OpenNebula User Guide</a>
+</li>
+</ul>
+</body>
+</html>

docs/drvopenvz.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -142,6 +154,7 @@
     </p>
         <pre>
     openvz:///system                     (local access)
+    openvz+unix:///system                (local access)
     openvz://example.com/system          (remote access, TLS/x509)
     openvz+tcp://example.com/system      (remote access, SASl/Kerberos)
     openvz+ssh://root@example.com/system (remote access, SSH tunnelled)

docs/drvopenvz.html.in

@@ -21,6 +21,7 @@
 
     <pre>
     openvz:///system                     (local access)
+    openvz+unix:///system                (local access)
     openvz://example.com/system          (remote access, TLS/x509)
     openvz+tcp://example.com/system      (remote access, SASl/Kerberos)
     openvz+ssh://root@example.com/system (remote access, SSH tunnelled)

docs/drvqemu.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -126,12 +138,28 @@
       </div>
       <div id="content">
         <h1>QEMU/KVM hypervisor driver</h1>
+        <ul><li>
+            <a href="#prereq">Deployment pre-requisites</a>
+          </li><li>
+            <a href="#uris">Connections to QEMU driver</a>
+          </li><li>
+            <a href="#imex">Import and export of libvirt domain XML configs</a>
+            <ul><li>
+                <a href="#xmlimport">Converting from QEMU args to domain XML</a>
+              </li><li>
+                <a href="#xmlexport">Converting from domain XML to QEMU args</a>
+              </li></ul>
+          </li><li>
+            <a href="#xmlconfig">Example domain XML config</a>
+          </li></ul>
         <p>
       The libvirt QEMU driver can manage any QEMU emulator from version 0.8.1
       or later. It can also manage anything that provides the same QEMU command
       line syntax and monitor interaction. This includes KVM, and Xenner.
     </p>
-        <h2>Deployment pre-requisites</h2>
+        <h2>
+          <a name="prereq" id="prereq">Deployment pre-requisites</a>
+        </h2>
         <ul><li>
 	<strong>QEMU emulators</strong>: The driver will probe <code>/usr/bin</code>
 	for the presence of <code>qemu</code>, <code>qemu-system-x86_64</code>,
@@ -149,6 +177,112 @@
 	node. If both are found, then Xen paravirtualized guests can be run using
 	the KVM hardware acceleration.
       </li></ul>
+        <h2>
+          <a name="uris" id="uris">Connections to QEMU driver</a>
+        </h2>
+        <p>
+    The libvirt QEMU driver is a multi-instance driver, providing a single
+    system wide privileged driver (the "system" instance), and per-user
+    unprivileged drivers (the "session" instance). The of the driver protocol
+    is "qemu". Some example conection URIs for the libvirt driver are:
+    </p>
+        <pre>
+    qemu:///session                      (local access to per-user instance)
+    qemu+unix:///session                 (local access to per-user instance)
+
+    qemu:///system                       (local access to system instance)
+    qemu+unix:///system                  (local access to system instance)
+    qemu://example.com/system            (remote access, TLS/x509)
+    qemu+tcp://example.com/system        (remote access, SASl/Kerberos)
+    qemu+ssh://root@example.com/system   (remote access, SSH tunnelled)
+    </pre>
+        <h2>
+          <a name="imex" id="imex">Import and export of libvirt domain XML configs</a>
+        </h2>
+        <p>The QEMU driver currently supports a single native
+      config format known as <code>qemu-argv</code>. The data for this format
+      is expected to be a single line first a list of environment variables,
+      then the QEMu binary name, finally followed by the QEMU command line
+      arguments</p>
+        <h3>
+          <a name="xmlimport" id="xmlimport">Converting from QEMU args to domain XML</a>
+        </h3>
+        <p>
+      The <code>virsh domxml-from-native</code> provides a way to convert an
+      existing set of QEMU args into a guest description using libvirt Domain XML
+      that can then be used by libvirt.
+    </p>
+        <pre>$ cat &gt; demo.args &lt;&lt;EOF
+LC_ALL=C PATH=/bin HOME=/home/test USER=test \
+LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 \
+-nographic -monitor pty -no-acpi -boot c -hda \
+/dev/HostVG/QEMUGuest1 -net none -serial none \
+-parallel none -usb
+EOF
+$ virsh domxml-from-native qemu-argv demo.args
+&lt;domain type='qemu'&gt;
+  &lt;uuid&gt;00000000-0000-0000-0000-000000000000&lt;/uuid&gt;
+  &lt;memory&gt;219136&lt;/memory&gt;
+  &lt;currentMemory&gt;219136&lt;/currentMemory&gt;
+  &lt;vcpu&gt;1&lt;/vcpu&gt;
+  &lt;os&gt;
+    &lt;type arch='i686' machine='pc'&gt;hvm&lt;/type&gt;
+    &lt;boot dev='hd'/&gt;
+  &lt;/os&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;emulator&gt;/usr/bin/qemu&lt;/emulator&gt;
+    &lt;disk type='block' device='disk'&gt;
+      &lt;source dev='/dev/HostVG/QEMUGuest1'/&gt;
+      &lt;target dev='hda' bus='ide'/&gt;
+    &lt;/disk&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+    </pre>
+        <p>NB, don't include the literral \ in the args, put everything on one line</p>
+        <h3>
+          <a name="xmlexport" id="xmlexport">Converting from domain XML to QEMU args</a>
+        </h3>
+        <p>
+      The <code>virsh domxml-to-native</code> provides a way to convert a
+      guest description using libvirt Domain XML, into a set of QEMU args
+      that can be run manually.
+    </p>
+        <pre>$ cat &gt; demo.xml &lt;&lt;EOF
+&lt;domain type='qemu'&gt;
+  &lt;name&gt;QEMUGuest1&lt;/name&gt;
+  &lt;uuid&gt;c7a5fdbd-edaf-9455-926a-d65c16db1809&lt;/uuid&gt;
+  &lt;memory&gt;219200&lt;/memory&gt;
+  &lt;currentMemory&gt;219200&lt;/currentMemory&gt;
+  &lt;vcpu&gt;1&lt;/vcpu&gt;
+  &lt;os&gt;
+    &lt;type arch='i686' machine='pc'&gt;hvm&lt;/type&gt;
+    &lt;boot dev='hd'/&gt;
+  &lt;/os&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;emulator&gt;/usr/bin/qemu&lt;/emulator&gt;
+    &lt;disk type='block' device='disk'&gt;
+      &lt;source dev='/dev/HostVG/QEMUGuest1'/&gt;
+      &lt;target dev='hda' bus='ide'/&gt;
+    &lt;/disk&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+EOF
+$ virsh domxml-to-native qemu-argv demo.xml
+  LC_ALL=C PATH=/usr/bin:/bin HOME=/home/test \
+  USER=test LOGNAME=test /usr/bin/qemu -S -M pc \
+  -no-kqemu -m 214 -smp 1 -name QEMUGuest1 -nographic \
+  -monitor pty -no-acpi -boot c -drive \
+  file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -net none \
+  -serial none -parallel none -usb
+    </pre>
         <h2>
           <a name="xmlconfig" id="xmlconfig">Example domain XML config</a>
         </h2>
@@ -200,7 +334,7 @@
       &lt;source network='default'/&gt;
       &lt;mac address='24:42:53:21:52:45'/&gt;
     &lt;/interface&gt;
-    &lt;graphics type='vnc' port='-1'/&gt;
+    &lt;graphics type='vnc' port='-1' keymap='de'/&gt;
   &lt;/devices&gt;
 &lt;/domain&gt;</pre>
         <h3>Xen paravirtualized guests with hardware acceleration</h3>

docs/drvqemu.html.in

@@ -2,13 +2,15 @@
   <body>
     <h1>QEMU/KVM hypervisor driver</h1>
 
+    <ul id="toc"></ul>
+
     <p>
       The libvirt QEMU driver can manage any QEMU emulator from version 0.8.1
       or later. It can also manage anything that provides the same QEMU command
       line syntax and monitor interaction. This includes KVM, and Xenner.
     </p>
 
-    <h2>Deployment pre-requisites</h2>
+    <h2><a name="prereq">Deployment pre-requisites</a></h2>
 
     <ul>
       <li>
@@ -32,6 +34,116 @@
       </li>
     </ul>
 
+    <h2><a name="uris">Connections to QEMU driver</a></h2>
+
+    <p>
+    The libvirt QEMU driver is a multi-instance driver, providing a single
+    system wide privileged driver (the "system" instance), and per-user
+    unprivileged drivers (the "session" instance). The of the driver protocol
+    is "qemu". Some example conection URIs for the libvirt driver are:
+    </p>
+
+    <pre>
+    qemu:///session                      (local access to per-user instance)
+    qemu+unix:///session                 (local access to per-user instance)
+
+    qemu:///system                       (local access to system instance)
+    qemu+unix:///system                  (local access to system instance)
+    qemu://example.com/system            (remote access, TLS/x509)
+    qemu+tcp://example.com/system        (remote access, SASl/Kerberos)
+    qemu+ssh://root@example.com/system   (remote access, SSH tunnelled)
+    </pre>
+
+    <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2>
+
+    <p>The QEMU driver currently supports a single native
+      config format known as <code>qemu-argv</code>. The data for this format
+      is expected to be a single line first a list of environment variables,
+      then the QEMu binary name, finally followed by the QEMU command line
+      arguments</p>
+
+    <h3><a name="xmlimport">Converting from QEMU args to domain XML</a></h3>
+
+    <p>
+      The <code>virsh domxml-from-native</code> provides a way to convert an
+      existing set of QEMU args into a guest description using libvirt Domain XML
+      that can then be used by libvirt.
+    </p>
+
+    <pre>$ cat &gt; demo.args &lt;&lt;EOF
+LC_ALL=C PATH=/bin HOME=/home/test USER=test \
+LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 \
+-nographic -monitor pty -no-acpi -boot c -hda \
+/dev/HostVG/QEMUGuest1 -net none -serial none \
+-parallel none -usb
+EOF
+$ virsh domxml-from-native qemu-argv demo.args
+&lt;domain type='qemu'&gt;
+  &lt;uuid&gt;00000000-0000-0000-0000-000000000000&lt;/uuid&gt;
+  &lt;memory&gt;219136&lt;/memory&gt;
+  &lt;currentMemory&gt;219136&lt;/currentMemory&gt;
+  &lt;vcpu&gt;1&lt;/vcpu&gt;
+  &lt;os&gt;
+    &lt;type arch='i686' machine='pc'&gt;hvm&lt;/type&gt;
+    &lt;boot dev='hd'/&gt;
+  &lt;/os&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;emulator&gt;/usr/bin/qemu&lt;/emulator&gt;
+    &lt;disk type='block' device='disk'&gt;
+      &lt;source dev='/dev/HostVG/QEMUGuest1'/&gt;
+      &lt;target dev='hda' bus='ide'/&gt;
+    &lt;/disk&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+    </pre>
+
+    <p>NB, don't include the literral \ in the args, put everything on one line</p>
+
+    <h3><a name="xmlexport">Converting from domain XML to QEMU args</a></h3>
+
+    <p>
+      The <code>virsh domxml-to-native</code> provides a way to convert a
+      guest description using libvirt Domain XML, into a set of QEMU args
+      that can be run manually.
+    </p>
+
+    <pre>$ cat &gt; demo.xml &lt;&lt;EOF
+&lt;domain type='qemu'&gt;
+  &lt;name&gt;QEMUGuest1&lt;/name&gt;
+  &lt;uuid&gt;c7a5fdbd-edaf-9455-926a-d65c16db1809&lt;/uuid&gt;
+  &lt;memory&gt;219200&lt;/memory&gt;
+  &lt;currentMemory&gt;219200&lt;/currentMemory&gt;
+  &lt;vcpu&gt;1&lt;/vcpu&gt;
+  &lt;os&gt;
+    &lt;type arch='i686' machine='pc'&gt;hvm&lt;/type&gt;
+    &lt;boot dev='hd'/&gt;
+  &lt;/os&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;emulator&gt;/usr/bin/qemu&lt;/emulator&gt;
+    &lt;disk type='block' device='disk'&gt;
+      &lt;source dev='/dev/HostVG/QEMUGuest1'/&gt;
+      &lt;target dev='hda' bus='ide'/&gt;
+    &lt;/disk&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+EOF
+$ virsh domxml-to-native qemu-argv demo.xml
+  LC_ALL=C PATH=/usr/bin:/bin HOME=/home/test \
+  USER=test LOGNAME=test /usr/bin/qemu -S -M pc \
+  -no-kqemu -m 214 -smp 1 -name QEMUGuest1 -nographic \
+  -monitor pty -no-acpi -boot c -drive \
+  file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -net none \
+  -serial none -parallel none -usb
+    </pre>
+
     <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
     <h3>QEMU emulated guest on x86_64</h3>
@@ -85,7 +197,7 @@
       &lt;source network='default'/&gt;
       &lt;mac address='24:42:53:21:52:45'/&gt;
     &lt;/interface&gt;
-    &lt;graphics type='vnc' port='-1'/&gt;
+    &lt;graphics type='vnc' port='-1' keymap='de'/&gt;
   &lt;/devices&gt;
 &lt;/domain&gt;</pre>
 

docs/drvremote.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>

docs/drvtest.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -126,6 +138,22 @@
       </div>
       <div id="content">
         <h1>Test "mock" driver</h1>
+        <h2>Connections to Test driver</h2>
+        <p>
+    The libvirt Test driver is a per-process fake hypervisor driver,
+    with a driver name of 'test'. The driver maintains all its state
+    in memory. It can start with a pre-configured default config, or
+    be given a path to a alternate config. Some example conection URIs
+    for the libvirt driver are:
+    </p>
+        <pre>
+    test:///default                     (local access, default config)
+    test:///path/to/driver/config.xml   (local access, custom config)
+    test+unix:///default                (local access, default config, via daemon)
+    test://example.com/default          (remote access, TLS/x509)
+    test+tcp://example.com/default      (remote access, SASl/Kerberos)
+    test+ssh://root@example.com/default (remote access, SSH tunnelled)
+    </pre>
       </div>
     </div>
     <div id="footer">

docs/drvtest.html.in

@@ -1,5 +1,25 @@
 <html>
   <body>
     <h1>Test "mock" driver</h1>
+
+    <h2>Connections to Test driver</h2>
+
+    <p>
+    The libvirt Test driver is a per-process fake hypervisor driver,
+    with a driver name of 'test'. The driver maintains all its state
+    in memory. It can start with a pre-configured default config, or
+    be given a path to a alternate config. Some example conection URIs
+    for the libvirt driver are:
+    </p>
+
+    <pre>
+    test:///default                     (local access, default config)
+    test:///path/to/driver/config.xml   (local access, custom config)
+    test+unix:///default                (local access, default config, via daemon)
+    test://example.com/default          (remote access, TLS/x509)
+    test+tcp://example.com/default      (remote access, SASl/Kerberos)
+    test+ssh://root@example.com/default (remote access, SSH tunnelled)
+    </pre>
+
   </body>
 </html>

docs/drvuml.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -146,8 +158,11 @@
     URIs are
     </p>
         <pre>
-    uml:///system                        (local access, system instance)
-    uml:///session                       (local access, session instance)
+    uml:///session                       (local access to per-user instance)
+    uml+unix:///session                  (local access to per-user instance)
+
+    uml:///system                        (local access to system instance)
+    uml+unix:///system                   (local access to system instance)
     uml://example.com/system             (remote access, TLS/x509)
     uml+tcp://example.com/system         (remote access, SASl/Kerberos)
     uml+ssh://root@example.com/system    (remote access, SSH tunnelled)

docs/drvuml.html.in

@@ -25,8 +25,11 @@
     </p>
 
     <pre>
-    uml:///system                        (local access, system instance)
-    uml:///session                       (local access, session instance)
+    uml:///session                       (local access to per-user instance)
+    uml+unix:///session                  (local access to per-user instance)
+
+    uml:///system                        (local access to system instance)
+    uml+unix:///system                   (local access to system instance)
     uml://example.com/system             (remote access, TLS/x509)
     uml+tcp://example.com/system         (remote access, SASl/Kerberos)
     uml+ssh://root@example.com/system    (remote access, SSH tunnelled)

docs/drvvbox.html

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+        This file is autogenerated from drvvbox.html.in
+        Do not edit this file. Changes will be lost.
+      -->
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+    <link rel="stylesheet" type="text/css" href="main.css" />
+    <link rel="SHORTCUT ICON" href="32favicon.png" />
+    <title>libvirt: VirtualBox hypervisor driver</title>
+    <meta name="description" content="libvirt, virtualization, virtualization API" />
+  </head>
+  <body>
+    <div id="header">
+      <div id="headerLogo"></div>
+      <div id="headerSearch">
+        <form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><div>
+            <input id="query" name="query" type="text" size="12" value="" />
+            <input id="submit" name="submit" type="submit" value="Search" />
+          </div></form>
+      </div>
+    </div>
+    <div id="body">
+      <div id="menu">
+        <ul class="l0"><li>
+            <div>
+              <a title="Front page of the libvirt website" class="inactive" href="index.html">Home</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Details of new features and bugs fixed in each release" class="inactive" href="news.html">News</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Get the latest source releases, binary builds and get access to the source repository" class="inactive" href="downloads.html">Downloads</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Information for users, administrators and developers" class="active" href="docs.html">Documentation</a>
+              <ul class="l1"><li>
+                  <div>
+                    <a title="Information about deploying and using libvirt" class="inactive" href="deployment.html">Deployment</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Overview of the logical subsystems in the libvirt API" class="inactive" href="intro.html">Architecture</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Description of the XML formats used in libvirt" class="inactive" href="format.html">XML format</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Hypervisor specific driver information" class="active" href="drivers.html">Drivers</a>
+                    <ul class="l2"><li>
+                        <div>
+                          <a title="Driver the Xen hypervisor" class="inactive" href="drvxen.html">Xen</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for QEMU, KQEMU, KVM and Xenner" class="inactive" href="drvqemu.html">QEMU / KVM</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the Linux native container API" class="inactive" href="drvlxc.html">Linux Container</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Psuedo-driver simulating APIs in memory for test suites" class="inactive" href="drvtest.html">Test</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver providing secure remote to the libvirt APIs" class="inactive" href="drvremote.html">Remote</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the OpenVZ container technology" class="inactive" href="drvopenvz.html">OpenVZ</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the User Mode Linux technology" class="inactive" href="drvuml.html">UML</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <span class="active">VirtualBox</span>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
+                      </li></ul>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Reference manual for the C public API" class="inactive" href="html/index.html">API reference</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
+                  </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
+                </li></ul>
+            </div>
+          </li><li>
+            <div>
+              <a title="User contributed content" class="inactive" href="http://wiki.libvirt.org">Wiki</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Frequently asked questions" class="inactive" href="FAQ.html">FAQ</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="How and where to report bugs and request features" class="inactive" href="bugs.html">Bug reports</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="How to contact the developers via email and IRC" class="inactive" href="contact.html">Contact</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Miscellaneous links of interest related to libvirt" class="inactive" href="relatedlinks.html">Related Links</a>
+            </div>
+          </li><li>
+            <div>
+              <a title="Overview of all content on the website" class="inactive" href="sitemap.html">Sitemap</a>
+            </div>
+          </li></ul>
+      </div>
+      <div id="content">
+        <h1>VirtualBox hypervisor driver</h1>
+        <p>
+        The libvirt VirtualBox driver can manage any VirtualBox version
+        from version 2.2 onwards.
+    </p>
+        <h2>Connections to VirtualBox driver</h2>
+        <p>
+    The libvirt VirtualBox driver provides per-user drivers (the "session" instance).
+    The uri of the driver protocol is "vbox". Some example connection URIs for the driver are:
+    </p>
+        <pre>
+    vbox:///session                      (local access to per-user instance)
+    vbox+unix:///session                 (local access to per-user instance)
+    vbox+tcp://user@example.com/session  (remote access, SASl/Kerberos)
+    vbox+ssh://user@example.com/session  (remote access, SSH tunnelled)
+    </pre>
+        <h2>
+          <a name="xmlconfig" id="xmlconfig">Example domain XML config</a>
+        </h2>
+        <pre>
+    &lt;domain type='vbox'&gt;
+    &lt;name&gt;vbox&lt;/name&gt;
+    &lt;uuid&gt;4dab22b31d52d8f32516782e98ab3fa0&lt;/uuid&gt;
+
+    &lt;os&gt;
+        &lt;type&gt;hvm&lt;/type&gt;
+        &lt;boot dev='cdrom'/&gt;
+        &lt;boot dev='hd'/&gt;
+        &lt;boot dev='fd'/&gt;
+        &lt;boot dev='network'/&gt;
+    &lt;/os&gt;
+
+    &lt;memory&gt;654321&lt;/memory&gt;
+    &lt;vcpu&gt;1&lt;/vcpu&gt;
+
+    &lt;features&gt;
+        &lt;pae/&gt;
+        &lt;acpi/&gt;
+        &lt;apic/&gt;
+    &lt;/features&gt;
+
+    &lt;devices&gt;
+        &lt;disk type='file' device='cdrom'&gt;
+            &lt;source file='/home/user/Downloads/slax-6.0.9.iso'/&gt;
+            &lt;target dev='hdc'/&gt;
+            &lt;readonly/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/home/user/tmp/vbox.vdi'/&gt;
+            &lt;target dev='hdd'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='floppy'&gt;
+            &lt;source file='/home/user/tmp/WIN98C.IMG'/&gt;
+            &lt;target dev='fda'/&gt;
+        &lt;/disk&gt;
+
+        &lt;!--BRIDGE--&gt;
+        &lt;interface type='bridge'&gt;
+            &lt;source bridge='eth0'/&gt;
+            &lt;mac address='00:16:3e:5d:c7:9e'/&gt;
+            &lt;model type='am79c973'/&gt;
+        &lt;/interface&gt;
+
+        &lt;!--NAT--&gt;
+        &lt;interface type='user'&gt;
+            &lt;mac address='56:16:3e:5d:c7:9e'/&gt;
+            &lt;model type='82540eM'/&gt;
+        &lt;/interface&gt;
+
+        &lt;sound model='sb16'/&gt;
+
+        &lt;parallel type='dev'&gt;
+            &lt;source path='/dev/pts/1'/&gt;
+            &lt;target port='0'/&gt;
+        &lt;/parallel&gt;
+
+        &lt;parallel type='dev'&gt;
+            &lt;source path='/dev/pts/2'/&gt;
+            &lt;target port='1'/&gt;
+        &lt;/parallel&gt;
+
+        &lt;serial type="dev"&gt;
+            &lt;source path="/dev/ttyS0"/&gt;
+            &lt;target port="0"/&gt;
+        &lt;/serial&gt;
+
+        &lt;serial type="pipe"&gt;
+            &lt;source path="/tmp/serial.txt"/&gt;
+            &lt;target port="1"/&gt;
+        &lt;/serial&gt;
+
+        &lt;hostdev mode='subsystem' type='usb'&gt;
+            &lt;source&gt;
+                &lt;vendor id='0x1234'/&gt;
+                &lt;product id='0xbeef'/&gt;
+            &lt;/source&gt;
+        &lt;/hostdev&gt;
+
+        &lt;hostdev mode='subsystem' type='usb'&gt;
+            &lt;source&gt;
+                &lt;vendor id='0x4321'/&gt;
+                &lt;product id='0xfeeb'/&gt;
+            &lt;/source&gt;
+        &lt;/hostdev&gt;
+
+    &lt;/devices&gt;
+
+    &lt;/domain&gt;
+    </pre>
+      </div>
+    </div>
+    <div id="footer">
+      <p id="sponsor">
+	    Sponsored by:<br /><a href="http://et.redhat.com/"><img src="et.png" alt="Project sponsored by Red Hat Emerging Technology" /></a></p>
+    </div>
+  </body>
+</html>

docs/drvvbox.html.in

@@ -0,0 +1,119 @@
+<html>
+    <body>
+        <h1>VirtualBox hypervisor driver</h1>
+        <p>
+        The libvirt VirtualBox driver can manage any VirtualBox version
+        from version 2.2 onwards.
+    </p>
+
+    <h2>Connections to VirtualBox driver</h2>
+
+    <p>
+    The libvirt VirtualBox driver provides per-user drivers (the "session" instance).
+    The uri of the driver protocol is "vbox". Some example connection URIs for the driver are:
+    </p>
+
+    <pre>
+    vbox:///session                      (local access to per-user instance)
+    vbox+unix:///session                 (local access to per-user instance)
+    vbox+tcp://user@example.com/session  (remote access, SASl/Kerberos)
+    vbox+ssh://user@example.com/session  (remote access, SSH tunnelled)
+    </pre>
+
+    <h2><a name="xmlconfig">Example domain XML config</a></h2>
+
+    <pre>
+    &lt;domain type='vbox'&gt;
+    &lt;name&gt;vbox&lt;/name&gt;
+    &lt;uuid&gt;4dab22b31d52d8f32516782e98ab3fa0&lt;/uuid&gt;
+
+    &lt;os&gt;
+        &lt;type&gt;hvm&lt;/type&gt;
+        &lt;boot dev='cdrom'/&gt;
+        &lt;boot dev='hd'/&gt;
+        &lt;boot dev='fd'/&gt;
+        &lt;boot dev='network'/&gt;
+    &lt;/os&gt;
+
+    &lt;memory&gt;654321&lt;/memory&gt;
+    &lt;vcpu&gt;1&lt;/vcpu&gt;
+
+    &lt;features&gt;
+        &lt;pae/&gt;
+        &lt;acpi/&gt;
+        &lt;apic/&gt;
+    &lt;/features&gt;
+
+    &lt;devices&gt;
+        &lt;disk type='file' device='cdrom'&gt;
+            &lt;source file='/home/user/Downloads/slax-6.0.9.iso'/&gt;
+            &lt;target dev='hdc'/&gt;
+            &lt;readonly/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='disk'&gt;
+            &lt;source file='/home/user/tmp/vbox.vdi'/&gt;
+            &lt;target dev='hdd'/&gt;
+        &lt;/disk&gt;
+
+        &lt;disk type='file' device='floppy'&gt;
+            &lt;source file='/home/user/tmp/WIN98C.IMG'/&gt;
+            &lt;target dev='fda'/&gt;
+        &lt;/disk&gt;
+
+        &lt;!--BRIDGE--&gt;
+        &lt;interface type='bridge'&gt;
+            &lt;source bridge='eth0'/&gt;
+            &lt;mac address='00:16:3e:5d:c7:9e'/&gt;
+            &lt;model type='am79c973'/&gt;
+        &lt;/interface&gt;
+
+        &lt;!--NAT--&gt;
+        &lt;interface type='user'&gt;
+            &lt;mac address='56:16:3e:5d:c7:9e'/&gt;
+            &lt;model type='82540eM'/&gt;
+        &lt;/interface&gt;
+
+        &lt;sound model='sb16'/&gt;
+
+        &lt;parallel type='dev'&gt;
+            &lt;source path='/dev/pts/1'/&gt;
+            &lt;target port='0'/&gt;
+        &lt;/parallel&gt;
+
+        &lt;parallel type='dev'&gt;
+            &lt;source path='/dev/pts/2'/&gt;
+            &lt;target port='1'/&gt;
+        &lt;/parallel&gt;
+
+        &lt;serial type="dev"&gt;
+            &lt;source path="/dev/ttyS0"/&gt;
+            &lt;target port="0"/&gt;
+        &lt;/serial&gt;
+
+        &lt;serial type="pipe"&gt;
+            &lt;source path="/tmp/serial.txt"/&gt;
+            &lt;target port="1"/&gt;
+        &lt;/serial&gt;
+
+        &lt;hostdev mode='subsystem' type='usb'&gt;
+            &lt;source&gt;
+                &lt;vendor id='0x1234'/&gt;
+                &lt;product id='0xbeef'/&gt;
+            &lt;/source&gt;
+        &lt;/hostdev&gt;
+
+        &lt;hostdev mode='subsystem' type='usb'&gt;
+            &lt;source&gt;
+                &lt;vendor id='0x4321'/&gt;
+                &lt;product id='0xfeeb'/&gt;
+            &lt;/source&gt;
+        &lt;/hostdev&gt;
+
+    &lt;/devices&gt;
+
+    &lt;/domain&gt;
+    </pre>
+
+    </body>
+</html>

docs/drvxen.html

@@ -86,6 +86,14 @@
                         <div>
                           <a title="Driver for the storage management APIs" class="inactive" href="storage.html">Storage</a>
                         </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for VirtualBox" class="inactive" href="drvvbox.html">VirtualBox</a>
+                        </div>
+                      </li><li>
+                        <div>
+                          <a title="Driver for OpenNebula" class="inactive" href="drvone.html">OpenNebula</a>
+                        </div>
                       </li></ul>
                   </div>
                 </li><li>
@@ -96,6 +104,10 @@
                   <div>
                     <a title="Bindings of the libvirt API for other languages" class="inactive" href="bindings.html">Language bindings</a>
                   </div>
+                </li><li>
+                  <div>
+                    <a title="Working on the internals of libvirt API, driver and daemon code" class="inactive" href="internals.html">Internals</a>
+                  </div>
                 </li></ul>
             </div>
           </li><li>
@@ -126,11 +138,27 @@
       </div>
       <div id="content">
         <h1>Xen hypervisor driver</h1>
+        <ul><li>
+            <a href="#prereq">Deployment pre-requisites</a>
+          </li><li>
+            <a href="#uri">Connections to Xen driver</a>
+          </li><li>
+            <a href="#imex">Import and export of libvirt domain XML configs</a>
+            <ul><li>
+                <a href="#xmlimport">Converting from XM config files to domain XML</a>
+              </li><li>
+                <a href="#xmlexport">Converting from domain XML to XM config files</a>
+              </li></ul>
+          </li><li>
+            <a href="#xmlconfig">Example domain XML config</a>
+          </li></ul>
         <p>
       The libvirt Xen driver provides the ability to manage virtual machines
       on any Xen release from 3.0.1 onwards.
     </p>
-        <h2>Deployment pre-requisites</h2>
+        <h2>
+          <a name="prereq" id="prereq">Deployment pre-requisites</a>
+        </h2>
         <p>
       The libvirt Xen driver uses a combination of channels to manage Xen
       virtual machines.
@@ -159,6 +187,103 @@
 	the <code>/etc/xen</code> directory. It is important not to place
 	any other non-config files in this directory.
       </li></ul>
+        <h2>
+          <a name="uri" id="uri">Connections to Xen driver</a>
+        </h2>
+        <p>
+    The libvirt Xen driver is a single-instance privileged driver,
+    with a driver name of 'xen'. Some example conection URIs for
+    the libvirt driver are:
+    </p>
+        <pre>
+    xen:///                        (local access, direct)
+    xen+unix:///                   (local access, via daemon)
+    xen://example.com/             (remote access, TLS/x509)
+    xen+tcp://example.com/         (remote access, SASl/Kerberos)
+    xen+ssh://root@example.com/    (remote access, SSH tunnelled)
+    </pre>
+        <h2>
+          <a name="imex" id="imex">Import and export of libvirt domain XML configs</a>
+        </h2>
+        <p>The Xen driver currently supports two native
+      config formats. The first known as <code>xen-xm</code> is the format
+      used by the XM tool for files in <code>/etc/xen</code>. The second
+      known as <code>xen-sxpr</code>, is the format used for interacting
+      with the XenD's legacy HTTP RPC service.</p>
+        <h3>
+          <a name="xmlimport" id="xmlimport">Converting from XM config files to domain XML</a>
+        </h3>
+        <p>
+      The <code>virsh domxml-from-native</code> provides a way to convert an
+      existing set of XM config files into a guest description using libvirt Domain XML
+      that can then be used by libvirt.
+    </p>
+        <pre>$ virsh -c xen:/// domxml-from-native xen-xm rhel5.cfg
+&lt;domain type='xen'&gt;
+  &lt;name&gt;rhel5pv&lt;/name&gt;
+  &lt;uuid&gt;8f07fe28-753f-2729-d76d-bdbd892f949a&lt;/uuid&gt;
+  &lt;memory&gt;2560000&lt;/memory&gt;
+  &lt;currentMemory&gt;307200&lt;/currentMemory&gt;
+  &lt;vcpu&gt;4&lt;/vcpu&gt;
+  &lt;bootloader&gt;/usr/bin/pygrub&lt;/bootloader&gt;
+  &lt;os&gt;
+    &lt;type arch='x86_64' machine='xenpv'&gt;linux&lt;/type&gt;
+  &lt;/os&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;restart&lt;/on_crash&gt;
+  &lt;devices&gt;
+    &lt;disk type='file' device='disk'&gt;
+      &lt;driver name='tap' type='aio'/&gt;
+      &lt;source file='/var/lib/xen/images/rhel5pv.img'/&gt;
+      &lt;target dev='xvda' bus='xen'/&gt;
+    &lt;/disk&gt;
+    &lt;disk type='file' device='disk'&gt;
+      &lt;driver name='tap' type='qcow'/&gt;
+      &lt;source file='/root/qcow1-xen.img'/&gt;
+      &lt;target dev='xvdd' bus='xen'/&gt;
+    &lt;/disk&gt;
+    &lt;interface type='bridge'&gt;
+      &lt;mac address='00:16:3e:60:36:ba'/&gt;
+      &lt;source bridge='xenbr0'/&gt;
+    &lt;/interface&gt;
+    &lt;console type='pty'&gt;
+      &lt;target port='0'/&gt;
+    &lt;/console&gt;
+    &lt;input type='mouse' bus='xen'/&gt;
+    &lt;graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+    </pre>
+        <h3>
+          <a name="xmlexport" id="xmlexport">Converting from domain XML to XM config files</a>
+        </h3>
+        <p>
+      The <code>virsh domxml-to-native</code> provides a way to convert a
+      guest description using libvirt Domain XML, into the XM config file
+      format.
+    </p>
+        <pre># virsh  -c xen:/// domxml-to-native xen-xm rhel5pv.xml
+name = "rhel5pv"
+uuid = "8f07fe28-753f-2729-d76d-bdbd892f949a"
+maxmem = 2500
+memory = 300
+vcpus = 4
+bootloader = "/usr/bin/pygrub"
+kernel = "/var/lib/xen/boot_kernel.0YK-cS"
+ramdisk = "/var/lib/xen/boot_ramdisk.vWgrxK"
+extra = "ro root=/dev/VolGroup00/LogVol00 rhgb quiet"
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "0.0.0.0"
+disk = [ "tap:aio:/var/lib/xen/images/rhel5pv.img,xvda,w", "tap:qcow:/root/qcow1-xen.img,xvdd,w" ]
+vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
+    </pre>
         <h2>
           <a name="xmlconfig" id="xmlconfig">Example domain XML config</a>
         </h2>

docs/drvxen.html.in

@@ -2,12 +2,14 @@
   <body>
     <h1>Xen hypervisor driver</h1>
 
+    <ul id="toc"></ul>
+
     <p>
       The libvirt Xen driver provides the ability to manage virtual machines
       on any Xen release from 3.0.1 onwards.
     </p>
 
-    <h2>Deployment pre-requisites</h2>
+    <h2><a name="prereq">Deployment pre-requisites</a></h2>
 
     <p>
       The libvirt Xen driver uses a combination of channels to manage Xen
@@ -44,6 +46,106 @@
       </li>
     </ul>
 
+    <h2><a name="uri">Connections to Xen driver</a></h2>
+
+    <p>
+    The libvirt Xen driver is a single-instance privileged driver,
+    with a driver name of 'xen'. Some example conection URIs for
+    the libvirt driver are:
+    </p>
+
+    <pre>
+    xen:///                        (local access, direct)
+    xen+unix:///                   (local access, via daemon)
+    xen://example.com/             (remote access, TLS/x509)
+    xen+tcp://example.com/         (remote access, SASl/Kerberos)
+    xen+ssh://root@example.com/    (remote access, SSH tunnelled)
+    </pre>
+
+    <h2><a name="imex">Import and export of libvirt domain XML configs</a></h2>
+
+    <p>The Xen driver currently supports two native
+      config formats. The first known as <code>xen-xm</code> is the format
+      used by the XM tool for files in <code>/etc/xen</code>. The second
+      known as <code>xen-sxpr</code>, is the format used for interacting
+      with the XenD's legacy HTTP RPC service.</p>
+
+    <h3><a name="xmlimport">Converting from XM config files to domain XML</a></h3>
+
+    <p>
+      The <code>virsh domxml-from-native</code> provides a way to convert an
+      existing set of XM config files into a guest description using libvirt Domain XML
+      that can then be used by libvirt.
+    </p>
+
+    <pre>$ virsh -c xen:/// domxml-from-native xen-xm rhel5.cfg
+&lt;domain type='xen'&gt;
+  &lt;name&gt;rhel5pv&lt;/name&gt;
+  &lt;uuid&gt;8f07fe28-753f-2729-d76d-bdbd892f949a&lt;/uuid&gt;
+  &lt;memory&gt;2560000&lt;/memory&gt;
+  &lt;currentMemory&gt;307200&lt;/currentMemory&gt;
+  &lt;vcpu&gt;4&lt;/vcpu&gt;
+  &lt;bootloader&gt;/usr/bin/pygrub&lt;/bootloader&gt;
+  &lt;os&gt;
+    &lt;type arch='x86_64' machine='xenpv'&gt;linux&lt;/type&gt;
+  &lt;/os&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;restart&lt;/on_crash&gt;
+  &lt;devices&gt;
+    &lt;disk type='file' device='disk'&gt;
+      &lt;driver name='tap' type='aio'/&gt;
+      &lt;source file='/var/lib/xen/images/rhel5pv.img'/&gt;
+      &lt;target dev='xvda' bus='xen'/&gt;
+    &lt;/disk&gt;
+    &lt;disk type='file' device='disk'&gt;
+      &lt;driver name='tap' type='qcow'/&gt;
+      &lt;source file='/root/qcow1-xen.img'/&gt;
+      &lt;target dev='xvdd' bus='xen'/&gt;
+    &lt;/disk&gt;
+    &lt;interface type='bridge'&gt;
+      &lt;mac address='00:16:3e:60:36:ba'/&gt;
+      &lt;source bridge='xenbr0'/&gt;
+    &lt;/interface&gt;
+    &lt;console type='pty'&gt;
+      &lt;target port='0'/&gt;
+    &lt;/console&gt;
+    &lt;input type='mouse' bus='xen'/&gt;
+    &lt;graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/&gt;
+  &lt;/devices&gt;
+&lt;/domain&gt;
+    </pre>
+
+    <h3><a name="xmlexport">Converting from domain XML to XM config files</a></h3>
+
+    <p>
+      The <code>virsh domxml-to-native</code> provides a way to convert a
+      guest description using libvirt Domain XML, into the XM config file
+      format.
+    </p>
+
+    <pre># virsh  -c xen:/// domxml-to-native xen-xm rhel5pv.xml
+name = "rhel5pv"
+uuid = "8f07fe28-753f-2729-d76d-bdbd892f949a"
+maxmem = 2500
+memory = 300
+vcpus = 4
+bootloader = "/usr/bin/pygrub"
+kernel = "/var/lib/xen/boot_kernel.0YK-cS"
+ramdisk = "/var/lib/xen/boot_ramdisk.vWgrxK"
+extra = "ro root=/dev/VolGroup00/LogVol00 rhgb quiet"
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "0.0.0.0"
+disk = [ "tap:aio:/var/lib/xen/images/rhel5pv.img,xvda,w", "tap:qcow:/root/qcow1-xen.img,xvdd,w" ]
+vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ]
+    </pre>
+
     <h2><a name="xmlconfig">Example domain XML config</a></h2>
 
     <p>

docs/examples/.cvsignore

@@ -1,8 +0,0 @@
-*.exe
-.memdump
-Makefile.in
-Makefile
-.deps
-.libs
-info1
-suspend

docs/examples/.gitignore

@@ -1,4 +1,3 @@
-*.exe
 .memdump
 Makefile.in
 Makefile

docs/examples/Makefile.am

@@ -20,7 +20,7 @@ index.html: examples.xml examples.xsl $(top_srcdir)/docs/site.xsl
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \
-	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+	  $(srcdir)/*.xsl $(DESTDIR)$(HTML_DIR)
 
 EXTRA_DIST=examples.xsl index.py examples.xml
 

docs/examples/index.py

@@ -218,8 +218,6 @@ def dump_sections(output):
 def dump_Makefile():
     for file in glob.glob('*.xml'):
         extras.append(file)
-    for file in glob.glob('*.res'):
-        extras.append(file)
     Makefile="""# -*- buffer-read-only: t -*- vi: set ro:
 # Beware this is autogenerated by index.py
 SUBDIRS=python
@@ -243,7 +241,7 @@ index.html: examples.xml examples.xsl $(top_srcdir)/docs/site.xsl
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(HTML_DIR)
 	-@INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \\
-	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)
+	  $(srcdir)/*.xsl $(DESTDIR)$(HTML_DIR)
 
 """
     EXTRA_DIST= string.join(extras, ' ')

docs/examples/python/README

@@ -12,4 +12,3 @@ domrestore.py - restore domU's from their saved files in a directory
 The XML files in this directory are examples of the XML format that libvirt
 expects, and will have to be adapted for your setup. They are only needed
 for domstart.py
-

docs/examples/python/dominfo.py

@@ -82,5 +82,3 @@ for d in devs:
     elif type == "bridge":
         print_xml("Source:", ctx, "source/@bridge")
         print_xml("MAC Addr:", ctx, "mac/@address")
-
-

docs/examples/python/domstart.py

@@ -32,7 +32,7 @@ if len(sys.argv) != 2:
 
 (name, xmldesc) = read_domain(sys.argv[1])
 
-conn = libvirt.openReadOnly(None)
+conn = libvirt.open(None)
 if conn == None:
     print 'Failed to open connection to the hypervisor'
     sys.exit(1)