17 files changed, 2303 insertions, 123 deletions

diff --git a/.hgignore b/.hgignore
index 7bf6a0db87..8b9d816f4b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,6 +19,7 @@
 ^docs/.*\.toc$
 ^docs/figs/xenserver\.eps$
 ^docs/html/.*$
+^docs/api/.*$
 ^docs/interface/WARNINGS$
 ^docs/interface/images\.pl$
 ^docs/interface/images\.tex$
@@ -60,8 +61,6 @@
 ^pristine-.*$
 ^ref-.*$
 ^tools/.*/build/lib.*/.*\.py$
-^tools/Makefile\.smh$
-^tools/balloon/balloon$
 ^tools/blktap/Makefile\.smh$
 ^tools/blktap/blkcow$
 ^tools/blktap/blkcowgnbd$
@@ -85,8 +84,7 @@
 ^tools/blktap/ublkback/ublkback$
 ^tools/blktap/xen/.*$
 ^tools/check/\..*$
-^tools/cmdline/.*$
-^tools/cmdline/xen/.*$
+^tools/examples/xmexample\.vmx$
 ^tools/console/xenconsoled$
 ^tools/console/xenconsole$
 ^tools/debugger/pdb/pdb$
@@ -109,8 +107,6 @@
 ^tools/firmware/vmxassist/roms\.h$
 ^tools/firmware/vmxassist/vmxassist$
 ^tools/firmware/vmxassist/vmxloader$
-^tools/gdb/gdb-6\.2\.1-linux-i386-xen/.*$
-^tools/gdb/gdb-6\.2\.1/.*$
 ^tools/ioemu/config-host\..*$
 ^tools/ioemu/keysym_adapter_sdl\.h$
 ^tools/ioemu/keysym_adapter_vnc\.h$
@@ -141,12 +137,9 @@
 ^tools/vnet/vnet-module/\..*\.cmd$
 ^tools/vnet/vnet-module/\.tmp_versions/.*$
 ^tools/vnet/vnet-module/vnet_module\.mod\..*$
-^tools/vnetd/vnetd$
 ^tools/vtpm/vtpm*
 ^tools/vtpm/tpm_emulator-*
 ^tools/vtpm_manager/manager/vtpm_managerd
-^tools/web-shutdown\.tap$
-^tools/x2d2/minixend$
 ^tools/xcutils/xc_restore$
 ^tools/xcutils/xc_save$
 ^tools/xenstat/xentop/xentop$
diff --git a/Makefile b/Makefile
index 3b50ec6436..ea52d8c98c 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ ifeq ($(XEN_TARGET_X86_PAE),y)
 export pae=y
 endif
 
-.PHONY:	all dist install xen kernels tools docs world clean mkpatches mrproper
-.PHONY:	kbuild kdelete kclean
+.PHONY:	all dist install xen kernels tools dev-docs docs world clean
+.PHONY:	mkpatches mrproper kbuild kdelete kclean
 
 # build and install everything into the standard system directories
 install: install-xen install-kernels install-tools install-docs
@@ -66,6 +66,9 @@ kernels:
 docs:
 	sh ./docs/check_pkgs && $(MAKE) -C docs install || true
 
+dev-docs:
+	$(MAKE) -C docs dev-docs
+
 # Build all the various kernels and modules
 kbuild: kernels
 
@@ -123,7 +126,7 @@ help:
 	@echo '  install-xen      - build and install the Xen hypervisor'
 	@echo '  install-tools    - build and install the control tools'
 	@echo '  install-kernels  - build and install guest kernels'
-	@echo '  install-docs     - build and install documentation'
+	@echo '  install-docs     - build and install user documentation'
 	@echo ''
 	@echo 'Building targets:'
 	@echo '  dist             - build and install everything into local dist directory'
@@ -133,7 +136,8 @@ help:
 	@echo '  tools            - build and install tools'
 	@echo '  kernels          - build and install guest kernels'
 	@echo '  kbuild           - synonym for make kernels'
-	@echo '  docs             - build and install docs'
+	@echo '  docs             - build and install user documentation'
+	@echo '  dev-docs         - build developer-only documentation'
 	@echo ''
 	@echo 'Cleaning targets:'
 	@echo '  clean            - clean the Xen, tools and docs (but not'
diff --git a/docs/Doxyfile b/docs/Doxyfile
new file mode 100644
index 0000000000..21b06aa07f
--- /dev/null
+++ b/docs/Doxyfile
@@ -0,0 +1,1218 @@
+# Doxyfile 1.4.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = Xen Python Tools
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = api/tools/python
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
+
+USE_WINDOWS_ENCODING   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
+# only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = YES
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation.
+
+SHOW_DIRECTORIES       = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the progam writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = ../tools/python/xen/
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
+
+FILE_PATTERNS          = *.py *.c
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories.
+
+EXCLUDE_PATTERNS       = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = "sh ./Doxyfilter ../tools/python"
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that a graph may be further truncated if the graph's 
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
+# the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/docs/Doxyfilter b/docs/Doxyfilter
new file mode 100644
index 0000000000..6a6d50f734
--- /dev/null
+++ b/docs/Doxyfilter
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#
+# Doxyfilter <source-root> <filename>
+#
+
+dir=$(dirname "$0")
+
+PYFILTER="$dir/pythfilter.py"
+
+if [ "${2/.py/}" != "$2" ]
+then
+    python "$PYFILTER" -r "$1" -f "$2"
+else
+    cat "$2"
+fi
diff --git a/docs/Makefile b/docs/Makefile
index 117e63ce4f..188d69240a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -8,6 +8,7 @@ DVIPS		:= dvips
 LATEX		:= latex
 FIG2DEV		:= fig2dev
 LATEX2HTML	:= latex2html
+DOXYGEN		:= doxygen
 
 pkgdocdir	:= /usr/share/doc/xen
 
@@ -18,10 +19,14 @@ DOC_HTML	:= $(patsubst src/%.tex,html/%/index.html,$(DOC_TEX))
 
 GFX = $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
 
+.PHONY:	all build dev-docs python-dev-docs ps pdf html clean install
+
 all: build
 build: ps pdf html
 	rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
 
