[libvirt] [PATCH 1/2] xenapi: remove driver

Jim Fehlig jfehlig at suse.com
Tue Sep 3 04:58:29 UTC 2019


The xenapi driver has not seen any development since its initial
contribution 9 years ago. There have been no bug reports, no patches,
and no queries about the driver on the developer or user mailing lists.
Remove the driver from the libvirt sources.

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 cfg.mk                             |    4 +-
 configure.ac                       |    4 -
 docs/aclpolkit.html.in             |    4 -
 docs/auth.html.in                  |    2 -
 libvirt.spec.in                    |    4 +-
 m4/virt-driver-xenapi.m4           |   48 -
 po/POTFILES                        |    2 -
 src/Makefile.am                    |    1 -
 src/README                         |    1 -
 src/libvirt.c                      |   10 -
 src/util/virrandom.c               |    3 +-
 src/xenapi/Makefile.inc.am         |   29 -
 src/xenapi/xenapi_driver.c         | 2125 ----------------------------
 src/xenapi/xenapi_driver.h         |   22 -
 src/xenapi/xenapi_driver_private.h |   58 -
 src/xenapi/xenapi_utils.c          |  562 --------
 src/xenapi/xenapi_utils.h          |   76 -
 tools/virsh.c                      |    3 -
 18 files changed, 3 insertions(+), 2955 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 1f29729949..42e1abf0dd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -611,7 +611,6 @@ msg_gen_function += virRaiseError
 msg_gen_function += virReportError
 msg_gen_function += virReportErrorHelper
 msg_gen_function += virReportSystemError
-msg_gen_function += xenapiSessionErrorHandler
 msg_gen_function += virLastErrorPrefixMessage
 
 # Uncomment the following and run "make syntax-check" to see diagnostics
@@ -668,7 +667,7 @@ sc_prohibit_diagnostic_without_format:
 	   $(VC_LIST_EXCEPT) | xargs \
 		$(GREP) -A2 -nE '\<$(func_re) *\(.*,$$' /dev/null; } \
 	   | $(SED) -rn -e ':l; /[,"]$$/ {N;b l;}' \
-		-e '/(xenapiSessionErrorHandler|vah_(error|warning))/d' \
+		-e '/(vah_(error|warning))/d' \
 		-e '/\<$(func_re) *\([^"]*"([^%"]|"\n[^"]*")*"[,)]/p' \
            | $(GREP) -vE 'VIR_ERROR' && \
 	  { echo '$(ME): found diagnostic without %' 1>&2; \
@@ -791,7 +790,6 @@ sc_prohibit_cross_inclusion:
 	    access/ | conf/) safe="($$dir|conf|util)";; \
 	    cpu/| network/| node_device/| rpc/| security/| storage/) \
 	      safe="($$dir|util|conf|storage)";; \
-	    xenapi/) safe="($$dir|util|conf|xen|cpu)";; \
 	    *) safe="($$dir|$(mid_dirs)|util)";; \
 	  esac; \
 	  in_vc_files="^src/$$dir" \
diff --git a/configure.ac b/configure.ac
index 7c76a9c9ec..19d8937a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,7 +456,6 @@ LIBVIRT_DRIVER_ARG_QEMU
 LIBVIRT_DRIVER_ARG_OPENVZ
 LIBVIRT_DRIVER_ARG_VMWARE
 LIBVIRT_DRIVER_ARG_PHYP
-LIBVIRT_DRIVER_ARG_XENAPI
 LIBVIRT_DRIVER_ARG_LIBXL
 LIBVIRT_DRIVER_ARG_VBOX
 LIBVIRT_DRIVER_ARG_LXC
@@ -474,7 +473,6 @@ LIBVIRT_DRIVER_CHECK_QEMU
 LIBVIRT_DRIVER_CHECK_OPENVZ
 LIBVIRT_DRIVER_CHECK_VMWARE
 LIBVIRT_DRIVER_CHECK_PHYP
-LIBVIRT_DRIVER_CHECK_XENAPI
 LIBVIRT_DRIVER_CHECK_LIBXL
 LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_LXC
@@ -960,7 +958,6 @@ LIBVIRT_DRIVER_RESULT_QEMU
 LIBVIRT_DRIVER_RESULT_OPENVZ
 LIBVIRT_DRIVER_RESULT_VMWARE
 LIBVIRT_DRIVER_RESULT_VBOX
-LIBVIRT_DRIVER_RESULT_XENAPI
 LIBVIRT_DRIVER_RESULT_LIBXL
 LIBVIRT_DRIVER_RESULT_LXC
 LIBVIRT_DRIVER_RESULT_PHYP
@@ -1041,7 +1038,6 @@ LIBVIRT_RESULT_SSH2
 LIBVIRT_RESULT_UDEV
 LIBVIRT_RESULT_VIRTUALPORT
 LIBVIRT_RESULT_XDR
-LIBVIRT_RESULT_XENAPI
 LIBVIRT_RESULT_YAJL
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Windows])
diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in
index 2cf1f9b5a5..68e6d399b2 100644
--- a/docs/aclpolkit.html.in
+++ b/docs/aclpolkit.html.in
@@ -393,10 +393,6 @@
           <td>vz</td>
           <td>vz</td>
         </tr>
-        <tr>
-          <td>xenapi</td>
-          <td>XenAPI</td>
-        </tr>
       </tbody>
     </table>
 
diff --git a/docs/auth.html.in b/docs/auth.html.in
index 33afe0a8ad..62af43a915 100644
--- a/docs/auth.html.in
+++ b/docs/auth.html.in
@@ -132,8 +132,6 @@ credentials=defgrp</pre>
         over SSH</li>
       <li><code>esx</code> - used for connections to an ESX or
         VirtualCenter server</li>
-      <li><code>xen</code> - used for connections to a Xen Enterprise
-        sever using XenAPI</li>
     </ol>
 
     <p>
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 41c4a142d6..dde8bf3a97 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -118,14 +118,13 @@
 %endif
 
 # RHEL doesn't ship OpenVZ, VBox, PowerHypervisor,
-# VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
+# VMware, libxenlight (Xen 4.1 and newer),
 # or HyperV.
 %if 0%{?rhel}
     %define with_openvz 0
     %define with_vbox 0
     %define with_phyp 0
     %define with_vmware 0
-    %define with_xenapi 0
     %define with_libxl 0
     %define with_hyperv 0
     %define with_vz 0
@@ -1169,7 +1168,6 @@ rm -f po/stamp-po
            %{?arg_esx} \
            %{?arg_hyperv} \
            %{?arg_vmware} \
-           --without-xenapi \
            --without-vz \
            --without-bhyve \
            --with-remote-default-mode=legacy \
diff --git a/m4/virt-driver-xenapi.m4 b/m4/virt-driver-xenapi.m4
deleted file mode 100644
index d2181a21a1..0000000000
--- a/m4/virt-driver-xenapi.m4
+++ /dev/null
@@ -1,48 +0,0 @@
-dnl The XenAPI driver
-dnl
-dnl Copyright (C) 2016 Red Hat, Inc.
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License, or (at your option) any later version.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library.  If not, see
-dnl <http://www.gnu.org/licenses/>.
-dnl
-
-AC_DEFUN([LIBVIRT_DRIVER_ARG_XENAPI], [
-  LIBVIRT_ARG_WITH_FEATURE([XENAPI], [XenAPI], [check])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_CHECK_XENAPI], [
-  AC_REQUIRE([LIBVIRT_CHECK_CURL])
-
-  old_with_xenapi="$with_xenapi"
-
-  dnl search for the XenServer library
-  LIBVIRT_CHECK_LIB([XENAPI], [xenserver], [xen_vm_start], [xen/api/xen_vm.h])
-
-  if test "x$with_xenapi" = "xyes" ; then
-    if test "x$with_curl" = "xno"; then
-      if test "$old_with_xenapi" != "check"; then
-        AC_MSG_ERROR([You must install libcurl to compile the XenAPI driver])
-      fi
-      with_xenapi=no
-    fi
-  fi
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_RESULT_XENAPI], [
-  LIBVIRT_RESULT([XenAPI], [$with_xenapi])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_XENAPI], [
-  LIBVIRT_RESULT_LIB([XENAPI])
-])
diff --git a/po/POTFILES b/po/POTFILES
index e466e1bc55..35fc26c4b9 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -292,8 +292,6 @@ src/vz/vz_driver.c
 src/vz/vz_sdk.c
 src/vz/vz_utils.c
 src/vz/vz_utils.h
-src/xenapi/xenapi_driver.c
-src/xenapi/xenapi_utils.c
 tests/virpolkittest.c
 tools/libvirt-guests.sh.in
 tools/virsh-checkpoint.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f5093b9c90..cd955ee552 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,7 +119,6 @@ include openvz/Makefile.inc.am
 include qemu/Makefile.inc.am
 include bhyve/Makefile.inc.am
 include libxl/Makefile.inc.am
-include xenapi/Makefile.inc.am
 include vz/Makefile.inc.am
 include lxc/Makefile.inc.am
 include interface/Makefile.inc.am
diff --git a/src/README b/src/README
index 846bf2b664..a2260fda68 100644
--- a/src/README
+++ b/src/README
@@ -37,7 +37,6 @@ Then there are the hypervisor implementations:
  * vbox/         - Virtual Box using native API
  * vmware/       - VMware Workstation and Player using the vmrun tool
  * xen/          - Xen using hypercalls, XenD SEXPR & XenStore
- * xenapi/       - Xen using libxenserver
 
 
 Finally some secondary drivers that are shared for several HVs.
diff --git a/src/libvirt.c b/src/libvirt.c
index 956ccdea30..9650aaa453 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -81,9 +81,6 @@
 #ifdef WITH_HYPERV
 # include "hyperv/hyperv_driver.h"
 #endif
-#ifdef WITH_XENAPI
-# include "xenapi/xenapi_driver.h"
-#endif
 #ifdef WITH_BHYVE
 # include "bhyve/bhyve_driver.h"
 #endif
@@ -307,10 +304,6 @@ virGlobalInit(void)
     if (hypervRegister() == -1)
         goto error;
 #endif
-#ifdef WITH_XENAPI
-    if (xenapiRegister() == -1)
-        goto error;
-#endif
 #ifdef WITH_REMOTE
     if (remoteRegister() == -1)
         goto error;
