[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools: drop libxen



commit 185bb58be30e5aeb690125f0320626797f9b14df
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Mar 27 11:01:50 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Apr 3 17:39:09 2014 +0100

    tools: drop libxen
    
    This was a C interface to a very early version of the XenAPI, it has not 
kept
    up with developments to the API e.g. in xapi.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 .gitignore                                         |    3 -
 .hgignore                                          |    3 -
 config/Tools.mk.in                                 |    1 -
 tools/Makefile                                     |    1 -
 tools/configure                                    |  120 --
 tools/configure.ac                                 |    5 -
 tools/libxen/COPYING                               |  510 ------
 tools/libxen/Makefile                              |   77 -
 tools/libxen/Makefile.dist                         |  115 --
 tools/libxen/README                                |   55 -
 tools/libxen/include/xen/api/xen_all.h             |   40 -
 tools/libxen/include/xen/api/xen_common.h          |  211 ---
 tools/libxen/include/xen/api/xen_console.h         |  247 ---
 tools/libxen/include/xen/api/xen_console_decl.h    |   30 -
 .../libxen/include/xen/api/xen_console_protocol.h  |   82 -
 tools/libxen/include/xen/api/xen_cpu_pool.h        |  424 -----
 tools/libxen/include/xen/api/xen_cpu_pool_decl.h   |   30 -
 tools/libxen/include/xen/api/xen_crashdump.h       |  199 ---
 tools/libxen/include/xen/api/xen_crashdump_decl.h  |   30 -
 tools/libxen/include/xen/api/xen_event.h           |  102 --
 tools/libxen/include/xen/api/xen_event_decl.h      |   25 -
 tools/libxen/include/xen/api/xen_event_operation.h |   82 -
 tools/libxen/include/xen/api/xen_host.h            |  505 ------
 tools/libxen/include/xen/api/xen_host_cpu.h        |  263 ---
 tools/libxen/include/xen/api/xen_host_cpu_decl.h   |   30 -
 tools/libxen/include/xen/api/xen_host_decl.h       |   30 -
 tools/libxen/include/xen/api/xen_host_metrics.h    |  199 ---
 .../libxen/include/xen/api/xen_host_metrics_decl.h |   30 -
 tools/libxen/include/xen/api/xen_int_float_map.h   |   53 -
 tools/libxen/include/xen/api/xen_int_int_map.h     |   53 -
 .../include/xen/api/xen_int_string_set_map.h       |   53 -
 tools/libxen/include/xen/api/xen_network.h         |  276 ---
 tools/libxen/include/xen/api/xen_network_decl.h    |   30 -
 .../include/xen/api/xen_on_crash_behaviour.h       |   97 -
 tools/libxen/include/xen/api/xen_on_normal_exit.h  |   77 -
 tools/libxen/include/xen/api/xen_pbd.h             |  223 ---
 tools/libxen/include/xen/api/xen_pbd_decl.h        |   30 -
 tools/libxen/include/xen/api/xen_pif.h             |  277 ---
 tools/libxen/include/xen/api/xen_pif_decl.h        |   30 -
 tools/libxen/include/xen/api/xen_pif_metrics.h     |  198 ---
 .../libxen/include/xen/api/xen_pif_metrics_decl.h  |   30 -
 tools/libxen/include/xen/api/xen_sr.h              |  277 ---
 tools/libxen/include/xen/api/xen_sr_decl.h         |   30 -
 tools/libxen/include/xen/api/xen_string_set.h      |   47 -
 .../libxen/include/xen/api/xen_string_string_map.h |   53 -
 tools/libxen/include/xen/api/xen_user.h            |  204 ---
 tools/libxen/include/xen/api/xen_user_decl.h       |   30 -
 tools/libxen/include/xen/api/xen_vbd.h             |  390 -----
 tools/libxen/include/xen/api/xen_vbd_decl.h        |   30 -
 tools/libxen/include/xen/api/xen_vbd_metrics.h     |  198 ---
 .../libxen/include/xen/api/xen_vbd_metrics_decl.h  |   30 -
 tools/libxen/include/xen/api/xen_vbd_mode.h        |   77 -
 tools/libxen/include/xen/api/xen_vbd_type.h        |   77 -
 tools/libxen/include/xen/api/xen_vdi.h             |  360 ----
 tools/libxen/include/xen/api/xen_vdi_decl.h        |   30 -
 tools/libxen/include/xen/api/xen_vdi_type.h        |   92 -
 tools/libxen/include/xen/api/xen_vif.h             |  379 ----
 tools/libxen/include/xen/api/xen_vif_decl.h        |   30 -
 tools/libxen/include/xen/api/xen_vif_metrics.h     |  198 ---
 .../libxen/include/xen/api/xen_vif_metrics_decl.h  |   30 -
 tools/libxen/include/xen/api/xen_vm.h              |  931 ----------
 tools/libxen/include/xen/api/xen_vm_decl.h         |   30 -
 .../libxen/include/xen/api/xen_vm_guest_metrics.h  |  234 ---
 .../include/xen/api/xen_vm_guest_metrics_decl.h    |   30 -
 tools/libxen/include/xen/api/xen_vm_metrics.h      |  251 ---
 tools/libxen/include/xen/api/xen_vm_metrics_decl.h |   30 -
 tools/libxen/include/xen/api/xen_vm_power_state.h  |   97 -
 tools/libxen/include/xen/api/xen_xspolicy.h        |  293 ----
 tools/libxen/include/xen/api/xen_xspolicy_decl.h   |   31 -
 .../libxen/include/xen_console_protocol_internal.h |   37 -
 .../libxen/include/xen_event_operation_internal.h  |   37 -
 tools/libxen/include/xen_internal.h                |  188 --
 .../include/xen_on_crash_behaviour_internal.h      |   38 -
 tools/libxen/include/xen_on_normal_exit_internal.h |   37 -
 tools/libxen/include/xen_vbd_mode_internal.h       |   37 -
 tools/libxen/include/xen_vbd_type_internal.h       |   37 -
 tools/libxen/include/xen_vdi_type_internal.h       |   37 -
 tools/libxen/include/xen_vm_power_state_internal.h |   37 -
 tools/libxen/src/xen_common.c                      | 1784 -------------------
 tools/libxen/src/xen_console.c                     |  298 ----
 tools/libxen/src/xen_console_protocol.c            |   82 -
 tools/libxen/src/xen_cpu_pool.c                    |  671 -------
 tools/libxen/src/xen_crashdump.c                   |  191 --
 tools/libxen/src/xen_event.c                       |  123 --
 tools/libxen/src/xen_event_operation.c             |   75 -
 tools/libxen/src/xen_host.c                        |  915 ----------
 tools/libxen/src/xen_host_cpu.c                    |  353 ----
 tools/libxen/src/xen_host_metrics.c                |  190 --
 tools/libxen/src/xen_int_float_map.c               |   39 -
 tools/libxen/src/xen_int_int_map.c                 |   39 -
 tools/libxen/src/xen_int_string_set_map.c          |   54 -
 tools/libxen/src/xen_network.c                     |  371 ----
 tools/libxen/src/xen_on_crash_behaviour.c          |   85 -
 tools/libxen/src/xen_on_normal_exit.c              |   81 -
 tools/libxen/src/xen_pbd.c                         |  249 ---
 tools/libxen/src/xen_pif.c                         |  380 ----
 tools/libxen/src/xen_pif_metrics.c                 |  190 --
 tools/libxen/src/xen_sr.c                          |  379 ----
 tools/libxen/src/xen_string_set.c                  |   48 -
 tools/libxen/src/xen_string_set.h                  |   47 -
 tools/libxen/src/xen_string_string_map.c           |   52 -
 tools/libxen/src/xen_user.c                        |  210 ---
 tools/libxen/src/xen_vbd.c                         |  626 -------
 tools/libxen/src/xen_vbd_metrics.c                 |  190 --
 tools/libxen/src/xen_vbd_mode.c                    |   81 -
 tools/libxen/src/xen_vbd_type.c                    |   81 -
 tools/libxen/src/xen_vdi.c                         |  575 ------
 tools/libxen/src/xen_vdi_type.c                    |   84 -
 tools/libxen/src/xen_vif.c                         |  616 -------
 tools/libxen/src/xen_vif_metrics.c                 |  190 --
 tools/libxen/src/xen_vm.c                          | 1837 --------------------
 tools/libxen/src/xen_vm_guest_metrics.c            |  279 ---
 tools/libxen/src/xen_vm_metrics.c                  |  318 ----
 tools/libxen/src/xen_vm_power_state.c              |   85 -
 tools/libxen/src/xen_xspolicy.c                    |  363 ----
 tools/libxen/test/test_bindings.c                  | 1453 ----------------
 tools/libxen/test/test_event_handling.c            |  210 ---
 117 files changed, 0 insertions(+), 23744 deletions(-)

diff --git a/.gitignore b/.gitignore
index af1d826..e8442c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,9 +198,6 @@ tools/hotplug/common/hotplugpath.sh
 tools/include/xen/*
 tools/include/xen-foreign/*.(c|h|size)
 tools/include/xen-foreign/checker
-tools/libxen/libxenapi-
-tools/libxen/test/test_bindings
-tools/libxen/test/test_event_handling
 tools/libxl/libxlu_cfg_y.output
 tools/libxl/xl
 tools/libxl/testenum
diff --git a/.hgignore b/.hgignore
index 6d09b09..da27f80 100644
--- a/.hgignore
+++ b/.hgignore
@@ -186,9 +186,6 @@
 ^tools/include/xen/.*$
 ^tools/include/xen-foreign/.*\.(c|h|size)$
 ^tools/include/xen-foreign/checker$
-^tools/libxen/libxenapi-
-^tools/libxen/test/test_bindings$
-^tools/libxen/test/test_event_handling$
 ^tools/libxl/_.*\.h$
 ^tools/libxl/_.*\.c$
 ^tools/libxl/libxlu_cfg_y\.output$
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 85379b2..0bdf37a 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -46,7 +46,6 @@ GIT_HTTP            := @githttp@
 
 # Optional components
 XENSTAT_XENTOP      := @monitors@
-LIBXENAPI_BINDINGS  := @xenapi@
 OCAML_TOOLS         := @ocamltools@
 FLASK_POLICY        := @xsmpolicy@
 CONFIG_OVMF         := @ovmf@
diff --git a/tools/Makefile b/tools/Makefile
index 00c69ee..c3cfb38 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -23,7 +23,6 @@ SUBDIRS-$(CONFIG_Linux) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += blktap2
 SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 SUBDIRS-y += libfsimage
-SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 SUBDIRS-$(CONFIG_Linux) += libvchan
 
 # do not recurse in to a dir we are about to delete
diff --git a/tools/configure b/tools/configure
index 7a44505..e1eeff4 100755
--- a/tools/configure
+++ b/tools/configure
@@ -694,7 +694,6 @@ rombios
 ovmf
 xsmpolicy
 ocamltools
-xenapi
 monitors
 githttp
 FILE_OFFSET_BITS
@@ -757,7 +756,6 @@ enable_option_checking
 enable_largefile
 enable_githttp
 enable_monitors
-enable_xenapi
 enable_ocamltools
 enable_xsmpolicy
 enable_ovmf
@@ -1418,7 +1416,6 @@ Optional Features:
                           DISABLED)
   --disable-monitors      Disable xenstat and xentop monitoring tools (default
                           is ENABLED)
-  --enable-xenapi         Enable Xen API Bindings (default is DISABLED)
   --disable-ocamltools    Disable Ocaml tools (default is ENABLED)
   --disable-xsmpolicy     Disable XSM policy compilation (default is ENABLED)
   --enable-ovmf           Enable OVMF (default is DISABLED)
@@ -3583,29 +3580,6 @@ monitors=$ax_cv_monitors
 
 
 
-# Check whether --enable-xenapi was given.
-if test "${enable_xenapi+set}" = set; then :
-  enableval=$enable_xenapi;
-fi
-
-
-if test "x$enable_xenapi" = "xno"; then :
-
-    ax_cv_xenapi="n"
-
-elif test "x$enable_xenapi" = "xyes"; then :
-
-    ax_cv_xenapi="y"
-
-elif test -z $ax_cv_xenapi; then :
-
-    ax_cv_xenapi="n"
-
-fi
-xenapi=$ax_cv_xenapi
-
-
-
 # Check whether --enable-ocamltools was given.
 if test "${enable_ocamltools+set}" = set; then :
   enableval=$enable_ocamltools;
@@ -4676,100 +4650,6 @@ if test x"${PERL}" = x"no"
 then
     as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5
 fi
-if test "x$xenapi" = "xy"; then :
-
-    # Extract the first word of "curl-config", so it can be a program name 
with args.
-set dummy curl-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_CURL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CURL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CURL="$CURL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_CURL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_CURL" && ac_cv_path_CURL="no"
-  ;;
-esac
-fi
-CURL=$ac_cv_path_CURL
-if test -n "$CURL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL" >&5
-$as_echo "$CURL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"${CURL}" = x"no"
-then
-    as_fn_error $? "Unable to find curl-config, please install curl-config" 
"$LINENO" 5
-fi
-    # Extract the first word of "xml2-config", so it can be a program name 
with args.
-set dummy xml2-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XML+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XML in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XML="$XML" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XML="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" 
>&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_XML" && ac_cv_path_XML="no"
-  ;;
-esac
-fi
-XML=$ac_cv_path_XML
-if test -n "$XML"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XML" >&5
-$as_echo "$XML" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test x"${XML}" = x"no"
-then
-    as_fn_error $? "Unable to find xml2-config, please install xml2-config" 
"$LINENO" 5
-fi
-
-fi
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
diff --git a/tools/configure.ac b/tools/configure.ac
index e1f7527..00fb47b 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -51,7 +51,6 @@ m4_include([../m4/ax_compare_version.m4])
 # Enable/disable options
 AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
 AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring 
tools])
-AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings])
 AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
 AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
 AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
@@ -150,10 +149,6 @@ AC_PROG_INSTALL
 AC_PATH_PROG([BISON], [bison])
 AC_PATH_PROG([FLEX], [flex])
 AX_PATH_PROG_OR_FAIL([PERL], [perl])
-AS_IF([test "x$xenapi" = "xy"], [
-    AX_PATH_PROG_OR_FAIL([CURL], [curl-config])
-    AX_PATH_PROG_OR_FAIL([XML], [xml2-config])
-])
 AS_IF([test "x$ocamltools" = "xy"], [
     AC_PROG_OCAML
     AC_PROG_FINDLIB
diff --git a/tools/libxen/COPYING b/tools/libxen/COPYING
deleted file mode 100644
index b124cf5..0000000
--- a/tools/libxen/COPYING
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-  Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
deleted file mode 100644
index 262412d..0000000
--- a/tools/libxen/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2006-2007, XenSource Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-#
-XEN_ROOT=$(CURDIR)/../..
-include $(XEN_ROOT)/tools/Rules.mk
-
-MAJOR = 1.0
-MINOR = 0
-
-CFLAGS += -Iinclude                     \
-          -fPIC
-
-ifeq ($(LIBXENAPI_BINDINGS),y)
-CFLAGS += $(shell $(XML2_CONFIG) --cflags) \
-          $(shell $(CURL_CONFIG) --cflags)
-
-LDFLAGS += $(shell $(XML2_CONFIG) --libs) \
-           $(shell $(CURL_CONFIG) --libs)
-endif
-
-LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h
-LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c))
-
-TEST_PROGRAMS = test/test_bindings test/test_event_handling
-
-.PHONY: all
-all: libxenapi.so libxenapi.a
-
-libxenapi.so: libxenapi.so.$(MAJOR)
-       ln -sf $< $@
-
-libxenapi.so.$(MAJOR): libxenapi.so.$(MAJOR).$(MINOR)
-       ln -sf $< $@
-
-libxenapi.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS)
-       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) 
$(SHLIB_LDFLAGS) -o $@ $^ $(APPEND_LDFLAGS)
-
-libxenapi.a: $(LIBXENAPI_OBJS)
-       $(AR) rcs libxenapi.a $^
-
-$(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
-       $(CC) $(LDFLAGS) -o $@ $< -L . -lxenapi $(APPEND_LDFLAGS)
-
-
-.PHONY: install
-install: all
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       ln -sf libxenapi.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
-       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
-       $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
-       set -e; for i in $(LIBXENAPI_HDRS); do \
-           $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
-       done
-
-
-.PHONY: clean
-clean:
-       rm -f `find -name *.o`
-       rm -f libxenapi.so*
-       rm -f libxenapi.a
-       rm -f $(TEST_PROGRAMS)
diff --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist
deleted file mode 100644
index 7088362..0000000
--- a/tools/libxen/Makefile.dist
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Copyright (c) 2006-2007, XenSource Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-#
-
-MAJOR = 1.0
-MINOR = 0
-
-CFLAGS = -Iinclude                     \
-         $(shell xml2-config --cflags) \
-         $(shell curl-config --cflags) \
-         -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
-
-LDFLAGS = $(shell xml2-config --libs) \
-          $(shell curl-config --libs)
-
-# -h for Solaris
-SONAME_LDFLAG ?= -soname
-# -R /usr/sfw/$(LIBDIR) -shared for Solaris
-SHLIB_LDFLAGS ?= -shared
-
-# ginstall for Solaris
-INSTALL      = install
-INSTALL_DIR  = $(INSTALL) -d -m0755 -p
-INSTALL_DATA = $(INSTALL) -m0644 -p
-
-LIBXENAPI_HDRS = $(wildcard include/*.h)
-LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c))
-
-TEST_PROGRAMS = test/test_bindings test/test_event_handling
-
-TARBALL_DEST = libxenapi-$(MAJOR).$(MINOR)
-
-.PHONY: all
-all: $(TEST_PROGRAMS)
-
-libxenapi.so: libxenapi.so.$(MAJOR)
-       ln -sf $< $@
-
-libxenapi.so.$(MAJOR): libxenapi.so.$(MAJOR).$(MINOR)
-       ln -sf $< $@
-
-libxenapi.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS)
-       $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) 
$(SHLIB_LDFLAGS) -o $@ $^
-
-libxenapi.a: $(LIBXENAPI_OBJS)
-       $(AR) rcs libxenapi.a $^
-
-$(TEST_PROGRAMS): test/%: test/%.o libxenapi.so
-       $(CC) $(LDFLAGS) -o $@ $< -L . -lxenapi
-
-
-.PHONY: install
-install: all
-       $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/api
-       $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
-       $(INSTALL_PROG) libxenapi.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
-       ln -sf libxenapi.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenapi.so.$(MAJOR)
-       ln -sf libxenapi.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenapi.so
-       $(INSTALL_DATA) libxenapi.a $(DESTDIR)$(LIBDIR)
-       set -e; for i in $(LIBXENAPI_HDRS); do \
-           $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEDIR)/xen/api; \
-       done
-
-
-.PHONY: tarball
-tarball: $(TARBALL_DEST).tar.bz2
-
-$(TARBALL_DEST).tar.bz2: all
-       rm -Rf $(TARBALL_DEST)
-       mkdir -p $(TARBALL_DEST)/include/xen/api
-       mkdir -p $(TARBALL_DEST)/src
-       mkdir -p $(TARBALL_DEST)/test
-       cp COPYING $(TARBALL_DEST)
-       cp Makefile.dist $(TARBALL_DEST)/Makefile
-       cp Makefile.dist $(TARBALL_DEST)/Makefile.dist
-       cp README $(TARBALL_DEST)
-       cp include/*.h $(TARBALL_DEST)/include
-       cp include/xen/api/*.h $(TARBALL_DEST)/include/xen/api
-       cp src/*.c $(TARBALL_DEST)/src
-       cp test/*.c $(TARBALL_DEST)/test
-       fakeroot chown root:root -R $(TARBALL_DEST)
-       fakeroot tar cjf $(TARBALL_DEST).tar.bz2 $(TARBALL_DEST)
-
-
-.PHONY: clean
-clean:
-       rm -f `find -name *.o`
-       rm -f libxenapi.so*
-       rm -f libxenapi.a
-       rm -f $(TEST_PROGRAMS)
-
-
-.PHONY: uberheader
-uberheader: include/xen/api/xen_all.h
-include/xen/api/xen_all.h::
-       echo "/* This file is autogenerated */" >$@
-       echo "#ifndef XEN_API_XEN_ALL_H" >>$@
-       echo "#define XEN_API_XEN_ALL_H" >>$@
-       ls include/xen/api/*.h | grep -v xen_all.h | grep -v _decl.h | \
-          sed 's,^include/\(.*\)$$,#include <\1>,g' >>$@
-       echo "#endif" >>$@
diff --git a/tools/libxen/README b/tools/libxen/README
deleted file mode 100644
index 2dd79f4..0000000
--- a/tools/libxen/README
+++ /dev/null
@@ -1,55 +0,0 @@
-Xen API C Bindings
-==================
-
-This distribution is the source code to the proposed Xen API C bindings.
-
-The Xen API project will define an XML-RPC protocol for remote and local
-management of Xen-based systems, and a set of bindings for these XML-RPC calls
-into a number of languages (this package contains those to the C language).
-
-The intention is to standardise these XML-RPC calls, and then the Xen project
-will guarantee that that wire protocol will be supported for the long term.
-The bindings will also be supported in the Xen tree, giving a stable
-foundation for Xen management tools and middlewares, in particular the Xen CIM
-providers and libvirt.
-
-THIS IS A WORK IN PROGRESS.  The API and bindings are under active design and
-development, and this is a snapshot release for developers only.  Both the API
-and the C bindings are scheduled to be stabilised by the Xen 3.0.4 release
-i.e. October 2006 at the earliest.
-
-These bindings are open-source (LGPL), and will be committed as libraries to
-the Xen trees for all to use after the Xen 3.0.3 release.
-
-We welcome any discussion about this library and the API in general.  Please
-join the Xen-API mailing list if you are interested in this project. I (Ewan
-Mellor) will collate all the feedback from that list and push out new versions
-of the document and the bindings as and when.
-
-
-URLs
-----
-
-Xen-API wiki page:
-http://wiki.xensource.com/xenwiki/XenApi
-
-Xen-API mailing list:
-  http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-api
-
-
-Usage
------
-
-The bindings depend upon libxml2, the XML toolkit from the GNOME project; the
-test program depends upon libcurl3 also.  On Debian, you need the packages
-libxml2-dev and libcurl3-dev.
-
-To compile, type make.  To compile the test also, type make
-test/test_bindings, remembering the additional dependency.
-
-To run the test, do
-
-LD_LIBRARY_PATH=. ./test/test_bindings <url> <username> <password>
-
-where <url> is the fragment of the server URL that follows the http://, for
-example "localhost:8005/RPC2".
diff --git a/tools/libxen/include/xen/api/xen_all.h 
b/tools/libxen/include/xen/api/xen_all.h
deleted file mode 100644
index 45ac171..0000000
--- a/tools/libxen/include/xen/api/xen_all.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This file is autogenerated */
-#ifndef XEN_API_XEN_ALL_H
-#define XEN_API_XEN_ALL_H
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_console.h>
-#include <xen/api/xen_console_protocol.h>
-#include <xen/api/xen_crashdump.h>
-#include <xen/api/xen_event.h>
-#include <xen/api/xen_event_operation.h>
-#include <xen/api/xen_host_cpu.h>
-#include <xen/api/xen_host.h>
-#include <xen/api/xen_host_metrics.h>
-#include <xen/api/xen_int_float_map.h>
-#include <xen/api/xen_int_int_map.h>
-#include <xen/api/xen_int_string_set_map.h>
-#include <xen/api/xen_network.h>
-#include <xen/api/xen_on_crash_behaviour.h>
-#include <xen/api/xen_on_normal_exit.h>
-#include <xen/api/xen_pbd.h>
-#include <xen/api/xen_pif.h>
-#include <xen/api/xen_pif_metrics.h>
-#include <xen/api/xen_sr.h>
-#include <xen/api/xen_string_set.h>
-#include <xen/api/xen_string_string_map.h>
-#include <xen/api/xen_user.h>
-#include <xen/api/xen_vbd.h>
-#include <xen/api/xen_vbd_metrics.h>
-#include <xen/api/xen_vbd_mode.h>
-#include <xen/api/xen_vbd_type.h>
-#include <xen/api/xen_vdi.h>
-#include <xen/api/xen_vdi_type.h>
-#include <xen/api/xen_vif.h>
-#include <xen/api/xen_vif_metrics.h>
-#include <xen/api/xen_vm_guest_metrics.h>
-#include <xen/api/xen_vm.h>
-#include <xen/api/xen_vm_metrics.h>
-#include <xen/api/xen_vm_power_state.h>
-#include <xen/api/xen_xspolicy.h>
-#include <xen/api/xen_cpu_pool.h>
-#endif
diff --git a/tools/libxen/include/xen/api/xen_common.h 
b/tools/libxen/include/xen/api/xen_common.h
deleted file mode 100644
index ebcebd9..0000000
--- a/tools/libxen/include/xen/api/xen_common.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2006 XenSource, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_COMMON_H
-#define XEN_COMMON_H
-
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <time.h>
-
-#include "xen/api/xen_host_decl.h"
-
-
-typedef bool (*xen_result_func)(const void *data, size_t len,
-                                void *result_handle);
-
-
-/**
- * len does not include a terminating \0.
- */
-typedef int (*xen_call_func)(const void *, size_t len, void *user_handle,
-                             void *result_handle,
-                             xen_result_func result_func);
-
-
-typedef struct
-{
-    xen_call_func call_func;
-    void *handle;
-    const char *session_id;
-    bool ok;
-    char **error_description;
-    int error_description_count;
-} xen_session;
-
-
-typedef struct xen_session_record
-{
-    char *uuid;
-    struct xen_host_record_opt *this_host;
-    char *this_user;
-    time_t last_active;
-} xen_session_record;
-
-
-/**
- * Allocate a xen_session_record.
- */
-extern xen_session_record *
-xen_session_record_alloc(void);
-
-
-/**
- * Free the given xen_session_record, and all referenced values.  The
- * given record must have been allocated by this library.
- */
-extern void
-xen_session_record_free(xen_session_record *record);
-
-
-struct xen_task_;
-typedef struct xen_task_ * xen_task_id;
-
-
-typedef struct
-{
-    int progress;
-    long eta;
-    /* !!! RESULT */
-}  xen_task_status;
-
-
-typedef struct
-{
-    int major;
-    int minor;
-    int patch;
-    char *extraversion;
-} xen_version;
-
-
-/**
- * Free the given xen_version, and all referenced values.
- */
-extern void xen_version_free(xen_version *version);
-
-
-/**
- * Return the version of this client-side library.  This will be the major,
- * minor, and extraversion of the Xen release with which it was released,
- * plus the library's own version as the patch.
- */
-extern xen_version *xen_get_client_side_version(void);
-
-
-extern bool
-xen_uuid_string_to_bytes(char *uuid, char **bytes);
-
-
-extern bool
-xen_uuid_bytes_to_string(char *bytes, char **uuid);
-
-
-extern void
-xen_uuid_free(char *uuid);
-
-
-extern void
-xen_uuid_bytes_free(char *bytes);
-
-
-/**
- * Initialise this library.  Call this before starting to use this library.
- * Note that since this library depends upon libxml2, you should also call
- * xmlInitParser as appropriate for your program.
- */
-extern
-void xen_init(void);
-
-
-/**
- * Clear up this library.  Call when you have finished using this library.
- * Note that since this library depends upon libxml2, you should also call
- * xmlCleanupParser as appropriate for your program.
- */
-extern
-void xen_fini(void);
-
-
-/**
- * Log in at the server, and allocate a xen_session to represent this session.
- */
-extern xen_session *
-xen_session_login_with_password(xen_call_func call_func, void *handle,
-                                const char *uname, const char *pwd);
-
-
-/**
- * Log out at the server, and free the xen_session.
- */
-extern void
-xen_session_logout(xen_session *session);
-
-
-/**
- * Clear any error condition recorded on this session.
- */
-void
-xen_session_clear_error(xen_session *session);
-
-
-/**
- * Get the UUID of the second given session.  Set *result to point at a
- * string, yours to free.
- */
-extern bool
-xen_session_get_uuid(xen_session *session, char **result,
-                     xen_session *self_session);
-
-
-/**
- * Get the this_host field of the second given session.  Set *result to be a
- * handle to that host.
- */
-extern bool
-xen_session_get_this_host(xen_session *session, xen_host *result,
-                          xen_session *self_session);
-
-
-/**
- * Get the this_user field of the second given session.  Set *result to point
- * at a string, yours to free.
- */
-extern bool
-xen_session_get_this_user(xen_session *session, char **result,
-                          xen_session *self_session);
-
-
-/**
- * Get the last_active field of the given session, and place it in *result.
- */
-extern bool
-xen_session_get_last_active(xen_session *session, time_t *result,
-                            xen_session *self_session);
-
-/**
- * Get a record containing the current state of the second given session.
- */
-extern bool
-xen_session_get_record(xen_session *session, xen_session_record **result,
-                       xen_session *self_session);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_console.h 
b/tools/libxen/include/xen/api/xen_console.h
deleted file mode 100644
index 19bfdeb..0000000
--- a/tools/libxen/include/xen/api/xen_console.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CONSOLE_H
-#define XEN_CONSOLE_H
-
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_console_decl.h>
-#include <xen/api/xen_console_protocol.h>
-#include <xen/api/xen_string_string_map.h>
-#include <xen/api/xen_vm_decl.h>
-
-
-/*
- * The console class.
- * 
- * A console.
- */
-
-
-/**
- * Free the given xen_console.  The given handle must have been
- * allocated by this library.
- */
-extern void
-xen_console_free(xen_console console);
-
-
-typedef struct xen_console_set
-{
-    size_t size;
-    xen_console *contents[];
-} xen_console_set;
-
-/**
- * Allocate a xen_console_set of the given size.
- */
-extern xen_console_set *
-xen_console_set_alloc(size_t size);
-
-/**
- * Free the given xen_console_set.  The given set must have been
- * allocated by this library.
- */
-extern void
-xen_console_set_free(xen_console_set *set);
-
-
-typedef struct xen_console_record
-{
-    xen_console handle;
-    char *uuid;
-    enum xen_console_protocol protocol;
-    char *location;
-    struct xen_vm_record_opt *vm;
-    xen_string_string_map *other_config;
-} xen_console_record;
-
-/**
- * Allocate a xen_console_record.
- */
-extern xen_console_record *
-xen_console_record_alloc(void);
-
-/**
- * Free the given xen_console_record, and all referenced values.  The
- * given record must have been allocated by this library.
- */
-extern void
-xen_console_record_free(xen_console_record *record);
-
-
-typedef struct xen_console_record_opt
-{
-    bool is_record;
-    union
-    {
-        xen_console handle;
-        xen_console_record *record;
-    } u;
-} xen_console_record_opt;
-
-/**
- * Allocate a xen_console_record_opt.
- */
-extern xen_console_record_opt *
-xen_console_record_opt_alloc(void);
-
-/**
- * Free the given xen_console_record_opt, and all referenced values. 
- * The given record_opt must have been allocated by this library.
- */
-extern void
-xen_console_record_opt_free(xen_console_record_opt *record_opt);
-
-
-typedef struct xen_console_record_set
-{
-    size_t size;
-    xen_console_record *contents[];
-} xen_console_record_set;
-
-/**
- * Allocate a xen_console_record_set of the given size.
- */
-extern xen_console_record_set *
-xen_console_record_set_alloc(size_t size);
-
-/**
- * Free the given xen_console_record_set, and all referenced values. 
- * The given set must have been allocated by this library.
- */
-extern void
-xen_console_record_set_free(xen_console_record_set *set);
-
-
-
-typedef struct xen_console_record_opt_set
-{
-    size_t size;
-    xen_console_record_opt *contents[];
-} xen_console_record_opt_set;
-
-/**
- * Allocate a xen_console_record_opt_set of the given size.
- */
-extern xen_console_record_opt_set *
-xen_console_record_opt_set_alloc(size_t size);
-
-/**
- * Free the given xen_console_record_opt_set, and all referenced
- * values.  The given set must have been allocated by this library.
- */
-extern void
-xen_console_record_opt_set_free(xen_console_record_opt_set *set);
-
-
-/**
- * Get a record containing the current state of the given console.
- */
-extern bool
-xen_console_get_record(xen_session *session, xen_console_record **result, 
xen_console console);
-
-
-/**
- * Get a reference to the console instance with the specified UUID.
- */
-extern bool
-xen_console_get_by_uuid(xen_session *session, xen_console *result, char *uuid);
-
-
-/**
- * Create a new console instance, and return its handle.
- */
-extern bool
-xen_console_create(xen_session *session, xen_console *result, 
xen_console_record *record);
-
-
-/**
- * Destroy the specified console instance.
- */
-extern bool
-xen_console_destroy(xen_session *session, xen_console console);
-
-
-/**
- * Get the uuid field of the given console.
- */
-extern bool
-xen_console_get_uuid(xen_session *session, char **result, xen_console console);
-
-
-/**
- * Get the protocol field of the given console.
- */
-extern bool
-xen_console_get_protocol(xen_session *session, enum xen_console_protocol 
*result, xen_console console);
-
-
-/**
- * Get the location field of the given console.
- */
-extern bool
-xen_console_get_location(xen_session *session, char **result, xen_console 
console);
-
-
-/**
- * Get the VM field of the given console.
- */
-extern bool
-xen_console_get_vm(xen_session *session, xen_vm *result, xen_console console);
-
-
-/**
- * Get the other_config field of the given console.
- */
-extern bool
-xen_console_get_other_config(xen_session *session, xen_string_string_map 
**result, xen_console console);
-
-
-/**
- * Set the other_config field of the given console.
- */
-extern bool
-xen_console_set_other_config(xen_session *session, xen_console console, 
xen_string_string_map *other_config);
-
-
-/**
- * Add the given key-value pair to the other_config field of the given
- * console.
- */
-extern bool
-xen_console_add_to_other_config(xen_session *session, xen_console console, 
char *key, char *value);
-
-
-/**
- * Remove the given key and its corresponding value from the
- * other_config field of the given console.  If the key is not in that Map,
- * then do nothing.
- */
-extern bool
-xen_console_remove_from_other_config(xen_session *session, xen_console 
console, char *key);
-
-
-/**
- * Return a list of all the consoles known to the system.
- */
-extern bool
-xen_console_get_all(xen_session *session, struct xen_console_set **result);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_console_decl.h 
b/tools/libxen/include/xen/api/xen_console_decl.h
deleted file mode 100644
index 432ff76..0000000
--- a/tools/libxen/include/xen/api/xen_console_decl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CONSOLE_DECL_H
-#define XEN_CONSOLE_DECL_H
-
-typedef void *xen_console;
-
-struct xen_console_set;
-struct xen_console_record;
-struct xen_console_record_set;
-struct xen_console_record_opt;
-struct xen_console_record_opt_set;
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_console_protocol.h 
b/tools/libxen/include/xen/api/xen_console_protocol.h
deleted file mode 100644
index 413ad7a..0000000
--- a/tools/libxen/include/xen/api/xen_console_protocol.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CONSOLE_PROTOCOL_H
-#define XEN_CONSOLE_PROTOCOL_H
-
-
-#include <xen/api/xen_common.h>
-
-
-enum xen_console_protocol
-{
-    /**
-     * VT100 terminal
-     */
-    XEN_CONSOLE_PROTOCOL_VT100,
-
-    /**
-     * Remote FrameBuffer protocol (as used in VNC)
-     */
-    XEN_CONSOLE_PROTOCOL_RFB,
-
-    /**
-     * Remote Desktop Protocol
-     */
-    XEN_CONSOLE_PROTOCOL_RDP
-};
-
-
-typedef struct xen_console_protocol_set
-{
-    size_t size;
-    enum xen_console_protocol contents[];
-} xen_console_protocol_set;
-
-/**
- * Allocate a xen_console_protocol_set of the given size.
- */
-extern xen_console_protocol_set *
-xen_console_protocol_set_alloc(size_t size);
-
-/**
- * Free the given xen_console_protocol_set.  The given set must have
- * been allocated by this library.
- */
-extern void
-xen_console_protocol_set_free(xen_console_protocol_set *set);
-
-
-/**
- * Return the name corresponding to the given code.  This string must
- * not be modified or freed.
- */
-extern const char *
-xen_console_protocol_to_string(enum xen_console_protocol val);
-
-
-/**
- * Return the correct code for the given string, or set the session
- * object to failure and return an undefined value if the given string does
- * not match a known code.
- */
-extern enum xen_console_protocol
-xen_console_protocol_from_string(xen_session *session, const char *str);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_cpu_pool.h 
b/tools/libxen/include/xen/api/xen_cpu_pool.h
deleted file mode 100644
index 423c076..0000000
--- a/tools/libxen/include/xen/api/xen_cpu_pool.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CPU_POOL_H
-#define XEN_CPU_POOL_H
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_string_set.h>
-#include <xen/api/xen_string_string_map.h>
-#include <xen/api/xen_host_cpu_decl.h>
-#include <xen/api/xen_host.h>
-#include <xen/api/xen_vm_decl.h>
-#include <xen/api/xen_vm.h>
-#include <xen/api/xen_cpu_pool_decl.h>
-
-/*
- * The cpu_pool class.
- *
- * Management of CPU pools.
- */
-
-
-/**
- * Free the given xen_cpu_pool.  The given handle must have been allocated
- * by this library.
- */
-extern void
-xen_cpu_pool_free(xen_cpu_pool cpu_pool);
-
-
-typedef struct xen_cpu_pool_set
-{
-    size_t size;
-    xen_cpu_pool *contents[];
-} xen_cpu_pool_set;
-
-/**
- * Allocate a xen_cpu_pool_set of the given size.
- */
-extern xen_cpu_pool_set *
-xen_cpu_pool_set_alloc(size_t size);
-
-/**
- * Free the given xen_cpu_pool_set.  The given set must have been allocated
- * by this library.
- */
-extern void
-xen_cpu_pool_set_free(xen_cpu_pool_set *set);
-
-
-typedef struct xen_cpu_pool_record
-{
-    xen_cpu_pool handle;
-    char *uuid;
-    char *name_label;
-    char *name_description;
-    struct xen_host_record_opt *resident_on;
-    bool auto_power_on;
-    struct xen_vm_record_opt_set *started_vms;
-    int64_t ncpu;
-    char *sched_policy;
-    struct xen_string_set *proposed_cpus;
-    struct xen_host_cpu_record_opt_set *host_cpus;
-    bool activated;
-    xen_string_string_map *other_config;
-} xen_cpu_pool_record;
-
-/**
- * Allocate a xen_cpu_pool_record.
- */
-extern xen_cpu_pool_record *
-xen_cpu_pool_record_alloc(void);
-
-/**
- * Free the given xen_cpu_pool_record, and all referenced values.  The given
- * record must have been allocated by this library.
- */
-extern void
-xen_cpu_pool_record_free(xen_cpu_pool_record *record);
-
-
-typedef struct xen_cpu_pool_record_opt
-{
-    bool is_record;
-    union
-    {
-        xen_cpu_pool handle;
-        xen_cpu_pool_record *record;
-    } u;
-} xen_cpu_pool_record_opt;
-
-/**
- * Allocate a xen_cpu_pool_record_opt.
- */
-extern xen_cpu_pool_record_opt *
-xen_cpu_pool_record_opt_alloc(void);
-
-/**
- * Free the given xen_cpu_pool_record_opt, and all referenced values.  The
- * given record_opt must have been allocated by this library.
- */
-extern void
-xen_cpu_pool_record_opt_free(xen_cpu_pool_record_opt *record_opt);
-
-
-typedef struct xen_cpu_pool_record_set
-{
-    size_t size;
-    xen_cpu_pool_record *contents[];
-} xen_cpu_pool_record_set;
-
-/**
- * Allocate a xen_cpu_pool_record_set of the given size.
- */
-extern xen_cpu_pool_record_set *
-xen_cpu_pool_record_set_alloc(size_t size);
-
-/**
- * Free the given xen_cpu_pool_record_set, and all referenced values.  The
- * given set must have been allocated by this library.
- */
-extern void
-xen_cpu_pool_record_set_free(xen_cpu_pool_record_set *set);
-
-
-
-typedef struct xen_cpu_pool_record_opt_set
-{
-    size_t size;
-    xen_cpu_pool_record_opt *contents[];
-} xen_cpu_pool_record_opt_set;
-
-/**
- * Allocate a xen_cpu_pool_record_opt_set of the given size.
- */
-extern xen_cpu_pool_record_opt_set *
-xen_cpu_pool_record_opt_set_alloc(size_t size);
-
-/**
- * Free the given xen_cpu_pool_record_opt_set, and all referenced values.
- * The given set must have been allocated by this library.
- */
-extern void
-xen_cpu_pool_record_opt_set_free(xen_cpu_pool_record_opt_set *set);
-
-
-/**
- * Get a record containing the current state of the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_record(xen_session *session, xen_cpu_pool_record **result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get a reference to the cpu_pool instance with the specified UUID.
- */
-extern bool
-xen_cpu_pool_get_by_uuid(xen_session *session, xen_cpu_pool *result, char 
*uuid);
-
-
-/**
- * Create a new cpu_pool instance, and return its handle.
- */
-extern bool
-xen_cpu_pool_create(xen_session *session, xen_cpu_pool *result,
-    xen_cpu_pool_record *record);
-
-
-/**
- * Destroy the specified VBD instance.
- */
-extern bool
-xen_cpu_pool_destroy(xen_session *session, xen_cpu_pool cpu_pool);
-
-
-/**
- * Get the uuid field of the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_uuid(xen_session *session, char **result, xen_cpu_pool 
cpu_pool);
-
-
-/**
- * Deactivate the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_deactivate(xen_session *session, xen_cpu_pool cpu_pool);
-
-
-/**
- * Activate the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_activate(xen_session *session, xen_cpu_pool cpu_pool);
-
-
-/**
- * Add a physical cpu to the active pool.
- */
-extern bool
-xen_cpu_pool_add_host_CPU_live(xen_session *session, xen_cpu_pool cpu_pool,
-    xen_host_cpu host_cpu);
-
-
-/**
- * Remove a physical cpu from the active pool.
- */
-extern bool
-xen_cpu_pool_remove_host_CPU_live(xen_session *session, xen_cpu_pool cpu_pool,
-    xen_host_cpu host_cpu);
-
-
-/**
- * Return a list of all the cpu_pools known to the system.
- */
-extern bool
-xen_cpu_pool_get_all(xen_session *session, struct xen_cpu_pool_set **result);
-
-
-/**
- * Get the uuid field of the cpu_pool with given name.
- */
-extern bool
-xen_cpu_pool_get_by_name_label(xen_session *session,
-    struct xen_cpu_pool_set **result, char *label);
-
-
-/**
- * Get activation state of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_activated(xen_session *session, bool *result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get auto_power_on option of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_auto_power_on(xen_session *session, bool *result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get host_cpu refs of all physical cpus of cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_host_CPUs(xen_session *session, struct xen_host_cpu_set 
**result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get name description field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_name_description(xen_session *session, char **result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get name label field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_name_label(xen_session *session, char **result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get count of physical cpus to attach to cpu_pool on activation.
- */
-extern bool
-xen_cpu_pool_get_ncpu(xen_session *session, int64_t *result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get proposed_CPUs field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_proposed_CPUs(xen_session *session, struct xen_string_set 
**result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get the other_config field of the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_other_config(xen_session *session, xen_string_string_map 
**result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get host the cpu_pool is resident on.
- */
-extern bool
-xen_cpu_pool_get_resident_on(xen_session *session, xen_host *result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get sched_policy field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_sched_policy(xen_session *session, char **result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- * Get set of started vms in given cpu_pool.
- */
-extern bool
-xen_cpu_pool_get_started_VMs(xen_session *session, xen_vm_set **result,
-    xen_cpu_pool cpu_pool);
-
-
-/**
- *  Set auto_power_on field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_auto_power_on(xen_session *session, xen_cpu_pool cpu_pool,
-    bool auto_power_on);
-
-
-/**
- * Set proposed_CPUs field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_proposed_CPUs(xen_session *session, xen_cpu_pool cpu_pool,
-    xen_string_set *proposed_cpus);
-
-
-/**
- * Add a proposed cpu to proposed_CPUs field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_add_to_proposed_CPUs(xen_session *session, xen_cpu_pool cpu_pool,
-    char* proposed_cpu);
-
-
-/**
- * Remove a proposed cpu from proposed_CPUs field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_remove_from_proposed_CPUs(xen_session *session, xen_cpu_pool 
cpu_pool,
-    char* proposed_cpu);
-
-
-/**
- * Set name_label field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_name_label(xen_session *session, xen_cpu_pool cpu_pool,
-    char *label);
-
-
-/**
- * Set name_description field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_name_description(xen_session *session, xen_cpu_pool cpu_pool,
-    char *descr);
-
-
-/**
- * Set ncpu field of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_ncpu(xen_session *session, xen_cpu_pool cpu_pool, int64_t 
ncpu);
-
-
-/**
- * Set the other_config field of the given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_other_config(xen_session *session, xen_cpu_pool cpu_pool,
-    xen_string_string_map *other_config);
-
-
-/**
- * Add the given key-value pair to the other_config field of the given
- * cpu_pool.
- */
-extern bool
-xen_cpu_pool_add_to_other_config(xen_session *session, xen_cpu_pool cpu_pool,
-    char *key, char *value);
-
-
-/**
- * Remove the given key and its corresponding value from the
- * other_config field of the given cpu_pool. If the key is not in that Map, 
then
- * do nothing.
- */
-extern bool
-xen_cpu_pool_remove_from_other_config(xen_session *session, xen_cpu_pool 
cpu_pool,
-    char *key);
-
-/**
- * Set sched_policy of given cpu_pool.
- */
-extern bool
-xen_cpu_pool_set_sched_policy(xen_session *session, xen_cpu_pool cpu_pool,
-    char *sched_policy);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_cpu_pool_decl.h 
b/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
deleted file mode 100644
index 62878dd..0000000
--- a/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CPU_POOL_DECL_H
-#define XEN_CPU_POOL_DECL_H
-
-typedef void *xen_cpu_pool;
-
-struct xen_cpu_pool_set;
-struct xen_cpu_pool_record;
-struct xen_cpu_pool_record_set;
-struct xen_cpu_pool_record_opt;
-struct xen_cpu_pool_record_opt_set;
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_crashdump.h 
b/tools/libxen/include/xen/api/xen_crashdump.h
deleted file mode 100644
index 145e041..0000000
--- a/tools/libxen/include/xen/api/xen_crashdump.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CRASHDUMP_H
-#define XEN_CRASHDUMP_H
-
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_crashdump_decl.h>
-#include <xen/api/xen_vdi_decl.h>
-#include <xen/api/xen_vm_decl.h>
-
-
-/*
- * The crashdump class.
- * 
- * A VM crashdump.
- */
-
-
-/**
- * Free the given xen_crashdump.  The given handle must have been
- * allocated by this library.
- */
-extern void
-xen_crashdump_free(xen_crashdump crashdump);
-
-
-typedef struct xen_crashdump_set
-{
-    size_t size;
-    xen_crashdump *contents[];
-} xen_crashdump_set;
-
-/**
- * Allocate a xen_crashdump_set of the given size.
- */
-extern xen_crashdump_set *
-xen_crashdump_set_alloc(size_t size);
-
-/**
- * Free the given xen_crashdump_set.  The given set must have been
- * allocated by this library.
- */
-extern void
-xen_crashdump_set_free(xen_crashdump_set *set);
-
-
-typedef struct xen_crashdump_record
-{
-    xen_crashdump handle;
-    char *uuid;
-    struct xen_vm_record_opt *vm;
-    struct xen_vdi_record_opt *vdi;
-} xen_crashdump_record;
-
-/**
- * Allocate a xen_crashdump_record.
- */
-extern xen_crashdump_record *
-xen_crashdump_record_alloc(void);
-
-/**
- * Free the given xen_crashdump_record, and all referenced values.  The
- * given record must have been allocated by this library.
- */
-extern void
-xen_crashdump_record_free(xen_crashdump_record *record);
-
-
-typedef struct xen_crashdump_record_opt
-{
-    bool is_record;
-    union
-    {
-        xen_crashdump handle;
-        xen_crashdump_record *record;
-    } u;
-} xen_crashdump_record_opt;
-
-/**
- * Allocate a xen_crashdump_record_opt.
- */
-extern xen_crashdump_record_opt *
-xen_crashdump_record_opt_alloc(void);
-
-/**
- * Free the given xen_crashdump_record_opt, and all referenced values. 
- * The given record_opt must have been allocated by this library.
- */
-extern void
-xen_crashdump_record_opt_free(xen_crashdump_record_opt *record_opt);
-
-
-typedef struct xen_crashdump_record_set
-{
-    size_t size;
-    xen_crashdump_record *contents[];
-} xen_crashdump_record_set;
-
-/**
- * Allocate a xen_crashdump_record_set of the given size.
- */
-extern xen_crashdump_record_set *
-xen_crashdump_record_set_alloc(size_t size);
-
-/**
- * Free the given xen_crashdump_record_set, and all referenced values. 
- * The given set must have been allocated by this library.
- */
-extern void
-xen_crashdump_record_set_free(xen_crashdump_record_set *set);
-
-
-
-typedef struct xen_crashdump_record_opt_set
-{
-    size_t size;
-    xen_crashdump_record_opt *contents[];
-} xen_crashdump_record_opt_set;
-
-/**
- * Allocate a xen_crashdump_record_opt_set of the given size.
- */
-extern xen_crashdump_record_opt_set *
-xen_crashdump_record_opt_set_alloc(size_t size);
-
-/**
- * Free the given xen_crashdump_record_opt_set, and all referenced
- * values.  The given set must have been allocated by this library.
- */
-extern void
-xen_crashdump_record_opt_set_free(xen_crashdump_record_opt_set *set);
-
-
-/**
- * Get a record containing the current state of the given crashdump.
- */
-extern bool
-xen_crashdump_get_record(xen_session *session, xen_crashdump_record **result, 
xen_crashdump crashdump);
-
-
-/**
- * Get a reference to the crashdump instance with the specified UUID.
- */
-extern bool
-xen_crashdump_get_by_uuid(xen_session *session, xen_crashdump *result, char 
*uuid);
-
-
-/**
- * Get the uuid field of the given crashdump.
- */
-extern bool
-xen_crashdump_get_uuid(xen_session *session, char **result, xen_crashdump 
crashdump);
-
-
-/**
- * Get the VM field of the given crashdump.
- */
-extern bool
-xen_crashdump_get_vm(xen_session *session, xen_vm *result, xen_crashdump 
crashdump);
-
-
-/**
- * Get the VDI field of the given crashdump.
- */
-extern bool
-xen_crashdump_get_vdi(xen_session *session, xen_vdi *result, xen_crashdump 
crashdump);
-
-
-/**
- * Destroy the specified crashdump.
- */
-extern bool
-xen_crashdump_destroy(xen_session *session, xen_crashdump self);
-
-
-/**
- * Return a list of all the crashdumps known to the system.
- */
-extern bool
-xen_crashdump_get_all(xen_session *session, struct xen_crashdump_set **result);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_crashdump_decl.h 
b/tools/libxen/include/xen/api/xen_crashdump_decl.h
deleted file mode 100644
index 4eb6d54..0000000
--- a/tools/libxen/include/xen/api/xen_crashdump_decl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_CRASHDUMP_DECL_H
-#define XEN_CRASHDUMP_DECL_H
-
-typedef void *xen_crashdump;
-
-struct xen_crashdump_set;
-struct xen_crashdump_record;
-struct xen_crashdump_record_set;
-struct xen_crashdump_record_opt;
-struct xen_crashdump_record_opt_set;
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_event.h 
b/tools/libxen/include/xen/api/xen_event.h
deleted file mode 100644
index 6a2845b..0000000
--- a/tools/libxen/include/xen/api/xen_event.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_EVENT_H
-#define XEN_EVENT_H
-
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_event_decl.h>
-#include <xen/api/xen_event_operation.h>
-#include <xen/api/xen_string_set.h>
-
-
-/*
- * The event class.
- * 
- * Asynchronous event registration and handling.
- */
-
-
-
-typedef struct xen_event_record
-{
-    int64_t id;
-    time_t timestamp;
-    char *class;
-    enum xen_event_operation operation;
-    char *ref;
-    char *obj_uuid;
-} xen_event_record;
-
-/**
- * Allocate a xen_event_record.
- */
-extern xen_event_record *
-xen_event_record_alloc(void);
-
-/**
- * Free the given xen_event_record, and all referenced values.  The
- * given record must have been allocated by this library.
- */
-extern void
-xen_event_record_free(xen_event_record *record);
-
-
-typedef struct xen_event_record_set
-{
-    size_t size;
-    xen_event_record *contents[];
-} xen_event_record_set;
-
-/**
- * Allocate a xen_event_record_set of the given size.
- */
-extern xen_event_record_set *
-xen_event_record_set_alloc(size_t size);
-
-/**
- * Free the given xen_event_record_set, and all referenced values.  The
- * given set must have been allocated by this library.
- */
-extern void
-xen_event_record_set_free(xen_event_record_set *set);
-
-
-/**
- * Registers this session with the event system.  Specifying the empty
- * list will register for all classes.
- */
-extern bool
-xen_event_register(xen_session *session, struct xen_string_set *classes);
-
-
-/**
- * Unregisters this session with the event system.
- */
-extern bool
-xen_event_unregister(xen_session *session, struct xen_string_set *classes);
-
-
-/**
- * Blocking call which returns a (possibly empty) batch of events.
- */
-extern bool
-xen_event_next(xen_session *session, struct xen_event_record_set **result);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_event_decl.h 
b/tools/libxen/include/xen/api/xen_event_decl.h
deleted file mode 100644
index 856991f..0000000
--- a/tools/libxen/include/xen/api/xen_event_decl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_EVENT_DECL_H
-#define XEN_EVENT_DECL_H
-
-struct xen_event_record;
-struct xen_event_record_set;
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_event_operation.h 
b/tools/libxen/include/xen/api/xen_event_operation.h
deleted file mode 100644
index 31cce20..0000000
--- a/tools/libxen/include/xen/api/xen_event_operation.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_EVENT_OPERATION_H
-#define XEN_EVENT_OPERATION_H
-
-
-#include <xen/api/xen_common.h>
-
-
-enum xen_event_operation
-{
-    /**
-     * An object has been created
-     */
-    XEN_EVENT_OPERATION_ADD,
-
-    /**
-     * An object has been deleted
-     */
-    XEN_EVENT_OPERATION_DEL,
-
-    /**
-     * An object has been modified
-     */
-    XEN_EVENT_OPERATION_MOD
-};
-
-
-typedef struct xen_event_operation_set
-{
-    size_t size;
-    enum xen_event_operation contents[];
-} xen_event_operation_set;
-
-/**
- * Allocate a xen_event_operation_set of the given size.
- */
-extern xen_event_operation_set *
-xen_event_operation_set_alloc(size_t size);
-
-/**
- * Free the given xen_event_operation_set.  The given set must have
- * been allocated by this library.
- */
-extern void
-xen_event_operation_set_free(xen_event_operation_set *set);
-
-
-/**
- * Return the name corresponding to the given code.  This string must
- * not be modified or freed.
- */
-extern const char *
-xen_event_operation_to_string(enum xen_event_operation val);
-
-
-/**
- * Return the correct code for the given string, or set the session
- * object to failure and return an undefined value if the given string does
- * not match a known code.
- */
-extern enum xen_event_operation
-xen_event_operation_from_string(xen_session *session, const char *str);
-
-
-#endif
diff --git a/tools/libxen/include/xen/api/xen_host.h 
b/tools/libxen/include/xen/api/xen_host.h
deleted file mode 100644
index f3ca5b9..0000000
--- a/tools/libxen/include/xen/api/xen_host.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright (c) 2006-2007, XenSource Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-
-#ifndef XEN_HOST_H
-#define XEN_HOST_H
-
-#include <xen/api/xen_common.h>
-#include <xen/api/xen_host_cpu_decl.h>
-#include <xen/api/xen_host_decl.h>
-#include <xen/api/xen_host_metrics_decl.h>
-#include <xen/api/xen_pbd_decl.h>
-#include <xen/api/xen_pif_decl.h>
-#include <xen/api/xen_sr_decl.h>
-#include <xen/api/xen_string_set.h>
-#include <xen/api/xen_string_string_map.h>
-#include <xen/api/xen_vm_decl.h>
-#include <xen/api/xen_cpu_pool_decl.h>
-
-/*
- * The host class.
- * 
- * A physical host.
- */
-
-
-/**
- * Free the given xen_host.  The given handle must have been allocated
- * by this library.
- */
-extern void
-xen_host_free(xen_host host);
-
-
-typedef struct xen_host_set
-{
-    size_t size;
-    xen_host *contents[];
-} xen_host_set;
-
-/**
- * Allocate a xen_host_set of the given size.
- */
-extern xen_host_set *
-xen_host_set_alloc(size_t size);
-
-/**
- * Free the given xen_host_set.  The given set must have been allocated
- * by this library.
- */
-extern void
-xen_host_set_free(xen_host_set *set);
-
-
-typedef struct xen_host_record
-{
-    xen_host handle;
-    char *uuid;
-    char *name_label;
-    char *name_description;
-    int64_t api_version_major;
-    int64_t api_version_minor;
-    char *api_version_vendor;
-    xen_string_string_map *api_version_vendor_implementation;
-    bool enabled;
-    xen_string_string_map *software_version;
-    xen_string_string_map *other_config;
-    struct xen_string_set *capabilities;
-    xen_string_string_map *cpu_configuration;
-    char *sched_policy;
-    struct xen_string_set *supported_bootloaders;
-    struct xen_vm_record_opt_set *resident_vms;
-    xen_string_string_map *logging;
-    struct xen_pif_record_opt_set *pifs;
-    struct xen_sr_record_opt *suspend_image_sr;
-    struct xen_sr_record_opt *crash_dump_sr;
-    struct xen_pbd_record_opt_set *pbds;
-    struct xen_host_cpu_record_opt_set *host_cpus;
-    struct xen_host_metrics_record_opt *metrics;
-    struct xen_cpu_pool_record_opt_set *resident_cpu_pools;
-} xen_host_record;
-
-/**
- * Allocate a xen_host_record.
- */
-extern xen_host_record *
-xen_host_record_alloc(void);
-
-/**
- * Free the given xen_host_record, and all referenced values.  The
- * given record must have been allocated by this library.
- */
-extern void
-xen_host_record_free(xen_host_record *record);
-
-
-typedef struct xen_host_record_opt
-{
-    bool is_record;
-    union
-    {
-        xen_host handle;
-        xen_host_record *record;
-    } u;
-} xen_host_record_opt;
-
-/**
- * Allocate a xen_host_record_opt.
- */
-extern xen_host_record_opt *
-xen_host_record_opt_alloc(void);
-
-/**
- * Free the given xen_host_record_opt, and all referenced values.  The
- * given record_opt must have been allocated by this library.
- */
-extern void
-xen_host_record_opt_free(xen_host_record_opt *record_opt);
-
-
-typedef struct xen_host_record_set
-{
-    size_t size;
-    xen_host_record *contents[];
-} xen_host_record_set;
-
-/**
- * Allocate a xen_host_record_set of the given size.
- */
-extern xen_host_record_set *
-xen_host_record_set_alloc(size_t size);
-
-/**
- * Free the given xen_host_record_set, and all referenced values.  The
- * given set must have been allocated by this library.
- */
-extern void
-xen_host_record_set_free(xen_host_record_set *set);
-
-
-
-typedef struct xen_host_record_opt_set
-{
-    size_t size;
-    xen_host_record_opt *contents[];
-} xen_host_record_opt_set;
-
-/**
- * Allocate a xen_host_record_opt_set of the given size.
- */
-extern xen_host_record_opt_set *
-xen_host_record_opt_set_alloc(size_t size);
-
-/**
- * Free the given xen_host_record_opt_set, and all referenced values. 
- * The given set must have been allocated by this library.
- */
-extern void
-xen_host_record_opt_set_free(xen_host_record_opt_set *set);
-
-
-/**
- * Get a record containing the current state of the given host.
- */
-extern bool
-xen_host_get_record(xen_session *session, xen_host_record **result, xen_host 
host);
-
-
-/**
- * Get a reference to the host instance with the specified UUID.
- */
-extern bool
-xen_host_get_by_uuid(xen_session *session, xen_host *result, char *uuid);
-
-
-/**
- * Get all the host instances with the given label.
- */
-extern bool
-xen_host_get_by_name_label(xen_session *session, struct xen_host_set **result, 
char *label);
-
-
-/**
- * Get the uuid field of the given host.
- */
-extern bool
-xen_host_get_uuid(xen_session *session, char **result, xen_host host);
-
-
-/**
- * Get the name/label field of the given host.
- */
-extern bool
-xen_host_get_name_label(xen_session *session, char **result, xen_host host);
-
-
-/**
- * Get the name/description field of the given host.
- */
-extern bool
-xen_host_get_name_description(xen_session *session, char **result, xen_host 
host);
-
-
-/**
- * Get the API_version/major field of the given host.
- */
-extern bool
-xen_host_get_api_version_major(xen_session *session, int64_t *result, xen_host 
host);
-
-
-/**
- * Get the API_version/minor field of the given host.
- */
-extern bool
-xen_host_get_api_version_minor(xen_session *session, int64_t *result, xen_host 
host);
-
-
-/**
- * Get the API_version/vendor field of the given host.
- */
-extern bool
-xen_host_get_api_version_vendor(xen_session *session, char **result, xen_host 
host);
-
-
-/**
- * Get the API_version/vendor_implementation field of the given host.
- */
-extern bool
-xen_host_get_api_version_vendor_implementation(xen_session *session, 
xen_string_string_map **result, xen_host host);
-
-
-/**
- * Get the enabled field of the given host.
- */
-extern bool
-xen_host_get_enabled(xen_session *session, bool *result, xen_host host);
-
-
-/**
- * Get the software_version field of the given host.
- */
-extern bool
-xen_host_get_software_version(xen_session *session, xen_string_string_map 
**result, xen_host host);
-
-
-/**
- * Get the other_config field of the given host.
- */
-extern bool
-xen_host_get_other_config(xen_session *session, xen_string_string_map 
**result, xen_host host);
-
-
-/**
- * Get the capabilities field of the given host.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.