+dev-docs: python-dev-docs
+
 ps: $(DOC_PS)
 
 pdf: $(DOC_PDF)
@@ -30,10 +35,18 @@ html:
 	@if which $(LATEX2HTML) 1>/dev/null 2>/dev/null; then \
 	$(MAKE) $(DOC_HTML); fi
 
+python-dev-docs:
+	mkdir -p api/tools/python
+	@if which $(DOXYGEN) 1>/dev/null 2>/dev/null; then         \
+        echo "Running doxygen to generate Python tools APIs ... "; \
+	$(DOXYGEN) Doxyfile;                                       \
+	$(MAKE) -C api/tools/python/latex ; fi
+
 clean:
 	rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
 	rm -rf *.ilg *.log *.ind *.toc *.bak core
 	rm -rf $(GFX) ps pdf html
+	rm -rf api
 
 install: all
 	rm -rf $(DESTDIR)$(pkgdocdir)
diff --git a/docs/pythfilter.py b/docs/pythfilter.py
new file mode 100644
index 0000000000..3054f7caf3
--- /dev/null
+++ b/docs/pythfilter.py
@@ -0,0 +1,658 @@
+#!/usr/bin/env python

+

+# pythfilter.py v1.5.5, written by Matthias Baas (baas@ira.uka.de)

+

+# Doxygen filter which can be used to document Python source code.

+# Classes (incl. methods) and functions can be documented.

+# Every comment that begins with ## is literally turned into an

+# Doxygen comment. Consecutive comment lines are turned into

+# comment blocks (-> /** ... */).

+# All the stuff is put inside a namespace with the same name as

+# the source file.

+

+# Conversions:

+# ============

+# ##-blocks                  ->  /** ... */

+# "class name(base): ..."    ->  "class name : public base {...}"

+# "def name(params): ..."    ->  "name(params) {...}"

+

+# Changelog:

+# 21.01.2003: Raw (r"") or unicode (u"") doc string will now be properly

+#             handled. (thanks to Richard Laager for the patch)

+# 22.12.2003: Fixed a bug where no function names would be output for "def"

+#             blocks that were not in a class.

+#             (thanks to Richard Laager for the patch)

+# 12.12.2003: Implemented code to handle static and class methods with

+#             this logic: Methods with "self" as the first argument are

+#             non-static. Methods with "cls" are Python class methods,

+#             which translate into static methods for Doxygen. Other

+#             methods are assumed to be static methods. As should be

+#             obvious, this logic doesn't take into account if the method

+#             is actually setup as a classmethod() or a staticmethod(),

+#             just if it follows the normal conventions.

+#             (thanks to Richard Laager for the patch)

+# 11.12.2003: Corrected #includes to use os.path.sep instead of ".". Corrected

+#             namespace code to use "::" instead of ".".

+#             (thanks to Richard Laager for the patch)

+# 11.12.2003: Methods beginning with two underscores that end with

+#             something other than two underscores are considered private

+#             and are handled accordingly.

+#             (thanks to Richard Laager for the patch)

+# 03.12.2003: The first parameter of class methods (self) is removed from

+#             the documentation.

+# 03.11.2003: The module docstring will be used as namespace documentation

+#             (thanks to Joe Bronkema for the patch)

+# 08.07.2003: Namespaces get a default documentation so that the namespace

+#             and its contents will show up in the generated documentation.

+# 05.02.2003: Directories will be delted during synchronization.

+# 31.01.2003: -f option & filtering entire directory trees.

+# 10.08.2002: In base classes the '.' will be replaced by '::'

+# 18.07.2002: * and ** will be translated into arguments

+# 18.07.2002: Argument lists may contain default values using constructors.

+# 18.06.2002: Support for ## public:

+# 21.01.2002: from ... import will be translated to "using namespace ...;"

+#             TODO: "from ... import *" vs "from ... import names"

+#             TODO: Using normal imports: name.name -> name::name

+# 20.01.2002: #includes will be placed in front of the namespace

+

+######################################################################

+

+# The program is written as a state machine with the following states:

+#

+# - OUTSIDE               The current position is outside any comment,

+#                         class definition or function.

+#

+# - BUILD_COMMENT         Begins with first "##".

+#                         Ends with the first token that is no "##"

+#                         at the same column as before.

+#

+# - BUILD_CLASS_DECL      Begins with "class".

+#                         Ends with ":"

+# - BUILD_CLASS_BODY      Begins just after BUILD_CLASS_DECL.

+#                         The first following token (which is no comment)

+#                         determines indentation depth.

+#                         Ends with a token that has a smaller indendation.

+#

+# - BUILD_DEF_DECL        Begins with "def".

+#                         Ends with ":".

+# - BUILD_DEF_BODY        Begins just after BUILD_DEF_DECL.

+#                         The first following token (which is no comment)

+#                         determines indentation depth.

+#                         Ends with a token that has a smaller indendation.

+

+import getopt

+import glob

+import os.path

+import re

+import shutil

+import string

+import sys

+import token

+import tokenize

+

+from stat import *

+

+OUTSIDE          = 0

+BUILD_COMMENT    = 1

+BUILD_CLASS_DECL = 2

+BUILD_CLASS_BODY = 3

+BUILD_DEF_DECL   = 4

+BUILD_DEF_BODY   = 5

+IMPORT           = 6

+IMPORT_OP        = 7

+IMPORT_APPEND    = 8

+

+# Output file stream

+outfile = sys.stdout

+

+# Output buffer

+outbuffer = []

+

+out_row = 1

+out_col = 0

+

+# Variables used by rec_name_n_param()

+name         = ""

+param        = ""

+doc_string   = ""

+record_state = 0

+bracket_counter = 0

+

+# Tuple: (row,column)

+class_spos  = (0,0)

+def_spos    = (0,0)

+import_spos = (0,0)

+

+# Which import was used? ("import" or "from")

+import_token = ""

+

+# Comment block buffer

+comment_block = []

+comment_finished = 0

+

+# Imported modules

+modules = []

+

+# Program state

+stateStack = [OUTSIDE]

+

+# Keep track of whether module has a docstring

+module_has_docstring = False

+

+# Keep track of member protection

+protection_level = "public"