@@ -989,9 +982,6 @@ virConnectOpenInternal(const char *name,
 #ifndef WITH_HYPERV
              STRCASEEQ(ret->uri->scheme, "hyperv") ||
 #endif
-#ifndef WITH_XENAPI
-             STRCASEEQ(ret->uri->scheme, "xenapi") ||
-#endif
 #ifndef WITH_VZ
              STRCASEEQ(ret->uri->scheme, "parallels") ||
 #endif
diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index e0c15a3262..93c5bf3a2c 100644
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -183,8 +183,7 @@ virRandomGenerateWWN(char **wwn,
     if (STREQ(virt_type, "QEMU")) {
         oui = QUMRANET_OUI;
     } else if (STREQ(virt_type, "Xen") ||
-               STREQ(virt_type, "xenlight") ||
-               STREQ(virt_type, "XenAPI")) {
+               STREQ(virt_type, "xenlight")) {
         oui = XEN_OUI;
     } else if (STREQ(virt_type, "ESX") ||
                STREQ(virt_type, "VMWARE")) {
diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am
deleted file mode 100644
index aedef4e2a0..0000000000
--- a/src/xenapi/Makefile.inc.am
+++ /dev/null
@@ -1,29 +0,0 @@
-# vim: filetype=automake
-
-XENAPI_DRIVER_SOURCES = \
-	xenapi/xenapi_driver.c \
-	xenapi/xenapi_driver.h \
-	xenapi/xenapi_driver_private.h \
-	xenapi/xenapi_utils.c \
-	xenapi/xenapi_utils.h \
-	$(NULL)
-
-DRIVER_SOURCE_FILES += $(XENAPI_DRIVER_SOURCES)
-EXTRA_DIST += $(XENAPI_DRIVER_SOURCES)
-
-if WITH_XENAPI
-noinst_LTLIBRARIES += libvirt_driver_xenapi.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_xenapi.la
-libvirt_driver_xenapi_la_CFLAGS = \
-	$(XENAPI_CFLAGS) \
-	$(CURL_CFLAGS) \
-	-I$(srcdir)/conf \
-	$(AM_CFLAGS) \
-	$(NULL)
-libvirt_driver_xenapi_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_xenapi_la_LIBADD = \
-	$(XENAPI_LIBS) \
-	$(CURL_LIBS) \
-	$(NULL)
-libvirt_driver_xenapi_la_SOURCES = $(XENAPI_DRIVER_SOURCES)
-endif WITH_XENAPI
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
deleted file mode 100644
index 672117822f..0000000000
--- a/src/xenapi/xenapi_driver.c
+++ /dev/null
@@ -1,2125 +0,0 @@
-/*
- * xenapi_driver.c: Xen API driver.
- * Copyright (C) 2011-2015 Red Hat, Inc.
- * Copyright (C) 2009, 2010 Citrix Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-
-#include <curl/curl.h>
-#include <xen/api/xen_all.h>
-#include "internal.h"
-#include "domain_conf.h"
-#include "virerror.h"
-#include "datatypes.h"
-#include "virauth.h"
-#include "viruuid.h"
-#include "viralloc.h"
-#include "virbuffer.h"
-#include "viruri.h"
-#include "xenapi_driver.h"
-#include "xenapi_driver_private.h"
-#include "xenapi_utils.h"
-#include "virstring.h"
-#include "xen_common.h"
-
-#define VIR_FROM_THIS VIR_FROM_XENAPI
-
-
-static int
-xenapiDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-                               const virDomainDef *def,
-                               virCapsPtr caps ATTRIBUTE_UNUSED,
-                               unsigned int parseFlags ATTRIBUTE_UNUSED,
-                               void *opaque ATTRIBUTE_UNUSED,
-                               void *parseOpaque ATTRIBUTE_UNUSED)
-{
-    if (dev->type == VIR_DOMAIN_DEVICE_CHR &&
-        dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
-        dev->data.chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE &&
-        def->os.type != VIR_DOMAIN_OSTYPE_HVM)
-        dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
-
-    /* forbid capabilities mode hostdev in this kind of hypervisor */
-    if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
-        dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("hostdev mode 'capabilities' is not "
-                         "supported in %s"),
-                       virDomainVirtTypeToString(def->virtType));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-static int
-xenapiDomainDefPostParse(virDomainDefPtr def,
-                         virCapsPtr caps ATTRIBUTE_UNUSED,
-                         unsigned int parseFlags ATTRIBUTE_UNUSED,
-                         void *opaque ATTRIBUTE_UNUSED,
-                         void *parseOpaque ATTRIBUTE_UNUSED)
-{
-    /* add implicit input device */
-    if (xenDomainDefAddImplicitInputDevice(def) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-virDomainDefParserConfig xenapiDomainDefParserConfig = {
-    .devicesPostParseCallback = xenapiDomainDeviceDefPostParse,
-    .domainPostParseCallback = xenapiDomainDefPostParse,
-    .features = VIR_DOMAIN_DEF_FEATURE_NAME_SLASH,
-};
-
-
-/*
- * getCapsObject
- *
- * Build the capabilities of the hypervisor
- * Return virCapsPtr on success or NULL on failure
- */
-static virCapsPtr
-getCapsObject(void)
-{
-    virCapsGuestPtr guest1, guest2;
-    virCapsGuestDomainPtr domain1, domain2;
-    virCapsPtr caps = virCapabilitiesNew(virArchFromHost(), false, false);
-
-    if (!caps)
-        return NULL;
-    guest1 = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, "", "", 0, NULL);
-    if (!guest1)
-        goto error_cleanup;
-    domain1 = virCapabilitiesAddGuestDomain(guest1, VIR_DOMAIN_VIRT_XEN, "", "", 0, NULL);
-    if (!domain1)
-        goto error_cleanup;
-    guest2 = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_X86_64, "", "", 0, NULL);
-    if (!guest2)
-        goto error_cleanup;
-    domain2 = virCapabilitiesAddGuestDomain(guest2, VIR_DOMAIN_VIRT_XEN, "", "", 0, NULL);
-    if (!domain2)
-        goto error_cleanup;
-
-    return caps;
-
- error_cleanup:
-    virObjectUnref(caps);
-    return NULL;
-}
-
-/*
- * xenapiConnectOpen
- *
- * Authenticates and creates a session with the server
- * Return VIR_DRV_OPEN_SUCCESS on success, else VIR_DRV_OPEN_ERROR
- */
-static virDrvOpenStatus
-xenapiConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
-                  virConfPtr conf ATTRIBUTE_UNUSED,
-                  unsigned int flags)
-{
-    char *username = NULL;
-    char *password = NULL;
-    struct _xenapiPrivate *privP = NULL;
-
-    virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
-
-    if (conn->uri->server == NULL) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INVALID_ARG,
-                                  _("Server name not in URI"));
-        goto error;
-    }
-
-    if (conn->uri->user != NULL) {
-        if (VIR_STRDUP(username, conn->uri->user) < 0)
-            goto error;
-    } else {
-        if (!(username = virAuthGetUsername(conn, auth, "xen", NULL,
-                                            conn->uri->server)))
-            goto error;
-    }
-
-    if (!(password = virAuthGetPassword(conn, auth, "xen", username,
-                                        conn->uri->server)))
-        goto error;
-
-    if (VIR_ALLOC(privP) < 0)
-        goto error;
-
-    if (virAsprintf(&privP->url, "https://%s", conn->uri->server) < 0)
-        goto error;
-
-    if (xenapiUtil_ParseQuery(conn, conn->uri, &privP->noVerify) < 0)
-        goto error;
-
-    if (!(privP->caps = getCapsObject())) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Capabilities not found"));
-        goto error;
-    }
-
-    if (!(privP->xmlopt = virDomainXMLOptionNew(&xenapiDomainDefParserConfig,
-                                                NULL, NULL, NULL, NULL))) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Failed to create XML conf object"));
-        goto error;
-    }
-
-    xmlInitParser();
-    xmlKeepBlanksDefault(0);
-    xen_init();
-
-    privP->session = xen_session_login_with_password(call_func, privP, username,
-                                                     password, xen_api_latest_version);
-
-    if (privP->session == NULL) {
-        /* From inspection of xen_session_login_with_password in
-         * libxenserver(Version 5.6.100-1), this appears not to be currently
-         * possible. The only way for this to be NULL would be on malloc
-         * failure, except that the code doesn't check for this and would
-         * segfault before returning.
-         *
-         * We don't assume the reason here for a failure in an external library.
-         */
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Failed to allocate xen session"));
-
-        goto error;
-    }
-
-    if (privP->session->ok) {
-        conn->privateData = privP;
-
-        VIR_FREE(username);
-        VIR_FREE(password);
-
-        return VIR_DRV_OPEN_SUCCESS;
-    }
-
-    xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, NULL);
-
- error:
-    VIR_FREE(username);
-    VIR_FREE(password);
-
-    if (privP != NULL) {
-        virObjectUnref(privP->caps);
-        virObjectUnref(privP->xmlopt);
-
-        if (privP->session != NULL)
-            xenSessionFree(privP->session);
-
-        VIR_FREE(privP->url);
-        VIR_FREE(privP);
-    }
-
-    return VIR_DRV_OPEN_ERROR;
-}
-
-/*
- * xenapiConnectClose:
- *
- * Returns 0 on successful session logout
- *
- */
-static int
-xenapiConnectClose(virConnectPtr conn)
-{
-    struct _xenapiPrivate *priv = conn->privateData;
-
-    virObjectUnref(priv->caps);
-    virObjectUnref(priv->xmlopt);
-
-    if (priv->session != NULL) {
-        xen_session_logout(priv->session);
-        priv->session = NULL;
-    }
-
-    VIR_FREE(priv->url);
-    VIR_FREE(priv);
-
-    conn->privateData = NULL;
-
-    return 0;
-}
-
-/*
- *
- * xenapiConnectSupportsFeature
- *
- * Returns 0
- */
-static int
-xenapiConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature)
-{
-    switch (feature) {
-    case VIR_DRV_FEATURE_MIGRATION_V2:
-    case VIR_DRV_FEATURE_MIGRATION_P2P:
-    default:
-        return 0;
-    }
-}
-
-/*
- * xenapiConnectGetType:
- *
- *
- * Returns name of the driver
- */
-static const char *
-xenapiConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED)
-{
-    return "XenAPI";
-}
-
-
-/*
- * xenapiConnectGetVersion:
- *
- * Gets the version of XenAPI
- *
- */
-static int
-xenapiConnectGetVersion(virConnectPtr conn, unsigned long *hvVer)
-{
-    xen_host host;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    xen_string_string_map *result = NULL;
-    size_t i;
-    int ret = -1;
-    char *version = NULL;
-    if (!(xen_session_get_this_host(session, &host, session))) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        return -1;
-    }
-    if (!(xen_host_get_software_version(session, &result, host))) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        xen_host_free(host);
-        return -1;
-    }
-    xen_host_free(host);
-    if (result && result->size > 0) {
-        for (i = 0; i < result->size; i++) {
-            if (STREQ(result->contents[i].key, "xen")) {
-                if (VIR_STRDUP(version, result->contents[i].val) < 0) {
-                    xen_string_string_map_free(result);
-                    return -1;
-                }
-                break;
-            }
-        }
-        if (version) {
-            if (virParseVersionString(version, hvVer, false) < 0)
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                          _("Couldn't parse version info"));
-            else
-                ret = 0;
-            xen_string_string_map_free(result);
-            VIR_FREE(version);
-            return ret;
-        }
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Couldn't get version info"));
-    }
-    return -1;
-}
-
-
-/*
- * xenapiConnectGetHostname:
- *
- *
- * Returns the hostname on success, or NULL on failure
- */
-static char *
-xenapiConnectGetHostname(virConnectPtr conn)
-{
-    char *result = NULL;
-    xen_host host;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    if (!(xen_session_get_this_host(session, &host, session))) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        return NULL;
-    }
-    if (!(xen_host_get_hostname(session, &result, host)))
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    xen_host_free(host);
-    return result;
-}
-
-
-/*
- * xenapiConnectGetMaxVcpus:
- *
- *
- * Returns a hardcoded value for Maximum VCPUS
- */
-static int
-xenapiConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED)
-{
-    /* this is hardcoded for simplicity and set to a resonable value compared
-       to the actual value */
-    return 16;
-}
-
-
-/*
- * xenapiNodeGetInfo:
- *
- *
- * Returns Node details on success or else -1
- */
-static int
-xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
-{
-    int64_t memory, mhz;
-    xen_host_cpu_set *host_cpu_set;
-    xen_host_cpu host_cpu;
-    xen_host_metrics_set *xen_met_set;
-    char *modelname;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    info->nodes = 1;
-    info->threads = 1;
-    info->sockets = 1;
-
-    if (xen_host_metrics_get_all(session, &xen_met_set)) {
-        xen_host_metrics_get_memory_total(session, &memory, xen_met_set->contents[0]);
-        info->memory = (unsigned long)(memory / 1024);
-        xen_host_metrics_set_free(xen_met_set);
-    } else {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Unable to get host metric Information"));
-        return -1;
-    }
-    if (xen_host_cpu_get_all(session, &host_cpu_set)) {
-        host_cpu = host_cpu_set->contents[0];
-        xen_host_cpu_get_modelname(session, &modelname, host_cpu);
-        if (virStrncpy(info->model, modelname,
-                       MIN(strlen(modelname), LIBVIRT_MODELNAME_LEN - 1),
-                       LIBVIRT_MODELNAME_LEN) < 0) {
-            virReportOOMError();
-            xen_host_cpu_set_free(host_cpu_set);
-            VIR_FREE(modelname);
-            return -1;
-        }
-        xen_host_cpu_get_speed(session, &mhz, host_cpu);
-        info->mhz = (unsigned long)mhz;
-        info->cpus = host_cpu_set->size;
-        info->cores = host_cpu_set->size;
-
-        xen_host_cpu_set_free(host_cpu_set);
-        VIR_FREE(modelname);
-        return 0;
-    }
-    xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                              _("Unable to get Host CPU set"));
-    return -1;
-}
-
-/*
- * xenapiConnectGetCapabilities:
- *
- *
- * Returns capabilities as an XML string
- */
-static char *
-xenapiConnectGetCapabilities(virConnectPtr conn)
-{
-    virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps;
-    if (caps)
-        return virCapabilitiesFormatXML(caps);
-
-    xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                              _("Capabilities not available"));
-    return NULL;
-}
-
-
-/*
- * xenapiConnectListDomains
- *
- * Collects the list of active domains, and store their ID in @maxids
- * Returns the number of domain found or -1 in case of error
- */
-static int
-xenapiConnectListDomains(virConnectPtr conn, int *ids, int maxids)
-{
-    /* vm.list */
-    xen_host host;
-    xen_vm_set *result = NULL;
-    int64_t t0;
-    size_t i;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    if (xen_session_get_this_host(session, &host, session)) {
-        xen_host_get_resident_vms(session, &result, host);
-        xen_host_free(host);
-    } else {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    }
-    if (result != NULL) {
-        for (i = 0; (i < (result->size)) && (i < maxids); i++) {
-            xen_vm_get_domid(session, &t0, result->contents[i]);
-            if (t0 > (int64_t)INT_MAX || t0 < (int64_t)INT_MIN) {
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                          _("DomainID can't fit in 32 bits"));
-                xen_vm_set_free(result);
-                return -1;
-            }
-            ids[i] = (int)t0;
-        }
-        xen_vm_set_free(result);
-        return i;
-    }
-    return -1;
-}
-
-/*
- * xenapiConnectNumOfDomains
- *
- *
- * Returns the number of domains found or -1 in case of error
- */
-static int
-xenapiConnectNumOfDomains(virConnectPtr conn)
-{
-    /* #(vm.list) */
-    xen_vm_set *result = NULL;
-    xen_host host = NULL;
-    int numDomains = -1;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-
-    xen_session_get_this_host(session, &host, session);
-    if (host != NULL) {
-        xen_host_get_resident_vms(session, &result, host);
-        if (result != NULL) {
-            numDomains = result->size;
-            xen_vm_set_free(result);
-        }
-        xen_host_free(host);
-    }
-    if (!session->ok)
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return numDomains;
-}
-
-/*
- * xenapiDomainCreateXML
- *
- * Launches a new domain based on the XML description
- * Returns the domain pointer or NULL in case of error
- */
-static virDomainPtr
-xenapiDomainCreateXML(virConnectPtr conn,
-                      const char *xmlDesc,
-                      unsigned int flags)
-{
-    struct _xenapiPrivate *priv = conn->privateData;
-    xen_vm_record *record = NULL;
-    xen_vm vm = NULL;
-    virDomainPtr domP = NULL;
-    unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
-
-    if (!priv->caps)
-        return NULL;
-
-    virCheckFlags(VIR_DOMAIN_START_VALIDATE, NULL);
-
-    if (flags & VIR_DOMAIN_START_VALIDATE)
-        parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
-
-    virDomainDefPtr defPtr = virDomainDefParseString(xmlDesc,
-                                                     priv->caps, priv->xmlopt,
-                                                     NULL,
-                                                     parse_flags);
-    if (!defPtr)
-        return NULL;
-    createVMRecordFromXml(conn, defPtr, &record, &vm);
-    virDomainDefFree(defPtr);
-    if (record) {
-        unsigned char raw_uuid[VIR_UUID_BUFLEN];
-        ignore_value(virUUIDParse(record->uuid, raw_uuid));
-        if (vm) {
-            if (xen_vm_start(priv->session, vm, false, false)) {
-                domP = virGetDomain(conn, record->name_label,
-                                    raw_uuid, record->domid);
-                if (!domP) {
-                    xen_vm_record_free(record);
-                    xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                              _("Domain Pointer is invalid"));
-                    return domP;
-                }
-                xen_vm_free(vm);
-            }
-            else
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        }
-        xen_vm_record_free(record);
-    }
-    else
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return domP;
-}
-
-/*
- * xenapiDomainLookupByID
- *
- *
- * Returns a valid domain pointer of the domain with ID same as the one passed
- * or NULL in case of error
- */
-static virDomainPtr
-xenapiDomainLookupByID(virConnectPtr conn, int id)
-{
-    size_t i;
-    int64_t domID;
-    char *uuid;
-    xen_host host;
-    xen_vm_set *result;
-    xen_vm_record *record;
-    unsigned char raw_uuid[VIR_UUID_BUFLEN];
-    virDomainPtr domP = NULL;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-
-    xen_session_get_this_host(session, &host, session);
-    if (host != NULL && session->ok) {
-        xen_host_get_resident_vms(session, &result, host);
-        if (result != NULL) {
-            for (i = 0; i < result->size; i++) {
-                xen_vm_get_domid(session, &domID, result->contents[i]);
-                if (domID == id) {
-                    int64_t domid = -1;
-
-                    xen_vm_get_record(session, &record, result->contents[i]);
-                    xen_vm_get_uuid(session, &uuid, result->contents[i]);
-                    ignore_value(virUUIDParse(uuid, raw_uuid));
-                    xen_vm_get_domid(session, &domid, result->contents[i]);
-                    domP = virGetDomain(conn, record->name_label, raw_uuid, domid);
-                    if (!domP) {
-                        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                                  _("Domain Pointer not valid"));
-                    }
-                    xen_uuid_free(uuid);
-                    xen_vm_record_free(record);
-                    break;
-                }
-            }
-            xen_vm_set_free(result);
-        } else {
-            xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL);
-        }
-        xen_host_free(host);
-    } else {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    }
-    return domP;
-}
-
-/*
- * xenapiDomainLookupByUUID
- *
- * Returns the domain pointer of domain with matching UUID
- * or -1 in case of error
- */
-static virDomainPtr
-xenapiDomainLookupByUUID(virConnectPtr conn,
-                         const unsigned char *uuid)
-{
-    /* vm.get_by_uuid */
-    xen_vm vm;
-    xen_vm_record *record;
-    char uuidStr[VIR_UUID_STRING_BUFLEN];
-    virDomainPtr domP = NULL;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    virUUIDFormat(uuid, uuidStr);
-    if (xen_vm_get_by_uuid(session, &vm, uuidStr)) {
-        xen_vm_get_record(session, &record, vm);
-        if (record != NULL) {
-            domP = virGetDomain(conn, record->name_label, uuid, record->domid);
-            if (!domP) {
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                          _("Domain Pointer not valid"));
-            }
-            xen_vm_record_free(record);
-        } else {
-            xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL);
-        }
-        xen_vm_free(vm);
-    } else {
-        xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL);
-    }
-    return domP;
-}
-
-/*
- * xenapiDomainLookupByName
- *
- * Returns the domain pointer of domain with matching name
- * or -1 in case of error
- */
-static virDomainPtr
-xenapiDomainLookupByName(virConnectPtr conn,
-                         const char *name)
-{
-    /* vm.get_by_name_label */
-    xen_vm_set *vms = NULL;
-    xen_vm vm;
-    char *uuid = NULL;
-    unsigned char raw_uuid[VIR_UUID_BUFLEN];
-    virDomainPtr domP = NULL;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, (char *)name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return NULL;
-        }
-        vm = vms->contents[0];
-        xen_vm_get_uuid(session, &uuid, vm);
-        if (uuid != NULL) {
-            int64_t domid = -1;
-            ignore_value(virUUIDParse(uuid, raw_uuid));
-            xen_vm_get_domid(session, &domid, vm);
-            domP = virGetDomain(conn, name, raw_uuid, domid);
-            if (domP != NULL) {
-                xen_uuid_free(uuid);
-                xen_vm_set_free(vms);
-                return domP;
-            } else {
-                xen_uuid_free(uuid);
-                xen_vm_set_free(vms);
-            if (!session->ok)
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                          _("Couldn't get the Domain Pointer"));
-                return NULL;
-            }
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL);
-    return NULL;
-}
-
-/*
- * xenapiDomainSuspend
- *
- * a VM is paused
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainSuspend(virDomainPtr dom)
-{
-    /* vm.pause() */
-    xen_vm vm;
-    xen_vm_set *vms = NULL;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) &&  vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        } else {
-            vm = vms->contents[0];
-            if (!xen_vm_pause(session, vm)) {
-                xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-                xen_vm_set_free(vms);
-                return -1;
-            }
-            xen_vm_set_free(vms);
-            return 0;
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainResume
- *
- * Resumes a VM
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainResume(virDomainPtr dom)
-{
-    /* vm.unpause() */
-    xen_vm vm;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        } else {
-            vm = vms->contents[0];
-            if (!xen_vm_unpause(session, vm)) {
-                xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-                xen_vm_set_free(vms);
-                return -1;
-            }
-            xen_vm_set_free(vms);
-            return 0;
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainShutdown
- *
- * shutsdown a VM
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainShutdownFlags(virDomainPtr dom, unsigned int flags)
-{
-    /* vm.clean_shutdown */
-    xen_vm vm;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        } else {
-            vm = vms->contents[0];
-            if (!xen_vm_clean_shutdown(session, vm)) {
-                xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-                xen_vm_set_free(vms);
-                return -1;
-            }
-            xen_vm_set_free(vms);
-            return 0;
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-static int
-xenapiDomainShutdown(virDomainPtr dom)
-{
-    return xenapiDomainShutdownFlags(dom, 0);
-}
-
-/*
- * xenapiDomainReboot
- *
- * Reboots a VM
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainReboot(virDomainPtr dom, unsigned int flags)
-{
-    /* vm.clean_reboot */
-    xen_vm vm;
-    struct xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_clean_reboot(session, vm)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainDestroyFlags:
- * @dom: domain object
- * @flags: an OR'ed set of virDomainDestroyFlagsValues
- *
- * Calling this function with no flags set (equal to zero)
- * is equivalent to calling xenapiDomainDestroy.
- *
- * A VM is hard shutdown
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainDestroyFlags(virDomainPtr dom,
-                         unsigned int flags)
-{
-    /* vm.hard_shutdown */
-    xen_vm vm;
-    struct xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_hard_shutdown(session, vm)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-        dom->id = -1;
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainDestroy:
- * @dom: domain object
- *
- * See xenapiDomainDestroyFlags
- */
-static int
-xenapiDomainDestroy(virDomainPtr dom)
-{
-    return xenapiDomainDestroyFlags(dom, 0);
-}
-/*
- * xenapiDomainGetOSType
- *
- *
- * Returns OS version on success or NULL in case of error
- */
-static char *
-xenapiDomainGetOSType(virDomainPtr dom)
-{
-    xen_vm vm = NULL;
-    xen_vm_set *vms;
-    char *ostype = NULL;
-    char *boot_policy = NULL;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return NULL;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_get_hvm_boot_policy(session, &boot_policy, vm)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            goto cleanup;
-        }
-        ignore_value(VIR_STRDUP(ostype,
-                                STREQ(boot_policy, "BIOS order") ? "hvm" : "xen"));
-        VIR_FREE(boot_policy);
-    } else {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    }
-
- cleanup:
-    if (vms)
-        xen_vm_set_free(vms);
-    return ostype;
-}
-/*
- * xenapiDomainGetMaxMemory
- *
- * Returns maximum static memory for VM on success
- * or 0 in case of error
- */
-static unsigned long long
-xenapiDomainGetMaxMemory(virDomainPtr dom)
-{
-    int64_t mem_static_max = 0;
-    xen_vm vm;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return 0;
-        }
-        vm = vms->contents[0];
-        xen_vm_get_memory_static_max(session, &mem_static_max, vm);
-        xen_vm_set_free(vms);
-        return mem_static_max / 1024;
-    } else {
-        if (vms)
-            xen_vm_set_free(vms);
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-        return 0;
-    }
-}
-
-/*
- * xenapiDomainSetMaxMemory
- *
- * Sets maximum static memory for VM on success
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainSetMaxMemory(virDomainPtr dom, unsigned long memory)
-{
-    /* vm.set_memory_static_max */
-    xen_vm vm;
-    struct xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!(xen_vm_set_memory_static_max(session, vm, memory * 1024))) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-    } else {
-        if (vms)
-            xen_vm_set_free(vms);
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-        return -1;
-    }
-    return 0;
-}
-
-/*
- * xenapiDomainGetInfo:
- *
- * Fills a structure with domain information
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info)
-{
-    int64_t maxmem = 0, memory = 0, vcpu = 0;
-    xen_vm vm;
-    xen_vm_record *record;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    info->cpuTime = 0; /* CPU time is not advertised */
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        xen_vm_get_memory_static_max(session, &maxmem, vm);
-        info->maxMem = (maxmem / 1024);
-        enum xen_vm_power_state state = XEN_VM_POWER_STATE_UNDEFINED;
-        xen_vm_get_power_state(session, &state, vm);
-        info->state = mapPowerState(state);
-        xen_vm_get_record(session, &record, vm);
-        if (record != NULL) {
-            xen_vm_metrics_get_memory_actual(session, &memory, record->metrics->u.handle);
-            info->memory = (memory / 1024);
-            xen_vm_record_free(record);
-        }
-        xen_vm_get_vcpus_max(session, &vcpu, vm);
-        info->nrVirtCpu = vcpu;
-        xen_vm_set_free(vms);
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainGetState:
- *
- * Retrieves domain status and its reason.
- *
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainGetState(virDomainPtr dom,
-                     int *state,
-                     int *reason,
-                     unsigned int flags)
-{
-    struct _xenapiPrivate *priv = dom->conn->privateData;
-    enum xen_vm_power_state powerState = XEN_VM_POWER_STATE_UNDEFINED;
-    xen_vm_set *vms = NULL;
-    xen_vm vm;
-    int ret = -1;
-
-    virCheckFlags(0, -1);
-
-    if (!xen_vm_get_by_name_label(priv->session, &vms, dom->name) ||
-        vms->size == 0) {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-        goto cleanup;
-    }
-
-    if (vms->size != 1) {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Domain name is not unique"));
-        goto cleanup;
-    }
-
-    vm = vms->contents[0];
-    xen_vm_get_power_state(priv->session, &powerState, vm);
-
-    *state = mapPowerState(powerState);
-    if (reason)
-        *reason = 0;
-
-    ret = 0;
-
- cleanup:
-    if (vms)
-        xen_vm_set_free(vms);
-    return ret;
-}
-
-
-/*
- * xenapiDomainSetVcpusFlags
- *
- * Sets the VCPUs on the domain
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
-                          unsigned int flags)
-{
-    /* vm.set_vcpus_max */
-    xen_vm vm;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    if (flags != VIR_DOMAIN_VCPU_LIVE) {
-        virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-                       flags);
-        return -1;
-    }
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (xen_vm_set_vcpus_number_live(session, vm, (int64_t)nvcpus)) {
-            xen_vm_set_free(vms);
-            return 0;
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainSetVcpus
- *
- * Sets the VCPUs on the domain
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus)
-{
-    return xenapiDomainSetVcpusFlags(dom, nvcpus, VIR_DOMAIN_VCPU_LIVE);
-}
-
-/*
- * xenapiDomainPinVcpu
- *
- * Dynamically change the real CPUs which can be allocated to a virtual CPU
- * Returns 0 on success or -1 in case of error
- */
-static int
-xenapiDomainPinVcpu(virDomainPtr dom, unsigned int vcpu ATTRIBUTE_UNUSED,
-                    unsigned char *cpumap, int maplen)
-{
-    char *value = NULL;
-    xen_vm vm;
-    xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if ((value = mapDomainPinVcpu(cpumap, maplen))) {
-            xen_vm_remove_from_vcpus_params(session, vm, (char *)"mask");
-            if (xen_vm_add_to_vcpus_params(session, vm, (char *)"mask", value)) {
-                xen_vm_set_free(vms);
-                VIR_FREE(value);
-                return 0;
-            }
-            VIR_FREE(value);
-        } else {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainGetVcpus
- *
- * Gets Vcpu information
- * Return number of structures filled on success or -1 in case of error
- */
-static int
-xenapiDomainGetVcpus(virDomainPtr dom,
-                     virVcpuInfoPtr info, int maxinfo,
-                     unsigned char *cpumaps, int maplen)
-{
-    xen_vm_set *vms = NULL;
-    xen_vm vm = NULL;
-    xen_string_string_map *vcpu_params = NULL;
-    int nvcpus = 0;
-    size_t i;
-    virDomainInfo domInfo;
-    virNodeInfo nodeInfo;
-    virVcpuInfoPtr ifptr;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    char *mask = NULL;
-    if (cpumaps != NULL && maplen < 1)
-        return -1;
-    if (xenapiDomainGetInfo(dom, &domInfo) == 0) {
-        nvcpus = domInfo.nrVirtCpu;
-    } else {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Couldn't fetch Domain Information"));
-        return -1;
-    }
-    if (xenapiNodeGetInfo(dom->conn, &nodeInfo) != 0) {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Couldn't fetch Node Information"));
-        return -1;
-    }
-    if (nvcpus > maxinfo)
-        nvcpus = maxinfo;
-    if (cpumaps != NULL)
-        memset(cpumaps, 0, maxinfo * maplen);
-    if (!xen_vm_get_by_name_label(session, &vms, dom->name))
-        return -1;
-    if (vms->size != 1) {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Domain name is not unique"));
-        xen_vm_set_free(vms);
-        return -1;
-    }
-    vm = vms->contents[0];
-    if (!xen_vm_get_vcpus_params(session, &vcpu_params, vm)) {
-        xen_vm_set_free(vms);
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        return -1;
-    }
-    for (i = 0; i < vcpu_params->size; i++) {
-        if (STREQ(vcpu_params->contents[i].key, "mask")) {
-            if (VIR_STRDUP(mask, vcpu_params->contents[i].val) < 0) {
-                 xen_vm_set_free(vms);
-                 xen_string_string_map_free(vcpu_params);
-                 return -1;
-            }
-            break;
-         }
-    }
-    xen_string_string_map_free(vcpu_params);
-    for (i = 0, ifptr = info; i < nvcpus; i++, ifptr++) {
-        ifptr->number = i;
-        ifptr->state = VIR_VCPU_RUNNING;
-        ifptr->cpuTime = 0;
-        ifptr->cpu = 0;
-        if (mask != NULL)
-            getCpuBitMapfromString(mask, VIR_GET_CPUMAP(cpumaps, maplen, i), maplen);
-    }
-    VIR_FREE(mask);
-    xen_vm_set_free(vms);
-    return i;
-}
-
-/*
- * xenapiDomainGetVcpusFlags
- *
- *
- * Returns Vcpus count on success or -1 in case of error
- */
-static int
-xenapiDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
-{
-    xen_vm vm;
-    xen_vm_set *vms;
-    int64_t maxvcpu = 0;
-    enum xen_vm_power_state state;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
-        virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"),
-                       flags);
-        return -1;
-    }
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        xen_vm_get_power_state(session, &state, vm);
-        if (state == XEN_VM_POWER_STATE_RUNNING) {
-            xen_vm_get_vcpus_max(session, &maxvcpu, vm);
-        } else {
-            maxvcpu = xenapiConnectGetMaxVcpus(dom->conn, NULL);
-        }
-        xen_vm_set_free(vms);
-        return (int)maxvcpu;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainGetMaxVcpus
- *
- *
- * Returns maximum number of Vcpus on success or -1 in case of error
- */
-static int
-xenapiDomainGetMaxVcpus(virDomainPtr dom)
-{
-    return xenapiDomainGetVcpusFlags(dom, (VIR_DOMAIN_VCPU_LIVE |
-                                           VIR_DOMAIN_VCPU_MAXIMUM));
-}
-
-/*
- * xenapiDomainGetXMLDesc
- *
- *
- * Returns XML string of the domain configuration on success or -1 in case of error
- */
-static char *
-xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
-{
-    xen_vm vm = NULL;
-    xen_vm_set *vms;
-    xen_string_string_map *result = NULL;
-    struct _xenapiPrivate *priv = dom->conn->privateData;
-    xen_session *session = priv->session;
-    virDomainDefPtr defPtr = NULL;
-    char *boot_policy = NULL;
-    unsigned long memory = 0;
-    int64_t dynamic_mem = 0;
-    char *val = NULL;
-    struct xen_vif_set *vif_set = NULL;
-    char *xml;
-    unsigned int vcpus;
-
-    /* Flags checked by virDomainDefFormat */
-
-    if (!xen_vm_get_by_name_label(session, &vms, dom->name))
-        return NULL;
-    if (vms->size != 1) {
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Domain name is not unique"));
-        xen_vm_set_free(vms);
-        return NULL;
-    }
-    if (VIR_ALLOC(defPtr) < 0) {
-        xen_vm_set_free(vms);
-        return NULL;
-    }
-    vm = vms->contents[0];
-    defPtr->virtType = VIR_DOMAIN_VIRT_XEN;
-    defPtr->id = dom->id;
-    memcpy(defPtr->uuid, dom->uuid, VIR_UUID_BUFLEN);
-    if (VIR_STRDUP(defPtr->name, dom->name) < 0)
-        goto error;
-    xen_vm_get_hvm_boot_policy(session, &boot_policy, vm);
-    if (STREQ(boot_policy, "BIOS order")) {
-        defPtr->os.type = VIR_DOMAIN_OSTYPE_HVM;
-        xen_vm_get_hvm_boot_params(session, &result, vm);
-        if (result != NULL) {
-            size_t i;
-            for (i = 0; i < result->size; i++) {
-                if (STREQ(result->contents[i].key, "order")) {
-                    int cnt = 0;
-                    while (result->contents[i].val[cnt] != '\0') {
-                        defPtr->os.bootDevs[cnt] = map2LibvirtBootOrder(result->contents[i].val[cnt]);
-                        cnt++;
-                    }
-                    defPtr->os.nBootDevs = cnt;
-                    break;
-                }
-            }
-            xen_string_string_map_free(result);
-        }
-        VIR_FREE(boot_policy);
-    } else {
-        char *value = NULL;
-        defPtr->os.type = VIR_DOMAIN_OSTYPE_XEN;
-        if (VIR_ALLOC(defPtr->os.loader) < 0 ||
-            VIR_STRDUP(defPtr->os.loader->path, "pygrub") < 0) {
-            VIR_FREE(boot_policy);
-            goto error;
-        }
-        xen_vm_get_pv_kernel(session, &value, vm);
-        if (STRNEQ(value, "")) {
-            if (VIR_STRDUP(defPtr->os.kernel, value) < 0) {
-                VIR_FREE(boot_policy);
-                VIR_FREE(value);
-                goto error;
-            }
-            VIR_FREE(value);
-        }
-        xen_vm_get_pv_ramdisk(session, &value, vm);
-        if (STRNEQ(value, "")) {
-            if (VIR_STRDUP(defPtr->os.initrd, value) < 0) {
-                VIR_FREE(boot_policy);
-                VIR_FREE(value);
-                goto error;
-            }
-            VIR_FREE(value);
-        }
-        xen_vm_get_pv_args(session, &value, vm);
-        if (STRNEQ(value, "")) {
-            if (VIR_STRDUP(defPtr->os.cmdline, value) < 0) {
-                VIR_FREE(boot_policy);
-                VIR_FREE(value);
-                goto error;
-            }
-            VIR_FREE(value);
-        }
-        VIR_FREE(boot_policy);
-        if (VIR_STRDUP(defPtr->os.bootloader, "pygrub") < 0)
-            goto error;
-    }
-    xen_vm_get_pv_bootloader_args(session, &val, vm);
-    if (STRNEQ(val, "")) {
-        if (VIR_STRDUP(defPtr->os.bootloaderArgs, val) < 0) {
-            VIR_FREE(val);
-            goto error;
-        }
-        VIR_FREE(val);
-    }
-    memory = xenapiDomainGetMaxMemory(dom);
-    virDomainDefSetMemoryTotal(defPtr, memory);
-    if (xen_vm_get_memory_dynamic_max(session, &dynamic_mem, vm)) {
-        defPtr->mem.cur_balloon = (unsigned long) (dynamic_mem / 1024);
-    } else {
-        defPtr->mem.cur_balloon = memory;
-    }
-
-    vcpus = xenapiDomainGetMaxVcpus(dom);
-
-    if (virDomainDefSetVcpusMax(defPtr, vcpus, priv->xmlopt) < 0)
-        goto error;
-
-    if (virDomainDefSetVcpus(defPtr, vcpus) < 0)
-        goto error;
-
-    enum xen_on_normal_exit action;
-    if (xen_vm_get_actions_after_shutdown(session, &action, vm))
-        defPtr->onPoweroff = xenapiNormalExitEnum2virDomainLifecycle(action);
-    if (xen_vm_get_actions_after_reboot(session, &action, vm))
-        defPtr->onReboot = xenapiNormalExitEnum2virDomainLifecycle(action);
-    enum xen_on_crash_behaviour crash;
-    if (xen_vm_get_actions_after_crash(session, &crash, vm))
-        defPtr->onCrash = xenapiCrashExitEnum2virDomainLifecycle(crash);
-    xen_vm_get_platform(session, &result, vm);
-    if (result != NULL) {
-        size_t i;
-        for (i = 0; i < result->size; i++) {
-            if (STREQ(result->contents[i].val, "true")) {
-                if (STREQ(result->contents[i].key, "acpi"))
-                    defPtr->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
-                else if (STREQ(result->contents[i].key, "apic"))
-                    defPtr->features[VIR_DOMAIN_FEATURE_APIC] = VIR_TRISTATE_SWITCH_ON;
-                else if (STREQ(result->contents[i].key, "pae"))
-                    defPtr->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON;
-                else if (STREQ(result->contents[i].key, "hap"))
-                    defPtr->features[VIR_DOMAIN_FEATURE_HAP] = VIR_TRISTATE_SWITCH_ON;
-                else if (STREQ(result->contents[i].key, "viridian"))
-                    defPtr->features[VIR_DOMAIN_FEATURE_VIRIDIAN] = VIR_TRISTATE_SWITCH_ON;
-            }
-        }
-        xen_string_string_map_free(result);
-    }
-    xen_vm_get_vifs(session, &vif_set, vm);
-    if (vif_set) {
-        size_t i;
-        xen_vif vif;
-        xen_vif_record *vif_rec = NULL;
-        xen_network network;
-        char *bridge = NULL;
-        defPtr->nnets = vif_set->size;
-        if (VIR_ALLOC_N(defPtr->nets, vif_set->size) < 0) {
-            xen_vif_set_free(vif_set);
-            goto error;
-        }
-        for (i = 0; i < vif_set->size; i++) {
-            if (VIR_ALLOC(defPtr->nets[i]) < 0) {
-                xen_vif_set_free(vif_set);
-                goto error;
-            }
-            defPtr->nets[i]->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
-            vif = vif_set->contents[i];
-            xen_vif_get_network(session, &network, vif);
-            if (network != NULL) {
-                xen_network_get_bridge(session, &bridge, network);
-                if (bridge != NULL)
-                    defPtr->nets[i]->data.bridge.brname = bridge;
-                xen_network_free(network);
-            }
-            xen_vif_get_record(session, &vif_rec, vif);
-            if (vif_rec != NULL) {
-                if (virMacAddrParse((const char *)vif_rec->mac,
-                                    &defPtr->nets[i]->mac) < 0)
-                    xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                              _("Unable to parse given mac address"));
-                xen_vif_record_free(vif_rec);
-            }
-        }
-        xen_vif_set_free(vif_set);
-    }
-    xen_vm_set_free(vms);
-    xml = virDomainDefFormat(defPtr, priv->caps, flags);
-    virDomainDefFree(defPtr);
-    return xml;
-
- error:
-    xen_vm_set_free(vms);
-    virDomainDefFree(defPtr);
-    return NULL;
-}
-
-/*
- * xenapiConnectListDefinedDomains
- *
- * list the defined but inactive domains, stores the pointers to the names in @names
- * Returns number of names provided in the array or -1 in case of error
- */
-static int
-xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names,
-                                int maxnames)
-{
-    size_t i, j;
-    int doms;
-    xen_vm_set *result;
-    xen_vm_record *record;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    xen_vm_get_all(session, &result);
-    memset(names, 0, sizeof(names[0])*maxnames);
-    if (result != NULL) {
-        for (i = 0, j = 0; i < result->size && j < maxnames; i++) {
-            xen_vm_get_record(session, &record, result->contents[i]);
-            if (record != NULL) {
-                if (record->is_a_template == 0) {
-                    char *usenames = NULL;
-                    if (VIR_STRDUP(usenames, record->name_label) < 0) {
-                        xen_vm_record_free(record);
-                        xen_vm_set_free(result);
-                        for (i = 0; i < maxnames; i++)
-                            VIR_FREE(names[j]);
-                        return -1;
-                    }
-                    names[j++] = usenames;
-                }
-                xen_vm_record_free(record);
-            } else {
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                          _("Couldn't get VM record"));
-                xen_vm_set_free(result);
-                for (i = 0; i < maxnames; i++)
-                    VIR_FREE(names[j]);
-                return -1;
-            }
-        }
-        doms = j;
-        xen_vm_set_free(result);
-        return doms;
-    }
-    xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return -1;
-}
-
-/*
- * xenapiConnectNumOfDefinedDomains
- *
- * Provides the number of defined but inactive domains
- * Returns number of domains found on success or -1 in case of error
- */
-static int
-xenapiConnectNumOfDefinedDomains(virConnectPtr conn)
-{
-    xen_vm_set *result;
-    xen_vm_record *record;
-    int DomNum = 0;
-    size_t i;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    xen_vm_get_all(session, &result);
-    if (result != NULL) {
-        for (i = 0; i < result->size; i++) {
-            xen_vm_get_record(session, &record, result->contents[i]);
-            if (record == NULL && !session->ok) {
-                xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-                xen_vm_set_free(result);
-                return -1;
-            }
-            if (record) {
-                if (record->is_a_template == 0)
-                    DomNum++;
-                xen_vm_record_free(record);
-            }
-        }
-        xen_vm_set_free(result);
-        return DomNum;
-    }
-    xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainCreateWithFlags
- *
- * starts a VM
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
-{
-    xen_vm_set *vms;
-    xen_vm vm;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    int64_t domid = -1;
-
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_start(session, vm, false, false)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-
-        xen_vm_get_domid(session, &domid, vm);
-        dom->id = domid;
-
-        xen_vm_set_free(vms);
-    } else {
-        if (vms)
-            xen_vm_set_free(vms);
-        xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-        return -1;
-    }
-    return 0;
-}
-
-/*
- * xenapiDomainCreate
- *
- * starts a VM
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainCreate(virDomainPtr dom)
-{
-    return xenapiDomainCreateWithFlags(dom, 0);
-}
-
-/*
- * xenapiDomainDefineXML
- *
- * Defines a domain from the given XML but does not start it
- * Returns 0 on success or -1 in case of error
- */
-static virDomainPtr
-xenapiDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags)
-{
-    struct _xenapiPrivate *priv = conn->privateData;
-    xen_vm_record *record = NULL;
-    xen_vm vm = NULL;
-    virDomainPtr domP = NULL;
-    unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
-
-    virCheckFlags(VIR_DOMAIN_DEFINE_VALIDATE, NULL);
-
-    if (flags & VIR_DOMAIN_DEFINE_VALIDATE)
-        parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
-
-    if (!priv->caps)
-        return NULL;
-    virDomainDefPtr defPtr = virDomainDefParseString(xml,
-                                                     priv->caps, priv->xmlopt,
-                                                     NULL,
-                                                     parse_flags);
-    if (!defPtr)
-        return NULL;
-
-    if (virXMLCheckIllegalChars("name", defPtr->name, "\n") < 0) {
-        virDomainDefFree(defPtr);
-        return NULL;
-    }
-
-    if (createVMRecordFromXml(conn, defPtr, &record, &vm) != 0) {
-        if (!priv->session->ok)
-            xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        else
-            xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Couldn't get VM information from XML"));
-        virDomainDefFree(defPtr);
-        return NULL;
-    }
-    if (record != NULL) {
-        unsigned char raw_uuid[VIR_UUID_BUFLEN];
-        ignore_value(virUUIDParse(record->uuid, raw_uuid));
-        domP = virGetDomain(conn, record->name_label, raw_uuid, -1);
-        if (!domP && !priv->session->ok)
-            xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL);
-        xen_vm_record_free(record);
-    }
-    else if (vm != NULL)
-        xen_vm_free(vm);
-    virDomainDefFree(defPtr);
-    return domP;
-}
-
-static virDomainPtr
-xenapiDomainDefineXML(virConnectPtr conn, const char *xml)
-{
-    return xenapiDomainDefineXMLFlags(conn, xml, 0);
-}
-
-/*
- * xenapiDomainUndefineFlags
- *
- * destroys a domain
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainUndefineFlags(virDomainPtr dom, unsigned int flags)
-{
-    struct xen_vm_set *vms;
-    xen_vm vm;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_destroy(session, vm)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-static int
-xenapiDomainUndefine(virDomainPtr dom)
-{
-    return xenapiDomainUndefineFlags(dom, 0);
-}
-
-/*
- * xenapiDomainGetAutostart
- *
- * Provides a boolean value indicating whether the domain configured
- * to be automatically started when the host machine boots
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainGetAutostart(virDomainPtr dom, int *autostart)
-{
-    size_t i;
-    int flag = 0;
-    xen_vm_set *vms;
-    xen_vm vm;
-    xen_string_string_map *result;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        if (!xen_vm_get_other_config(session, &result, vm)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        for (i = 0; i < result->size; i++) {
-            if (STREQ(result->contents[i].key, "auto_poweron")) {
-                flag = 1;
-                if (STREQ(result->contents[i].val, "true"))
-                    *autostart = 1;
-                else
-                    *autostart = 0;
-                break;
-            }
-        }
-        xen_vm_set_free(vms);
-        xen_string_string_map_free(result);
-        if (flag == 0)
-            return -1;
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/*
- * xenapiDomainSetAutostart
- *
- * Configure the domain to be automatically started when the host machine boots
- * Return 0 on success or -1 in case of error
- */
-static int
-xenapiDomainSetAutostart(virDomainPtr dom, int autostart)
-{
-    xen_vm_set *vms;
-    xen_vm vm;
-    char *value;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        vm = vms->contents[0];
-        xen_vm_remove_from_other_config(session, vm, (char *)"auto_poweron");
-        if (autostart == 1)
-            value = (char *)"true";
-        else
-            value = (char *)"false";
-        if (!xen_vm_add_to_other_config(session, vm, (char *)"auto_poweron", value)) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL);
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-static char *
-xenapiDomainGetSchedulerType(virDomainPtr dom ATTRIBUTE_UNUSED, int *nparams)
-{
-    char *result = NULL;
-
-    if (nparams)
-        *nparams = 0;
-    ignore_value(VIR_STRDUP(result, "credit"));
-    return result;
-}
-
-/*
- * xenapiNodeGetFreeMemory
- *
- * provides the free memory available on the Node
- * Returns memory size on success or 0 in case of error
- */
-static unsigned long long
-xenapiNodeGetFreeMemory(virConnectPtr conn)
-{
-    xen_host_metrics_set *xen_met_set;
-    unsigned long long freeMem = 0;
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    xen_host_metrics_get_all(session, &xen_met_set);
-    if (xen_met_set != NULL) {
-        if (!xen_host_metrics_get_memory_free(session, (int64_t *)&freeMem, xen_met_set->contents[0])) {
-            xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Couldn't get host metrics - memory information"));
-            freeMem = 0;
-        }
-        xen_host_metrics_set_free(xen_met_set);
-    } else {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR,
-                                  _("Couldn't get host metrics"));
-    }
-    return freeMem;
-}
-
-static int
-xenapiDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED)
-{
-    return 0;
-}
-
-/*
- * xenapiNodeGetCellsFreeMemory
- *
- *
- * Returns the number of entries filled in freeMems, or -1 in case of error.
- */
-static int
-xenapiNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems,
-                             int startCell, int maxCells)
-{
-    if (maxCells > 1 && startCell > 0) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_NO_SUPPORT, NULL);
-        return -1;
-    } else {
-        freeMems[0] = xenapiNodeGetFreeMemory(conn);
-        return 1;
-    }
-}
-
-static int
-xenapiConnectIsAlive(virConnectPtr conn)
-{
-    struct _xenapiPrivate *priv = conn->privateData;
-
-    if (priv->session && priv->session->ok)
-        return 1;
-    else
-        return 0;
-}
-
-static int
-xenapiDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
-{
-    struct xen_vm_set *vms;
-    xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session;
-
-    virCheckFlags(0, -1);
-
-    if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) {
-        if (vms->size != 1) {
-            xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("Domain name is not unique"));
-            xen_vm_set_free(vms);
-            return -1;
-        }
-        xen_vm_set_free(vms);
-        return 0;
-    }
-    if (vms)
-        xen_vm_set_free(vms);
-    xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL);
-    return -1;
-}
-
-/* The interface which we export upwards to libvirt.c. */
-static virHypervisorDriver xenapiHypervisorDriver = {
-    .name = "XenAPI",
-    .connectOpen = xenapiConnectOpen, /* 0.8.0 */
-    .connectClose = xenapiConnectClose, /* 0.8.0 */
-    .connectSupportsFeature = xenapiConnectSupportsFeature, /* 0.8.0 */
-    .connectGetType = xenapiConnectGetType, /* 0.8.0 */
-    .connectGetVersion = xenapiConnectGetVersion, /* 0.8.0 */
-    .connectGetHostname = xenapiConnectGetHostname, /* 0.8.0 */
-    .connectGetMaxVcpus = xenapiConnectGetMaxVcpus, /* 0.8.0 */
-    .nodeGetInfo = xenapiNodeGetInfo, /* 0.8.0 */
-    .connectGetCapabilities = xenapiConnectGetCapabilities, /* 0.8.0 */
-    .connectListDomains = xenapiConnectListDomains, /* 0.8.0 */
-    .connectNumOfDomains = xenapiConnectNumOfDomains, /* 0.8.0 */
-    .domainCreateXML = xenapiDomainCreateXML, /* 0.8.0 */
-    .domainLookupByID = xenapiDomainLookupByID, /* 0.8.0 */
-    .domainLookupByUUID = xenapiDomainLookupByUUID, /* 0.8.0 */
-    .domainLookupByName = xenapiDomainLookupByName, /* 0.8.0 */
-    .domainSuspend = xenapiDomainSuspend, /* 0.8.0 */
-    .domainResume = xenapiDomainResume, /* 0.8.0 */
-    .domainShutdown = xenapiDomainShutdown, /* 0.8.0 */
-    .domainShutdownFlags = xenapiDomainShutdownFlags, /* 0.9.10 */
-    .domainReboot = xenapiDomainReboot, /* 0.8.0 */
-    .domainDestroy = xenapiDomainDestroy, /* 0.8.0 */
-    .domainDestroyFlags = xenapiDomainDestroyFlags, /* 0.9.4 */
-    .domainGetOSType = xenapiDomainGetOSType, /* 0.8.0 */
-    .domainGetMaxMemory = xenapiDomainGetMaxMemory, /* 0.8.0 */
-    .domainSetMaxMemory = xenapiDomainSetMaxMemory, /* 0.8.0 */
-    .domainGetInfo = xenapiDomainGetInfo, /* 0.8.0 */
-    .domainGetState = xenapiDomainGetState, /* 0.9.2 */
-    .domainSetVcpus = xenapiDomainSetVcpus, /* 0.8.0 */
-    .domainSetVcpusFlags = xenapiDomainSetVcpusFlags, /* 0.8.5 */
-    .domainGetVcpusFlags = xenapiDomainGetVcpusFlags, /* 0.8.5 */
-    .domainPinVcpu = xenapiDomainPinVcpu, /* 0.8.0 */
-    .domainGetVcpus = xenapiDomainGetVcpus, /* 0.8.0 */
-    .domainGetMaxVcpus = xenapiDomainGetMaxVcpus, /* 0.8.0 */
-    .domainGetXMLDesc = xenapiDomainGetXMLDesc, /* 0.8.0 */
-    .connectListDefinedDomains = xenapiConnectListDefinedDomains, /* 0.8.0 */
-    .connectNumOfDefinedDomains = xenapiConnectNumOfDefinedDomains, /* 0.8.0 */
-    .domainCreate = xenapiDomainCreate, /* 0.8.0 */
-    .domainCreateWithFlags = xenapiDomainCreateWithFlags, /* 0.8.2 */
-    .domainDefineXML = xenapiDomainDefineXML, /* 0.8.0 */
-    .domainDefineXMLFlags = xenapiDomainDefineXMLFlags, /* 1.2.12 */
-    .domainUndefine = xenapiDomainUndefine, /* 0.8.0 */
-    .domainUndefineFlags = xenapiDomainUndefineFlags, /* 0.9.5 */
-    .domainGetAutostart = xenapiDomainGetAutostart, /* 0.8.0 */
-    .domainSetAutostart = xenapiDomainSetAutostart, /* 0.8.0 */
-    .domainGetSchedulerType = xenapiDomainGetSchedulerType, /* 0.8.0 */
-    .nodeGetCellsFreeMemory = xenapiNodeGetCellsFreeMemory, /* 0.8.0 */
-    .nodeGetFreeMemory = xenapiNodeGetFreeMemory, /* 0.8.0 */
-    .domainIsUpdated = xenapiDomainIsUpdated, /* 0.8.6 */
-    .connectIsAlive = xenapiConnectIsAlive, /* 0.9.8 */
-    .domainHasManagedSaveImage = xenapiDomainHasManagedSaveImage, /* 1.2.13 */
-};
-
-
-static virConnectDriver xenapiConnectDriver = {
-    .uriSchemes = (const char *[]){ "xenapi", NULL },
-    .hypervisorDriver = &xenapiHypervisorDriver,
-};
-
-/**
- * xenapiRegister:
- *
- *
- * Returns the driver priority or -1 in case of error.
- */
-int
-xenapiRegister(void)
-{
-    return virRegisterConnectDriver(&xenapiConnectDriver,
-                                    false);
-}
-
-/*
- * write_func
- * used by curl to read data from the server
- */
-size_t
-write_func(void *ptr, size_t size, size_t nmemb, void *comms_)
-{
-    xen_comms *comms = comms_;
-    size_t n = size * nmemb;
-#ifdef PRINT_XML
-    printf("\n\n---Result from server -----------------------\n");
-    printf("%s\n", (char*) ptr);
-    fflush(stdout);
-#endif
-    return (size_t) (comms->func(ptr, n, comms->handle) ? n : 0);
-}
-
-/*
- * call_func
- * sets curl options, used with xen_session_login_with_password
- */
-int
-call_func(const void *data, size_t len, void *user_handle,
-          void *result_handle, xen_result_func result_func)
-{
-    struct _xenapiPrivate *priv = (struct _xenapiPrivate *)user_handle;
-#ifdef PRINT_XML
-    printf("\n\n---Data to server: -----------------------\n");
-    printf("%s\n", (char*) data);
-    fflush(stdout);
-#endif
-    CURL *curl = curl_easy_init();
-    if (!curl)
-      return -1;
-    xen_comms comms = {
-     .func = result_func,
-     .handle = result_handle
-    };
-    curl_easy_setopt(curl, CURLOPT_URL, priv->url);
-    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
-#ifdef CURLOPT_MUTE
-    curl_easy_setopt(curl, CURLOPT_MUTE, 1);
-#endif
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_func);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &comms);
-    curl_easy_setopt(curl, CURLOPT_POST, 1);
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, priv->noVerify?0:1);
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, priv->noVerify?0:2);
-    CURLcode result = curl_easy_perform(curl);
-    curl_easy_cleanup(curl);
-    return result;
-}
diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h
deleted file mode 100644
index f126dcbed6..0000000000
--- a/src/xenapi/xenapi_driver.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * xenapi_driver.h: Xen API driver header file to be included in libvirt.c.
- * Copyright (C) 2009, 2010 Citrix Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-int xenapiRegister(void);
diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h
deleted file mode 100644
index 276bc7c516..0000000000
--- a/src/xenapi/xenapi_driver_private.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * xenapi_driver_private.h: Xen API driver's private header file.
- * Copyright (C) 2009, 2010 Citrix Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <libxml/tree.h>
-#include <xen/api/xen_common.h>
-#include "virerror.h"
-
-/*# define PRINT_XML*/
-#define VIR_FROM_THIS VIR_FROM_XENAPI
-#define LIBVIRT_MODELNAME_LEN  (32)
-#define xenapiSessionErrorHandler(conn, errNum, buf) \
-    xenapiSessionErrorHandle(conn, errNum, buf, \
-                             __FILE__, __FUNCTION__, __LINE__)
-
-void
-xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum,
-                         const char *buf, const char *filename,
-                         const char *func, size_t lineno);
-
-typedef struct
-{
-    xen_result_func func;
-    void *handle;
-} xen_comms;
-
-
-int
-call_func(const void *data, size_t len, void *user_handle,
-          void *result_handle, xen_result_func result_func);
-size_t
-write_func(void *ptr, size_t size, size_t nmemb, void *comms);
-
-/* xenAPI driver's private data structure */
-struct _xenapiPrivate {
-    xen_session *session;
-    char *url;
-    int noVerify;
-    virCapsPtr caps;
-    virDomainXMLOptionPtr xmlopt;
-};
diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
deleted file mode 100644
index 4791f06945..0000000000
--- a/src/xenapi/xenapi_utils.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * xenapi_utils.c: Xen API driver -- utils parts.
- * Copyright (C) 2011-2014 Red Hat, Inc.
- * Copyright (C) 2009, 2010 Citrix Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-
-#include <xen/api/xen_all.h>
-#include "internal.h"
-#include "domain_conf.h"
-#include "virerror.h"
-#include "datatypes.h"
-#include "viruuid.h"
-#include "viralloc.h"
-#include "virbuffer.h"
-#include "virlog.h"
-#include "viruri.h"
-#include "xenapi_driver_private.h"
-#include "xenapi_utils.h"
-#include "virstring.h"
-
-VIR_LOG_INIT("xenapi.xenapi_utils");
-
-void
-xenSessionFree(xen_session *session)
-{
-    size_t i;
-    char *tmp;
-    if (session->error_description != NULL) {
-        for (i = 0; i < session->error_description_count; i++)
-            VIR_FREE(session->error_description[i]);
-        VIR_FREE(session->error_description);
-    }
-    /* The session_id member is type of 'const char *'. Sigh. */
-    tmp = (char *)session->session_id;
-    VIR_FREE(tmp);
-    VIR_FREE(session);
-}
-
-char *
-xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
-                        const char *hostname)
-{
-    unsigned int ncred;
-    virConnectCredential cred;
-    char *prompt;
-
-    memset(&cred, 0, sizeof(virConnectCredential));
-
-    if (virAsprintf(&prompt, "Enter %s password for %s", username,
-                    hostname) < 0) {
-        return NULL;
-    }
-
-    for (ncred = 0; ncred < auth->ncredtype; ncred++) {
-        if (auth->credtype[ncred] != VIR_CRED_PASSPHRASE &&
-            auth->credtype[ncred] != VIR_CRED_NOECHOPROMPT) {
-            continue;
-        }
-
-        cred.type = auth->credtype[ncred];
-        cred.prompt = prompt;
-        cred.challenge = hostname;
-        cred.defresult = NULL;
-        cred.result = NULL;
-        cred.resultlen = 0;
-
-        if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0)
-            VIR_FREE(cred.result);
-
-        break;
-    }
-
-    VIR_FREE(prompt);
-
-    return cred.result;
-}
-
-int
-xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify)
-{
-    int result = 0;
-    size_t i;
-
-    for (i = 0; i < uri->paramsCount; i++) {
-        virURIParamPtr queryParam = &uri->params[i];
-        if (STRCASEEQ(queryParam->name, "no_verify")) {
-            if (noVerify == NULL)
-                continue;
-            if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 ||
-                (*noVerify != 0 && *noVerify != 1)) {
-                xenapiSessionErrorHandler(conn, VIR_ERR_INVALID_ARG,
-      _("Query parameter 'no_verify' has unexpected value (should be 0 or 1)"));
-                goto failure;
-            }
-        }
-    }
-
- cleanup:
-
-    return result;
-
- failure:
-    result = -1;
-
-    goto cleanup;
-}
-
-
-
-enum xen_on_normal_exit
-actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action)
-{
-    enum xen_on_normal_exit num = XEN_ON_NORMAL_EXIT_RESTART;
-    if (action == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY)
-        num = XEN_ON_NORMAL_EXIT_DESTROY;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART)
-        num = XEN_ON_NORMAL_EXIT_RESTART;
-    return num;
-}
-
-
-enum xen_on_crash_behaviour
-actionCrashLibvirt2XenapiEnum(virDomainLifecycleAction action)
-{
-    enum xen_on_crash_behaviour num = XEN_ON_CRASH_BEHAVIOUR_RESTART;
-    if (action == VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY)
-        num = XEN_ON_CRASH_BEHAVIOUR_DESTROY;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART)
-        num = XEN_ON_CRASH_BEHAVIOUR_RESTART;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE)
-        num = XEN_ON_CRASH_BEHAVIOUR_PRESERVE;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME)
-        num = XEN_ON_CRASH_BEHAVIOUR_RENAME_RESTART;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY)
-        num = XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_DESTROY;
-    else if (action == VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART)
-        num = XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_RESTART;
-    return num;
-}
-
-/* generate XenAPI boot order format from libvirt format */
-char *
-createXenAPIBootOrderString(int nboot, int *bootDevs)
-{
-    virBuffer ret = VIR_BUFFER_INITIALIZER;
-    char *val = NULL;
-    size_t i;
-    for (i = 0; i < nboot; i++) {
-        if (bootDevs[i] == VIR_DOMAIN_BOOT_FLOPPY)
-            val = (char *)"a";
-        else if (bootDevs[i] == VIR_DOMAIN_BOOT_DISK)
-            val = (char *)"c";
-        else if (bootDevs[i] == VIR_DOMAIN_BOOT_CDROM)
-            val = (char *)"d";
-        else if (bootDevs[i] == VIR_DOMAIN_BOOT_NET)
-            val = (char *)"n";
-        if (val)
-            virBufferEscapeString(&ret, "%s", val);
-    }
-    return virBufferContentAndReset(&ret);
-}
-
-/* convert boot order string to libvirt boot order enum */
-virDomainBootOrder
-map2LibvirtBootOrder(char c)
-{
-    switch (c) {
-    case 'a':
-        return VIR_DOMAIN_BOOT_FLOPPY;
-    case 'c':
-        return VIR_DOMAIN_BOOT_DISK;
-    case 'd':
-        return VIR_DOMAIN_BOOT_CDROM;
-    case 'n':
-        return VIR_DOMAIN_BOOT_NET;
-    default:
-        return -1;
-    }
-}
-
-virDomainLifecycleAction
-xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action)
-{
-    virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
-    if (action == XEN_ON_NORMAL_EXIT_DESTROY)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
-    else if (action == XEN_ON_NORMAL_EXIT_RESTART)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
-    return num;
-}
-
-
-virDomainLifecycleAction
-xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action)
-{
-    virDomainLifecycleAction num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
-    if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY;
-    else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART;
-    else if (action == XEN_ON_CRASH_BEHAVIOUR_PRESERVE)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE;
-    else if (action == XEN_ON_CRASH_BEHAVIOUR_RENAME_RESTART)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME;
-    else if (action == XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_DESTROY)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY;
-    else if (action == XEN_ON_CRASH_BEHAVIOUR_COREDUMP_AND_RESTART)
-        num = VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART;
-    return num;
-}
-
-
-
-/* returns 'file' or 'block' for the storage type */
-int
-getStorageVolumeType(char *type)
-{
-    if (STREQ(type, "lvmoiscsi") ||
-        STREQ(type, "lvmohba") ||
-        STREQ(type, "lvm") ||
-        STREQ(type, "file") ||
-        STREQ(type, "iso") ||
-        STREQ(type, "ext") ||
-        STREQ(type, "nfs"))
-        return (int)VIR_STORAGE_VOL_FILE;
-    else if (STREQ(type, "iscsi") ||
-             STREQ(type, "equal") ||
-             STREQ(type, "hba") ||
-             STREQ(type, "cslg") ||
-             STREQ(type, "udev") ||
-             STREQ(type, "netapp"))
-        return (int)VIR_STORAGE_VOL_BLOCK;
-    return -1;
-}
-
-/* returns error description if any received from the server */
-char *
-returnErrorFromSession(xen_session *session)
-{
-    size_t i;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
-    for (i = 0; i < session->error_description_count; i++) {
-        if (!i)
-            virBufferEscapeString(&buf, "%s", session->error_description[i]);
-        else
-            virBufferEscapeString(&buf, " : %s", session->error_description[i]);
-    }
-    if (virBufferUse(&buf) < 1)
-        virBufferAdd(&buf, _("unknown error"), -1);
-    return virBufferContentAndReset(&buf);
-}
-
-/* converts bitmap to string of the form '1,2...' */
-char *
-mapDomainPinVcpu(unsigned char *cpumap, int maplen)
-{
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
-    size_t len;
-    char *ret = NULL;
-    size_t i, j;
-    for (i = 0; i < maplen; i++) {
-        for (j = 0; j < 8; j++) {
-            if (cpumap[i] & (1 << j))
-                virBufferAsprintf(&buf, "%zu,", (8*i)+j);
-        }
-    }
-    if (virBufferCheckError(&buf) < 0)
-        return NULL;
-    ret = virBufferContentAndReset(&buf);
-    len = strlen(ret);
-    if (len > 0 && ret[len - 1] == ',')
-        ret[len - 1] = 0;
-    return ret;
-}
-
-/* obtains the CPU bitmap from the string passed */
-void
-getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen)
-{
-    int pos;
-    int max_bits = maplen * 8;
-    char *num = NULL, *bp = NULL;
-    bzero(cpumap, maplen);
-    num = strtok_r(mask, ",", &bp);
-    while (num != NULL) {
-        if (virStrToLong_i(num, NULL, 10, &pos) < 0)
-            return;
-        if (pos < 0 || pos > max_bits - 1)
-            VIR_WARN("number in str %d exceeds cpumap's max bits %d", pos, max_bits);
-        else
-            (cpumap)[pos / 8] |= (1 << (pos % 8));
-        num = strtok_r(NULL, ",", &bp);
-    }
-}
-
-
-/* mapping XenServer power state to Libvirt power state */
-virDomainState
-mapPowerState(enum xen_vm_power_state state)
-{
-    virDomainState virState;
-    switch (state) {
-    case XEN_VM_POWER_STATE_HALTED:
-    case XEN_VM_POWER_STATE_SUSPENDED:
-        virState = VIR_DOMAIN_SHUTOFF;
-        break;
-    case XEN_VM_POWER_STATE_PAUSED:
-        virState = VIR_DOMAIN_PAUSED;
-        break;
-    case XEN_VM_POWER_STATE_RUNNING:
-        virState = VIR_DOMAIN_RUNNING;
-        break;
-    case XEN_VM_POWER_STATE_UNDEFINED:
-    default:
-        /* Includes XEN_VM_POWER_STATE_UNKNOWN from libxenserver
-         * 5.5.0, which is gone in 5.6.0.  */
-        virState = VIR_DOMAIN_NOSTATE;
-        break;
-    }
-    return virState;
-}
-
-/* allocate a flexible array and fill values(key,val) */
-int
-allocStringMap(xen_string_string_map **strings, char *key, char *val)
-{
-    int sz = ((*strings) == NULL) ? 0 : (*strings)->size;
-    sz++;
-    if (VIR_REALLOC_N(*strings, sizeof(xen_string_string_map) +
-                                sizeof(xen_string_string_map_contents) * sz) < 0)
-        return -1;
-    (*strings)->size = sz;
-    if (VIR_STRDUP((*strings)->contents[sz-1].key, key) < 0 ||
-        VIR_STRDUP((*strings)->contents[sz-1].val, val) < 0)
-        goto error;
-    return 0;
- error:
-    xen_string_string_map_free(*strings);
-    return -1;
-}
-
-/* Error handling function returns error messages from the server if any */
-void
-xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum,
-                         const char *buf, const char *filename, const char *func,
-                         size_t lineno)
-{
-    struct _xenapiPrivate *priv = conn->privateData;
-
-    if (buf == NULL && priv != NULL && priv->session != NULL) {
-        char *ret = returnErrorFromSession(priv->session);
-        virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno,
-                             "%s", ret);
-        xen_session_clear_error(priv->session);
-        VIR_FREE(ret);
-    } else {
-        virReportErrorHelper(VIR_FROM_XENAPI, errNum, filename, func, lineno,
-                             "%s", buf);
-    }
-}
-
-/* creates network intereface for VM */
-static int
-createVifNetwork(virConnectPtr conn, xen_vm vm, int device,
-                 char *bridge, char *mac)
-{
-    xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session;
-    xen_vm xvm = NULL;
-    char *uuid = NULL;
-    xen_vm_get_uuid(session, &uuid, vm);
-    if (uuid) {
-        if (!xen_vm_get_by_uuid(session, &xvm, uuid))
-            return -1;
-        VIR_FREE(uuid);
-    }
-    xen_vm_record_opt *vm_opt = xen_vm_record_opt_alloc();
-    vm_opt->is_record = 0;
-    vm_opt->u.handle = xvm;
-    xen_network_set *net_set = NULL;
-    xen_network_record *net_rec = NULL;
-    int cnt = 0;
-    if (!xen_network_get_all(session, &net_set)) {
-        xen_vm_record_opt_free(vm_opt);
-        return -1;
-    }
-    for (cnt = 0; cnt < net_set->size; cnt++) {
-        if (xen_network_get_record(session, &net_rec, net_set->contents[cnt])) {
-            if (STREQ(net_rec->bridge, bridge)) {
-                break;
-            } else {
-                xen_network_record_free(net_rec);
-            }
-        }
-    }
-    if (cnt < net_set->size && net_rec) {
-        xen_network network = NULL;
-        xen_network_get_by_uuid(session, &network, net_rec->uuid);
-        xen_network_record_opt *network_opt = xen_network_record_opt_alloc();
-        network_opt->is_record = 0;
-        network_opt->u.handle = network;
-        xen_vif_record *vif_record = xen_vif_record_alloc();
-        vif_record->mac = mac;
-        vif_record->vm = vm_opt;
-        vif_record->network = network_opt;
-        xen_vif vif = NULL;
-
-        vif_record->other_config = xen_string_string_map_alloc(0);
-        vif_record->runtime_properties = xen_string_string_map_alloc(0);
-        vif_record->qos_algorithm_params = xen_string_string_map_alloc(0);
-        if (virAsprintfQuiet(&vif_record->device, "%d", device) < 0) {
-            xen_vif_record_free(vif_record);
-            xen_network_record_free(net_rec);
-            xen_network_set_free(net_set);
-            return -1;
-        }
-        xen_vif_create(session, &vif, vif_record);
-        if (!vif) {
-            xen_vif_free(vif);
-            xen_vif_record_free(vif_record);
-            xen_network_record_free(net_rec);
-            xen_network_set_free(net_set);
-            return 0;
-        }
-        xen_vif_record_free(vif_record);
-        xen_network_record_free(net_rec);
-    }
-    xen_network_set_free(net_set);
-    return -1;
-}
-
-/* Create a VM record from the XML description */
-int
-createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def,
-                      xen_vm_record **record, xen_vm *vm)
-{
-    char uuidStr[VIR_UUID_STRING_BUFLEN];
-    xen_string_string_map *strings = NULL;
-    int device_number = 0;
-    size_t i;
-
-    *record = xen_vm_record_alloc();
-    if (VIR_STRDUP((*record)->name_label, def->name) < 0)
-        goto error;
-    virUUIDFormat(def->uuid, uuidStr);
-    if (VIR_STRDUP((*record)->uuid, uuidStr) < 0)
-        goto error;
-    if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
-        char *boot_order = NULL;
-        if (VIR_STRDUP((*record)->hvm_boot_policy, "BIOS order") < 0)
-            goto error;
-        if (def->os.nBootDevs != 0)
-            boot_order = createXenAPIBootOrderString(def->os.nBootDevs, &def->os.bootDevs[0]);
-        if (boot_order != NULL) {
-            xen_string_string_map *hvm_boot_params = NULL;
-            allocStringMap(&hvm_boot_params, (char *)"order", boot_order);
-            (*record)->hvm_boot_params = hvm_boot_params;
-            VIR_FREE(boot_order);
-        }
-    } else if (def->os.type == VIR_DOMAIN_OSTYPE_XEN) {
-        if (VIR_STRDUP((*record)->pv_bootloader, "pygrub") < 0)
-            goto error;
-        if (def->os.kernel) {
-            if (VIR_STRDUP((*record)->pv_kernel, def->os.kernel) < 0)
-                goto error;
-        }
-        if (def->os.initrd) {
-            if (VIR_STRDUP((*record)->pv_ramdisk, def->os.initrd) < 0)
-                goto error;
-        }
-        if (def->os.cmdline) {
-            if (VIR_STRDUP((*record)->pv_args, def->os.cmdline) < 0)
-                goto error;
-        }
-        (*record)->hvm_boot_params = xen_string_string_map_alloc(0);
-    }
-    if (def->os.bootloaderArgs)
-        if (VIR_STRDUP((*record)->pv_bootloader_args, def->os.bootloaderArgs) < 0)
-            goto error;
-
-    if (def->mem.cur_balloon)
-        (*record)->memory_static_max = (int64_t) (def->mem.cur_balloon * 1024);
-    if (virDomainDefGetMemoryTotal(def))
-        (*record)->memory_dynamic_max = (int64_t) (virDomainDefGetMemoryTotal(def) * 1024);
-    else
-        (*record)->memory_dynamic_max = (*record)->memory_static_max;
-
-    if (virDomainDefGetVcpusMax(def) > 0) {
-        (*record)->vcpus_max = (int64_t) virDomainDefGetVcpusMax(def);
-        (*record)->vcpus_at_startup = (int64_t) virDomainDefGetVcpus(def);
-    }
-    if (def->onPoweroff)
-        (*record)->actions_after_shutdown = actionShutdownLibvirt2XenapiEnum(def->onPoweroff);
-    if (def->onReboot)
-        (*record)->actions_after_reboot = actionShutdownLibvirt2XenapiEnum(def->onReboot);
-    if (def->onCrash)
-        (*record)->actions_after_crash = actionCrashLibvirt2XenapiEnum(def->onCrash);
-
-    if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON)
-        allocStringMap(&strings, (char *)"acpi", (char *)"true");
-    if (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_TRISTATE_SWITCH_ON)
-        allocStringMap(&strings, (char *)"apic", (char *)"true");
-    if (def->features[VIR_DOMAIN_FEATURE_PAE] == VIR_TRISTATE_SWITCH_ON)
-        allocStringMap(&strings, (char *)"pae", (char *)"true");
-    if (def->features[VIR_DOMAIN_FEATURE_HAP] == VIR_TRISTATE_SWITCH_ON)
-        allocStringMap(&strings, (char *)"hap", (char *)"true");
-    if (def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] == VIR_TRISTATE_SWITCH_ON)
-        allocStringMap(&strings, (char *)"viridian", (char *)"true");
-    if (strings != NULL)
-        (*record)->platform = strings;
-
-    (*record)->vcpus_params = xen_string_string_map_alloc(0);
-    (*record)->other_config = xen_string_string_map_alloc(0);
-    (*record)->last_boot_cpu_flags = xen_string_string_map_alloc(0);
-    (*record)->xenstore_data = xen_string_string_map_alloc(0);
-    (*record)->hvm_shadow_multiplier = 1.000;
-    if (!xen_vm_create(((struct _xenapiPrivate *)(conn->privateData))->session,
-                        vm, *record)) {
-        xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL);
-        return -1;
-    }
-
-    for (i = 0; i < def->nnets; i++) {
-        if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
-            def->nets[i]->data.bridge.brname) {
-            char *mac;
-
-            if (VIR_ALLOC_N(mac, VIR_MAC_STRING_BUFLEN) < 0)
-                goto error;
-            virMacAddrFormat(&def->nets[i]->mac, mac);
-
-            if (createVifNetwork(conn, *vm, device_number,
-                                 def->nets[i]->data.bridge.brname,
-                                 mac) < 0) {
-                VIR_FREE(mac);
-                virReportOOMError();
-                goto error;
-            }
-            device_number++;
-        }
-    }
-    return 0;
-
- error:
-    xen_vm_record_free(*record);
-    return -1;
-}
diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h
deleted file mode 100644
index e394197bfd..0000000000
--- a/src/xenapi/xenapi_utils.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * xenapi_utils.h: Xen API driver -- utils header
- * Copyright (C) 2012, Red Hat, Inc.
- * Copyright (C) 2009, 2010 Citrix Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <xen/api/xen_all.h>
-#include "internal.h"
-#include "viruri.h"
-#include "domain_conf.h"
-
-#define NETWORK_DEVID_SIZE  (12)
-
-typedef uint64_t cpumap_t;
-
-void
-xenSessionFree(xen_session *session);
-
-char *
-xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username,
-                           const char *hostname);
-
-int
-xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify);
-
-enum xen_on_normal_exit
-actionShutdownLibvirt2XenapiEnum(virDomainLifecycleAction action);
-
-enum xen_on_crash_behaviour
-actionCrashLibvirt2XenapiEnum(virDomainLifecycleAction action);
-
-char *
-createXenAPIBootOrderString(int nboot, int *bootDevs);
-
-virDomainBootOrder map2LibvirtBootOrder(char c);
-
-virDomainLifecycleAction
-xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action);
-
-virDomainLifecycleAction
-xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action);
-
-void getCpuBitMapfromString(char *mask, unsigned char *cpumap, int maplen);
-
-int getStorageVolumeType(char *type);
-
-char *returnErrorFromSession(xen_session *session);
-
-virDomainState
-mapPowerState(enum xen_vm_power_state state);
-
-char *
-mapDomainPinVcpu(unsigned char *cpumap, int maplen);
-
-int
-createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr defPtr,
-                       xen_vm_record **record, xen_vm *vm);
-
-int
-allocStringMap (xen_string_string_map **strings, char *key, char *val);
diff --git a/tools/virsh.c b/tools/virsh.c
index 692a1ff16d..e76d242ec8 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -536,9 +536,6 @@ virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
 #ifdef WITH_HYPERV
     vshPrint(ctl, " Hyper-V");
 #endif
-#ifdef WITH_XENAPI
-    vshPrint(ctl, " XenAPI");
-#endif
 #ifdef WITH_BHYVE
     vshPrint(ctl, " Bhyve");
 #endif
-- 
2.22.0





More information about the libvir-list mailing list