+private_member = False

+

+# Keep track of the module namespace

+namespace = ""

+

+######################################################################

+# Output string s. '\n' may only be at the end of the string (not

+# somewhere in the middle).

+#

+# In: s    - String

+#     spos - Startpos

+######################################################################

+def output(s,spos, immediate=0):

+    global outbuffer, out_row, out_col, outfile

+

+    os = string.rjust(s,spos[1]-out_col+len(s))

+

+    if immediate:

+        outfile.write(os)

+    else:

+        outbuffer.append(os)

+

+    assert -1 == string.find(s[0:-2], "\n"), s

+

+    if (s[-1:]=="\n"):

+        out_row = out_row+1

+        out_col = 0

+    else:

+        out_col = spos[1]+len(s)

+

+

+######################################################################

+# Records a name and parameters. The name is either a class name or

+# a function name. Then the parameter is either the base class or

+# the function parameters.

+# The name is stored in the global variable "name", the parameters

+# in "param".

+# The variable "record_state" holds the current state of this internal

+# state machine.

+# The recording is started by calling start_recording().

+#

+# In: type, tok

+######################################################################

+def rec_name_n_param(type, tok):

+    global record_state,name,param,doc_string,bracket_counter

+    s = record_state

+    # State 0: Do nothing.

+    if   (s==0):

+         return

+    # State 1: Remember name.

+    elif (s==1):

+        name = tok

+        record_state = 2

+    # State 2: Wait for opening bracket or colon

+    elif (s==2):

+        if (tok=='('):

+            bracket_counter = 1

+            record_state=3

+        if (tok==':'): record_state=4

+    # State 3: Store parameter (or base class) and wait for an ending bracket

+    elif (s==3):

+        if (tok=='*' or tok=='**'):

+            tok=''

+        if (tok=='('):

+            bracket_counter = bracket_counter+1

+        if (tok==')'):

+            bracket_counter = bracket_counter-1

+        if bracket_counter==0:

+            record_state=4

+        else:

+            param=param+tok

+    # State 4: Look for doc string

+    elif (s==4):

+        if (type==token.NEWLINE or type==token.INDENT or type==token.SLASHEQUAL):

+            return

+        elif (tok==":"):

+            return

+        elif (type==token.STRING):

+            while tok[:1]=='r' or tok[:1]=='u':

+                tok=tok[1:]

+            while tok[:1]=='"':

+                tok=tok[1:]

+            while tok[-1:]=='"':

+                tok=tok[:-1]

+            doc_string=tok

+        record_state=0

+

+######################################################################

+# Starts the recording of a name & param part.

+# The function rec_name_n_param() has to be fed with tokens. After

+# the necessary tokens are fed the name and parameters can be found

+# in the global variables "name" und "param".

+######################################################################

+def start_recording():

+    global record_state,param,name, doc_string

+    record_state=1

+    name=""

+    param=""

+    doc_string=""

+

+######################################################################

+# Test if recording is finished

+######################################################################

+def is_recording_finished():

+    global record_state

+    return record_state==0

+

+######################################################################

+## Gather comment block

+######################################################################

+def gather_comment(type,tok,spos):

+    global comment_block,comment_finished

+    if (type!=tokenize.COMMENT):

+        comment_finished = 1

+    else:

+        # Output old comment block if a new one is started.

+        if (comment_finished):

+            print_comment(spos)

+            comment_finished=0

+        if (tok[0:2]=="##" and tok[0:3]!="###"):

+            append_comment_lines(tok[2:])

+

+######################################################################

+## Output comment block and empty buffer.

+######################################################################

+def print_comment(spos):

+    global comment_block,comment_finished

+    if (comment_block!=[]):

+        output("/** ",spos)

+        for c in comment_block:

+            output(c,spos)

+        output("*/\n",spos)

+    comment_block    = []

+    comment_finished = 0

+

+######################################################################

+def set_state(s):

+    global stateStack

+    stateStack[len(stateStack)-1]=s

+

+######################################################################

+def get_state():

+    global stateStack

+    return stateStack[len(stateStack)-1]

+

+######################################################################

+def push_state(s):

+    global stateStack

+    stateStack.append(s)

+

+######################################################################

+def pop_state():

+    global stateStack

+    stateStack.pop()

+

+

+######################################################################

+def tok_eater(type, tok, spos, epos, line):

+    global stateStack,name,param,class_spos,def_spos,import_spos

+    global doc_string, modules, import_token, module_has_docstring

+    global protection_level, private_member

+    global out_row

+

+    while out_row + 1 < spos[0]:

+        output("\n", (0, 0))

+

+    rec_name_n_param(type,tok)

+    if (string.replace(string.strip(tok)," ","")=="##private:"):

+         protection_level = "private"

+         output("private:\n",spos)

+    elif (string.replace(string.strip(tok)," ","")=="##protected:"):

+         protection_level = "protected"

+         output("protected:\n",spos)

+    elif (string.replace(string.strip(tok)," ","")=="##public:"):

+         protection_level = "public"

+         output("public:\n",spos)

+    else:

+         gather_comment(type,tok,spos)

+

+    state = get_state()

+

+#    sys.stderr.write("%d: %s\n"%(state, tok))

+

+    # OUTSIDE

+    if   (state==OUTSIDE):

+        if  (tok=="class"):

+            start_recording()

+            class_spos = spos

+            push_state(BUILD_CLASS_DECL)

+        elif (tok=="def"):

+            start_recording()

+            def_spos = spos

+            push_state(BUILD_DEF_DECL)

+        elif (tok=="import") or (tok=="from"):

+            import_token = tok

+            import_spos = spos

+            modules     = []

+            push_state(IMPORT)

+        elif (spos[1] == 0 and tok[:3] == '"""'):

+            # Capture module docstring as namespace documentation

+            module_has_docstring = True

+            append_comment_lines("\\namespace %s\n" % namespace)

+            append_comment_lines(tok[3:-3])

+            print_comment(spos)

+

+    # IMPORT

+    elif (state==IMPORT):

+        if (type==token.NAME):

+            modules.append(tok)

+            set_state(IMPORT_OP)

+    # IMPORT_OP

+    elif (state==IMPORT_OP):

+        if (tok=="."):

+            set_state(IMPORT_APPEND)

+        elif (tok==","):

+            set_state(IMPORT)

+        else:

+            for m in modules:

+                output('#include "'+m.replace('.',os.path.sep)+'.py"\n', import_spos, immediate=1)

+                if import_token=="from":

+                    output('using namespace '+m.replace('.', '::')+';\n', import_spos)

+            pop_state()

+    # IMPORT_APPEND

+    elif (state==IMPORT_APPEND):

+        if (type==token.NAME):

+            modules[len(modules)-1]+="."+tok

+            set_state(IMPORT_OP)

+    # BUILD_CLASS_DECL

+    elif (state==BUILD_CLASS_DECL):

+        if (is_recording_finished()):

+            s = "class "+name

+            if (param!=""): s = s+" : public "+param.replace('.','::')

+            if (doc_string!=""):

+                append_comment_lines(doc_string)

+            print_comment(class_spos)

+            output(s+"\n",class_spos)

+            output("{\n",(class_spos[0]+1,class_spos[1]))

+            protection_level = "public"

+            output("  public:\n",(class_spos[0]+2,class_spos[1]))

+            set_state(BUILD_CLASS_BODY)

+    # BUILD_CLASS_BODY

+    elif (state==BUILD_CLASS_BODY):

+        if (type!=token.INDENT and type!=token.NEWLINE and type!=40 and

+            type!=tokenize.NL and type!=tokenize.COMMENT and

+            (spos[1]<=class_spos[1])):

+            output("}; // end of class\n",(out_row+1,class_spos[1]))

+            pop_state()

+        elif (tok=="def"):

+            start_recording()

+            def_spos = spos

+            push_state(BUILD_DEF_DECL)

+    # BUILD_DEF_DECL

+    elif (state==BUILD_DEF_DECL):

+        if (is_recording_finished()):

+            param = param.replace("\n", " ")

+            param = param.replace("=", " = ")

+            params = param.split(",")

+            if BUILD_CLASS_BODY in stateStack:

+                if len(name) > 1 \

+                   and name[0:2] == '__' \

+                   and name[len(name)-2:len(name)] != '__' \

+                   and protection_level != 'private':

+                       private_member = True

+                       output("  private:\n",(def_spos[0]+2,def_spos[1]))

+

+            if (doc_string != ""):

+                append_comment_lines(doc_string)

+

+            print_comment(def_spos)

+

+            output_function_decl(name, params)

+#       output("{\n",(def_spos[0]+1,def_spos[1]))

+            set_state(BUILD_DEF_BODY)

+    # BUILD_DEF_BODY

+    elif (state==BUILD_DEF_BODY):

+        if (type!=token.INDENT and type!=token.NEWLINE \

+            and type!=40 and type!=tokenize.NL \

+            and (spos[1]<=def_spos[1])):

+#            output("} // end of method/function\n",(out_row+1,def_spos[1]))

+            if private_member and protection_level != 'private':

+                private_member = False

+                output("  " + protection_level + ":\n",(def_spos[0]+2,def_spos[1]))

+            pop_state()

+#       else:

+#            output(tok,spos)

+

+

+def output_function_decl(name, params):

+    global def_spos

+

+    # Do we document a class method? then remove the 'self' parameter

+    if params[0] == 'self':

+        preamble = ''

+        params = params[1:]

+    else:

+        preamble = 'static '

+        if params[0] == 'cls':

+            params = params[1:]

+

+    param_string = string.join(params, ", Type ")

+

+    if param_string == '':

+        param_string = '(' + param_string + ');\n'

+    else:

+        param_string = '(Type ' + param_string + ');\n'

+

+    output(preamble, def_spos)

+    output(name, def_spos)

+    output(param_string, def_spos)

+

+

+def append_comment_lines(lines):

+    map(append_comment_line, doc_string.split('\n'))

+

+paramRE = re.compile(r'(@param \w+):')

+

+def append_comment_line(line):

+    global paramRE

+    

+    comment_block.append(paramRE.sub(r'\1', line) + '\n')

+

+def dump(filename):

+    f = open(filename)

+    r = f.readlines()

+    for s in r:

+        sys.stdout.write(s)

+

+def filter(filename):

+    global name, module_has_docstring, source_root

+

+    path,name = os.path.split(filename)

+    root,ext  = os.path.splitext(name)

+

+    if source_root and path.find(source_root) == 0:

+        path = path[len(source_root):]

+

+        if path[0] == os.sep:

+            path = path[1:]

+

+        ns = path.split(os.sep)

+    else:

+        ns = []

+

+    ns.append(root)

+

+    for n in ns:

+        output("namespace " + n + " {\n",(0,0))

+

+    # set module name for tok_eater to use if there's a module doc string

+    name = root

+

+#    sys.stderr.write('Filtering "'+filename+'"...')

+    f = open(filename)

+    tokenize.tokenize(f.readline, tok_eater)

+    f.close()

+    print_comment((0,0))

+

+    output("\n",(0,0))

+    

+    for n in ns:

+        output("}  // end of namespace\n",(0,0))

+

+    if not module_has_docstring:

+        # Put in default namespace documentation

+        output('/** \\namespace '+root+' \n',(0,0))

+        output('    \\brief Module "%s" */\n'%(root),(0,0))

+

+    for s in outbuffer:

+        outfile.write(s)

+

+

+def filterFile(filename, out=sys.stdout):

+    global outfile

+

+    outfile = out

+

+    try:

+        root,ext  = os.path.splitext(filename)

+

+        if ext==".py":

+            filter(filename)

+        else:

+            dump(filename)

+

+#        sys.stderr.write("OK\n")

+    except IOError,e:

+        sys.stderr.write(e[1]+"\n")

+

+

+######################################################################

+

+# preparePath

+def preparePath(path):

+    """Prepare a path.

+

+    Checks if the path exists and creates it if it does not exist.

+    """

+    if not os.path.exists(path):

+        parent = os.path.dirname(path)

+        if parent!="":

+            preparePath(parent)

+        os.mkdir(path)

+

+# isNewer

+def isNewer(file1,file2):

+    """Check if file1 is newer than file2.

+

+    file1 must be an existing file.

+    """

+    if not os.path.exists(file2):

+        return True

+    return os.stat(file1)[ST_MTIME]>os.stat(file2)[ST_MTIME]

+

+# convert

+def convert(srcpath, destpath):

+    """Convert a Python source tree into a C+ stub tree.

+

+    All *.py files in srcpath (including sub-directories) are filtered

+    and written to destpath. If destpath exists, only the files

+    that have been modified are filtered again. Files that were deleted

+    from srcpath are also deleted in destpath if they are still present.

+    The function returns the number of processed *.py files.

+    """

+    count=0

+    sp = os.path.join(srcpath,"*")

+    sfiles = glob.glob(sp)

+    dp = os.path.join(destpath,"*")

+    dfiles = glob.glob(dp)

+    leftovers={}

+    for df in dfiles:

+        leftovers[os.path.basename(df)]=1

+

+    for srcfile in sfiles:

+        basename = os.path.basename(srcfile)

+        if basename in leftovers:

+            del leftovers[basename]

+

+        # Is it a subdirectory?

+        if os.path.isdir(srcfile):

+            sdir = os.path.join(srcpath,basename)

+            ddir = os.path.join(destpath,basename)

+            count+=convert(sdir, ddir)

+            continue

+        # Check the extension (only *.py will be converted)

+        root, ext = os.path.splitext(srcfile)

+        if ext.lower()!=".py":

+            continue

+

+        destfile = os.path.join(destpath,basename)

+        if destfile==srcfile:

+            print "WARNING: Input and output names are identical!"

+            sys.exit(1)

+

+        count+=1

+#        sys.stdout.write("%s\015"%(srcfile))

+

+        if isNewer(srcfile, destfile):

+            preparePath(os.path.dirname(destfile))

+#            out=open(destfile,"w")

+#            filterFile(srcfile, out)

+#            out.close()

+            os.system("python %s -f %s>%s"%(sys.argv[0],srcfile,destfile))

+

+    # Delete obsolete files in destpath

+    for df in leftovers:

+        dname=os.path.join(destpath,df)

+        if os.path.isdir(dname):

+            try:

+                shutil.rmtree(dname)

+            except:

+                print "Can't remove obsolete directory '%s'"%dname

+        else:

+            try:

+                os.remove(dname)

+            except:

+                print "Can't remove obsolete file '%s'"%dname

+

+    return count

+

+

+######################################################################

+######################################################################

+######################################################################

+

+filter_file = False

+source_root = None

+

+try:

+    opts, args = getopt.getopt(sys.argv[1:], "hfr:", ["help"])

+except getopt.GetoptError,e:

+    print e

+    sys.exit(1)

+

+for o,a in opts:

+    if o=="-f":

+        filter_file = True

+

+    if o=="-r":

+        source_root = os.path.abspath(a)

+

+if filter_file:

+    # Filter the specified file and print the result to stdout

+    filename = string.join(args)

+    filterFile(os.path.abspath(filename))

+else:

+

+    if len(args)!=2:

+        sys.stderr.write("%s options input output\n"%(os.path.basename(sys.argv[0])))

+        sys.exit(1)

+

+    # Filter an entire Python source tree

+    print '"%s" -> "%s"\n'%(args[0],args[1])

+    c=convert(args[0],args[1])

+    print "%d files"%(c)

+

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 36edb8789f..5bfa67fd9f 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -25,7 +25,7 @@ XEN_SCRIPTS += block-phy
 XEN_SCRIPTS += block-file
 XEN_SCRIPTS += block-enbd
 
-XEN_BOOT_DIR = /usr/lib/xen/boot
+XEN_BOOT_DIR = /usr/$(LIBDIR)/xen/boot
 XEN_BOOT = mem-map.sxp
 
 XEN_HOTPLUG_DIR = /etc/hotplug
@@ -37,12 +37,15 @@ build:
 install: all install-initd install-configs install-scripts install-boot \
 	 install-hotplug
 
+xmexample.vmx: xmexample.vmx.in
+	sed -e 's/@@LIBDIR@@/$(LIBDIR)/' < $< > $@
+
 install-initd:
 	[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
 	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
 	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
 
-install-configs:
+install-configs: $(XEN_CONFIGS)
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
 		$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
 	[ -d $(DESTDIR)$(XEN_CONFIG_DIR)/auto ] || \
@@ -77,3 +80,4 @@ install-hotplug:
 	done
 
 clean:
+	$(RM) xmexample.vmx
diff --git a/tools/examples/xmexample.vmx b/tools/examples/xmexample.vmx.in
index 1c338beca4..c45a237033 100644
--- a/tools/examples/xmexample.vmx
+++ b/tools/examples/xmexample.vmx.in
@@ -8,7 +8,7 @@
 
 #----------------------------------------------------------------------------
 # Kernel image file.
-kernel = "/usr/lib/xen/boot/vmxloader"
+kernel = "/usr/@@LIBDIR@@/xen/boot/vmxloader"
 
 # The domain build function. VMX domain uses 'vmx'.
 builder='vmx'
@@ -48,10 +48,10 @@ disk = [ 'file:/var/images/min-el3-i386.img,ioemu:hda,w' ]
 
 
 # New stuff
-device_model = '/usr/lib/xen/bin/qemu-dm'
+device_model = '/usr/@@LIBDIR@@/xen/bin/qemu-dm'
 
 # Advanced users only. Don't touch if you don't know what you're doing
-memmap = '/usr/lib/xen/boot/mem-map.sxp'
+memmap = '/usr/@@LIBDIR@@/xen/boot/mem-map.sxp'
 
 #-----------------------------------------------------------------------------
 # Disk image for 
diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 67dcb2e99e..856be8fe87 100644
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 include config.mak
 override TARGET_ARCH=i386
 
-INSTALL_DIR := $(DESTDIR)/usr/lib/xen/bin
+INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
 DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
diff --git a/tools/python/Makefile b/tools/python/Makefile
index a676cdf0e9..ea8040d512 100644
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -1,7 +1,8 @@
-
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
+.PHONY: all build install clean
+
 all: build
 build:
 	CFLAGS="$(CFLAGS)" python setup.py build
diff --git a/tools/python/pylintrc b/tools/python/pylintrc
new file mode 100644
index 0000000000..7d207d1b95
--- /dev/null
+++ b/tools/python/pylintrc
@@ -0,0 +1,307 @@
+# lint Python modules using external checkers.                            
+#                                                                                
+#     This is the main checker controling the other ones and the reports         
+#     generation. It is itself both a raw checker and an astng checker in order  
+#     to:                                                                        
+#     * handle message activation / deactivation at the module level             
+#     * handle some basic but necessary stats'data (number of classes, methods...)
+#                                                                                 
+# This checker also defines the following reports:                                    
+#   * R0001: Total errors / warnings                                              
+#   * R0002: % errors / warnings by module                                        
+#   * R0003: Messages                                                             
+#   * R0004: Global evaluation                                                    
+# 
+[MASTER]
+# Add <file or directory> to the black list. It should be a base name, not a
+# path. You may set this option multiple times.
+ignore=CVS
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Set the cache size for astng objects.
+cache-size=500
+
+
+
+[REPORTS]
+# Tells wether to display a full report or only the messages
+reports=yes
+
+# Use HTML as output format instead of text
+html=no
+
+# Use a parseable text output format, so your favorite text editor will be able
+# to jump to the line corresponding to a message.
+parseable=no
+
+# Colorizes text output using ansi escape codes
+color=no
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note).You have access to the variables errors warning, statement which
+# respectivly contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (R0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (R0004).
+comment=no
+
+# Include message's id in output
+include-ids=yes
+
+
+
+# checks for                                                              
+#     * unused variables / imports                                               
+#     * undefined variables                                                      
+#     * redefinition of variable from builtins or from an outer scope            
+#     * use of variable before assigment                                         
+#     
+[VARIABLES]
+# Enable / disable this checker
+enable-variables=yes
+
+# Tells wether we should check for unused import in __init__ files.
+init-import=no
+
+# List of variable names used for dummy variables (i.e. not used).
+dummy-variables=_,dummy
+
+
+
+# checks for :                                                            
+#     * doc strings                                                              
+#     * modules / classes / functions / methods / arguments / variables name     
+#     * number of arguments, local variables, branchs, returns and statements in
+# functions, methods                                                       
+#     * required module attributes                                             
+#     * dangerous default values as arguments                                    
+#     * redefinition of function / method / class                                
+#     * uses of the global statement                                             
+#                                                                                 
+# This checker also defines the following reports:                                    
+#   * R0101: Statistics by type                                                   
+# 
+[BASIC]
+# Enable / disable this checker
+enable-basic=yes
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=.*
+
+# Minimal length for module / class / function / method / argument / variable
+# names
+min-name-length=1
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][A-Za-z0-9_]*$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][A-Za-z0-9_]*$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][A-Za-z0-9_]*$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+
+
+# checks for sign of poor/misdesign:                                      
+#     * number of methods, attributes, local variables...                        
+#     * size, complexity of functions, methods                                   
+#     
+[DESIGN]
+# Enable / disable this checker
+enable-design=yes
+
+# Maximum number of arguments for function / method
+max-args=15
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+
+# checks for :                                                            
+#     * methods without self as first argument                                   
+#     * overriden methods signature                                              
+#     * access only to existant members via self                                 
+#     * attributes not defined in the __init__ method                            
+#     * supported interfaces implementation                                      
+#     * unreachable code                                                         
+#     
+[CLASSES]
+# Enable / disable this checker
+enable-classes=yes
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# Tells wether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+
+
+# checks for                                                              
+#     * external modules dependencies                                            
+#     * relative / wildcard imports                                                         
+#     * cyclic imports                                                           
+#     * uses of deprecated modules
+#                                                                                 
+# This checker also defines the following reports:                                    
+#   * R0401: External dependencies                                                
+#   * R0402: Modules dependencies graph                                           
+# 
+[IMPORTS]
+# Enable / disable this checker
+enable-imports=no
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the given
+# file (report R0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report R0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report R0402 must
+# not be disabled)
+int-import-graph=
+
+
+
+# checks for                                                              
+#     * excepts without exception filter                                         
+#     * string exceptions                                                        
+#     
+[EXCEPTIONS]
+# Enable / disable this checker
+enable-exceptions=yes
+
+
+
+# checks for :                                                            
+#     * unauthorized constructions                                               
+#     * strict indentation                                                       
+#     * line length                                                              
+#     * use of <> instead of !=
+#     
+[FORMAT]
+# Enable / disable this checker
+enable-format=no
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 tab).
+indent-string='    '
+
+
+
+# does not check anything but gives some raw metrics :                    
+#     * total number of lines                                                    
+#     * total number of code lines                                               
+#     * total number of docstring lines                                          
+#     * total number of comments lines                                           
+#     * total number of empty lines                                              
+#                                                                                 
+# This checker also defines the following reports:                                    
+#   * R0701: Raw metrics                                                          
+# 
+[METRICS]
+# Enable / disable this checker
+enable-metrics=yes
+
+
+
+# checks for:                                                             
+#     * warning notes in the code like FIXME, XXX                                
+#     * PEP 263: source code with non ascii character but no encoding declaration
+#     
+[MISCELLANEOUS]
+# Enable / disable this checker
+enable-miscellaneous=yes
+
+# List of note tags to take in consideration, separated by a comma. Default to
+# FIXME, XXX, TODO
+notes=FIXME,XXX,TODO
+
+
+
+# checks for similarities and duplicated code. This computation may be
+#     memory / CPU intensive, so you should disable it if you experiments some
+#     problems.
+#                                                                                 
+# This checker also defines the following reports:                                    
+#   * R0801: Duplication                                                          
+# 
+[SIMILARITIES]
+# Enable / disable this checker
+enable-similarities=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+
+
diff --git a/tools/python/xen/sv/DomInfo.py b/tools/python/xen/sv/DomInfo.py
index 0f7a8ab486..12135cd4fb 100755
--- a/tools/python/xen/sv/DomInfo.py
+++ b/tools/python/xen/sv/DomInfo.py
@@ -75,7 +75,7 @@ class DomGeneralTab( CompositeTab ):
        
 class DomGenTab( GeneralTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
     
         titles = {}
     
@@ -103,7 +103,7 @@ class DomGenTab( GeneralTab ):
             
 class DomSXPTab( PreTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         self.dom = 0
         PreTab.__init__( self, "" )
 
@@ -126,7 +126,7 @@ class DomSXPTab( PreTab ):
        
 class DomActionTab( ActionTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
     	actions = { "shutdown" : "Shutdown",
         	    "reboot" : "Reboot",
                     "pause" : "Pause",
@@ -188,19 +188,19 @@ class DomDeviceListTab( NullTab ):
 
     title = "Device List"
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         pass
 
 class DomDeviceOptionsTab( NullTab ):
 
     title = "Device Options"
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         pass
 
 class DomDeviceActionTab( ActionTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         ActionTab.__init__( self, { "addvcpu" : "Add VCPU", "addvbd" : "Add VBD", "addvif" : "Add VIF" } )
 
 class DomMigrateTab( CompositeTab ):
@@ -218,7 +218,7 @@ class DomMigrateExtraTab( Sheet ):
                                                                                                             
 class DomMigrateActionTab( ActionTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         actions = { "migrate" : "Migrate" }
         ActionTab.__init__( self, actions )
                 
@@ -249,7 +249,7 @@ class DomSaveExtraTab( Sheet ):
                
 class DomSaveActionTab( ActionTab ):
 
-    def __init__( self, urlWriter ):
+    def __init__( self, _ ):
         actions = { "save" : "Save" }
         ActionTab.__init__( self, actions )
 
diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 8209ef9588..7251239bad 100644
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -103,34 +103,6 @@ def shutdown_reason(code):
     """
     return shutdown_reasons.get(code, "?")
 
-config_handlers = {}
-
-def add_config_handler(name, h):
-    """Add a handler for a config field.
-
-    @param name:     field name
-    @param h:        handler: fn(vm, config, field, index)
-    """
-    config_handlers[name] = h
-
-def get_config_handler(name):
-    """Get a handler for a config field.
-
-    returns handler or None
-    """
-    return config_handlers.get(name)
-
-"""Table of handlers for devices.
-Indexed by device type.
-"""
-device_handlers = {}
-
-def add_device_handler(name, type):
-    device_handlers[name] = type
-
-def get_device_handler(name):
-    return device_handlers[name]
-
 def dom_get(dom):
     """Get info from xen for an existing domain.
 
@@ -382,12 +354,6 @@ class XendDomainInfo:
 
     __repr__ = __str__
 
-    def getDeviceTypes(self):
-        return self.controllers.keys()
-
-    def getDeviceControllers(self):
-        return self.controllers.values()
-
     def getDeviceController(self, type, error=True):
         ctrl = self.controllers.get(type)
         if not ctrl and error:
@@ -596,7 +562,7 @@ class XendDomainInfo:
 
     def sxpr_devices(self):
         sxpr = []
-        for ty in self.getDeviceTypes():
+        for ty in self.controllers.keys():
             devs = self.getDeviceSxprs(ty)
             sxpr += devs
         if sxpr:
@@ -787,7 +753,7 @@ class XendDomainInfo:
         """Release all vm devices.
         """
         reboot = self.restart_pending()
-        for ctrl in self.getDeviceControllers():
+        for ctrl in self.controllers.values():
             if ctrl.isDestroyed(): continue
             ctrl.destroyController(reboot=reboot)
         t = xstransact("%s/device" % self.path)
@@ -845,6 +811,7 @@ class XendDomainInfo:
         self.store_channel = self.eventChannel("store/port")
         self.console_channel = self.eventChannel("console/port")
 
+
     def create_configured_devices(self):
         devices = sxp.children(self.config, 'device')
         for d in devices:
@@ -852,18 +819,20 @@ class XendDomainInfo:
             if dev_config is None:
                 raise VmError('invalid device')
             dev_type = sxp.name(dev_config)
-            ctrl_type = get_device_handler(dev_type)
-            if ctrl_type is None:
+
+            if not controller.isDevControllerClass(dev_type):
                 raise VmError('unknown device type: ' + dev_type)
-            self.createDevice(ctrl_type, dev_config)
-        
+            
+            self.createDevice(dev_type, dev_config)
+
+
     def create_devices(self):
         """Create the devices for a vm.
 
         @raise: VmError for invalid devices
         """
         if self.rebooting():
-            for ctrl in self.getDeviceControllers():
+            for ctrl in self.controllers.values():
                 ctrl.initController(reboot=True)
         else:
             self.create_configured_devices()
@@ -1014,7 +983,7 @@ class XendDomainInfo:
             msg = "Had a bootloader specified, but can't find disk"
             log.error(msg)
             raise VmError(msg)
-        config = sxp.merge(['vm', blconfig ], self.config)
+        config = sxp.merge(['vm', blcfg ], self.config)
         return config
 
     def configure_backends(self):
@@ -1063,7 +1032,7 @@ class XendDomainInfo:
         for field in sxp.children(self.config):
             field_name = sxp.name(field)
             field_index = index.get(field_name, 0)
-            field_handler = get_config_handler(field_name)
+            field_handler = config_handlers.get(field_name)
             # Ignore unknown fields. Warn?
             if field_handler:
                 v = field_handler(self, self.config, field, field_index)
@@ -1133,23 +1102,17 @@ class XendDomainInfo:
             # get run-time value of vcpus and update store
             self.exportVCPUSToDB(dom_get(self.id)['vcpus'])
 
-def vm_field_ignore(vm, config, val, index):
-    """Dummy config field handler used for fields with built-in handling.
 
-    @param vm:        virtual machine
-    @param config:    vm config
-    @param val:       config field
-    @param index:     field index
+def vm_field_ignore(_, _1, _2, _3):
+    """Dummy config field handler used for fields with built-in handling.
+    Matches the signature required by config_handlers.
     """
     pass
 
-def vm_field_maxmem(vm, config, val, index):
-    """Configure vm memory limit.
 
-    @param vm:        virtual machine
-    @param config:    vm config
-    @param val:       config field
-    @param index:     field index
+def vm_field_maxmem(vm, _1, val, _2):
+    """Config field handler to configure vm memory limit.  Matches the
+    signature required by config_handlers.
     """
     maxmem = sxp.child0(val)
     if maxmem is None:
@@ -1160,8 +1123,10 @@ def vm_field_maxmem(vm, config, val, index):
         raise VmError("invalid maxmem: " + str(maxmem))
     xc.domain_setmaxmem(vm.id, maxmem_kb = maxmem * 1024)
 
+
 #============================================================================
 # Register image handlers.
+
 from image import          \
      addImageHandlerClass, \
      ImageHandler,         \
@@ -1171,43 +1136,37 @@ from image import          \
 addImageHandlerClass(LinuxImageHandler)
 addImageHandlerClass(VmxImageHandler)
 
-# Ignore the fields we already handle.
-add_config_handler('name',       vm_field_ignore)
-add_config_handler('memory',     vm_field_ignore)
-add_config_handler('ssidref',    vm_field_ignore)
-add_config_handler('cpu',        vm_field_ignore)
-add_config_handler('cpu_weight', vm_field_ignore)
-add_config_handler('restart',    vm_field_ignore)
-add_config_handler('image',      vm_field_ignore)
-add_config_handler('device',     vm_field_ignore)
-add_config_handler('backend',    vm_field_ignore)
-add_config_handler('vcpus',      vm_field_ignore)
-add_config_handler('bootloader', vm_field_ignore)
-
-# Register other config handlers.
-add_config_handler('maxmem',     vm_field_maxmem)
-
-#============================================================================
-# Register device controllers and their device config types.
-
-from server import blkif
-controller.addDevControllerClass("vbd", blkif.BlkifController)
-add_device_handler("vbd", "vbd")
 
-from server import netif
-controller.addDevControllerClass("vif", netif.NetifController)
-add_device_handler("vif", "vif")
+"""Table of handlers for field configuration.
 
-from server import tpmif
-controller.addDevControllerClass("vtpm", tpmif.TPMifController)
-add_device_handler("vtpm", "vtpm")
-
-from server import pciif
-controller.addDevControllerClass("pci", pciif.PciController)
-add_device_handler("pci", "pci")
+field_name[String]: fn(vm, config, field, index) -> value(ignored)
+"""
+config_handlers = {
+    
+    # Ignore the fields we already handle.
+    
+    'name':       vm_field_ignore,
+    'memory':     vm_field_ignore,
+    'ssidref':    vm_field_ignore,
+    'cpu':        vm_field_ignore,
+    'cpu_weight': vm_field_ignore,
+    'restart':    vm_field_ignore,
+    'image':      vm_field_ignore,
+    'device':     vm_field_ignore,
+    'backend':    vm_field_ignore,
+    'vcpus':      vm_field_ignore,
+    'bootloader': vm_field_ignore,
+    
+    # Register other config handlers.
+    'maxmem':     vm_field_maxmem
+    }
 
-from xen.xend.server import usbif
-controller.addDevControllerClass("usb", usbif.UsbifController)
-add_device_handler("usb", "usb")
 
 #============================================================================
+# Register device controllers and their device config types.
+
+controller.addDevControllerClass("vbd",  server.blkif.BlkifController)
+controller.addDevControllerClass("vif",  server.netif.NetifController)
+controller.addDevControllerClass("vtpm", server.tpmif.TPMifController)
+controller.addDevControllerClass("pci",  server.pciif.PciController)
+controller.addDevControllerClass("usb",  server.usbif.UsbifController)
diff --git a/tools/python/xen/xend/XendVnet.py b/tools/python/xen/xend/XendVnet.py
index 5ed7ee1d64..2308e391ee 100644
--- a/tools/python/xen/xend/XendVnet.py
+++ b/tools/python/xen/xend/XendVnet.py
@@ -145,7 +145,7 @@ class XendVnet:
     def vnet_get(self, id):
         """Get a vnet.
 
-        @param id: vnet id
+        @param id vnet id
         """
         id = str(id)
         return self.vnet.get(id)
diff --git a/tools/python/xen/xend/scheduler.py b/tools/python/xen/xend/scheduler.py
index a99dc007b7..dc44765522 100644
--- a/tools/python/xen/xend/scheduler.py
+++ b/tools/python/xen/xend/scheduler.py
@@ -20,8 +20,8 @@ import threading
 def later(delay, fn, args=(), kwargs={}):
     """Schedule a function to be called later.
 
-    @param _delay: delay in seconds
-    @param _fn:    function
+    @param delay:  delay in seconds
+    @param fn:     function
     @param args:   arguments (list)
     @param kwargs  keyword arguments (map)
     """
@@ -32,7 +32,7 @@ def later(delay, fn, args=(), kwargs={}):
 def now(fn, args=(), kwargs={}):
     """Schedule a function to be called now.
 
-    @param _fn:    function
+    @param fn:     function
     @param args:   arguments (list)
     @param kwargs  keyword arguments (map)
     """
diff --git a/tools/python/xen/xend/server/controller.py b/tools/python/xen/xend/server/controller.py
index ab531789d8..5a4f67cd5a 100755
--- a/tools/python/xen/xend/server/controller.py
+++ b/tools/python/xen/xend/server/controller.py
@@ -63,6 +63,13 @@ def addDevControllerClass(name, cls):
     cls.type = name
     getDevControllerTable().addDevControllerClass(cls)
 
+
+def isDevControllerClass(name):
+    """@return True if a device controller class has been registered with
+    the controller table under the given name."""
+    return name in getDevControllerTable().controllerClasses
+
+
 def createDevController(name, vm, recreate=False):
     return getDevControllerTable().createDevController(name, vm, recreate=recreate)
 
diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c
index 50a774d296..079d988871 100644
--- a/tools/xenstore/xenstore_client.c
+++ b/tools/xenstore/xenstore_client.c
@@ -76,7 +76,7 @@ main(int argc, char **argv)
 	/* NOTREACHED */
     }
 #if defined(CLIENT_write)
-    if ((argc - optind) % 1) {
+    if ((argc - optind) % 2 == 1) {
 	usage(argv[0]);
 	/* NOTREACHED */
     }