diff options
author | Matthew Fioravante <matthew.fioravante@jhuapl.edu> | 2012-11-19 12:59:50 +0000 |
---|---|---|
committer | Matthew Fioravante <matthew.fioravante@jhuapl.edu> | 2012-11-19 12:59:50 +0000 |
commit | bdc02bfb7bdad347f8e256bb767dfeca4975b4a4 (patch) | |
tree | 01bf3618d5253d5d6036908d2f9a318198c39814 /tools/libxen/include | |
parent | 3b1c654c9a92a07c0b32b2bf313e0a01b371a5e8 (diff) | |
download | xen-bdc02bfb7bdad347f8e256bb767dfeca4975b4a4.tar.gz xen-bdc02bfb7bdad347f8e256bb767dfeca4975b4a4.tar.bz2 xen-bdc02bfb7bdad347f8e256bb767dfeca4975b4a4.zip |
tools: Remove old vtpm stuff from tools/libxen
Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxen/include')
-rw-r--r-- | tools/libxen/include/xen/api/xen_all.h | 1 | ||||
-rw-r--r-- | tools/libxen/include/xen/api/xen_vm.h | 9 | ||||
-rw-r--r-- | tools/libxen/include/xen/api/xen_vtpm.h | 218 | ||||
-rw-r--r-- | tools/libxen/include/xen/api/xen_vtpm_decl.h | 31 |
4 files changed, 0 insertions, 259 deletions
diff --git a/tools/libxen/include/xen/api/xen_all.h b/tools/libxen/include/xen/api/xen_all.h index 52113c7795..45ac1715b8 100644 --- a/tools/libxen/include/xen/api/xen_all.h +++ b/tools/libxen/include/xen/api/xen_all.h @@ -35,7 +35,6 @@ #include <xen/api/xen_vm.h> #include <xen/api/xen_vm_metrics.h> #include <xen/api/xen_vm_power_state.h> -#include <xen/api/xen_vtpm.h> #include <xen/api/xen_xspolicy.h> #include <xen/api/xen_cpu_pool.h> #endif diff --git a/tools/libxen/include/xen/api/xen_vm.h b/tools/libxen/include/xen/api/xen_vm.h index de554fc50c..8be7d2b67b 100644 --- a/tools/libxen/include/xen/api/xen_vm.h +++ b/tools/libxen/include/xen/api/xen_vm.h @@ -33,7 +33,6 @@ #include <xen/api/xen_vm_guest_metrics_decl.h> #include <xen/api/xen_vm_metrics_decl.h> #include <xen/api/xen_vm_power_state.h> -#include <xen/api/xen_vtpm_decl.h> #include <xen/api/xen_cpu_pool_decl.h> @@ -98,7 +97,6 @@ typedef struct xen_vm_record struct xen_vif_record_opt_set *vifs; struct xen_vbd_record_opt_set *vbds; struct xen_crashdump_record_opt_set *crash_dumps; - struct xen_vtpm_record_opt_set *vtpms; char *pv_bootloader; char *pv_kernel; char *pv_ramdisk; @@ -396,13 +394,6 @@ xen_vm_get_crash_dumps(xen_session *session, struct xen_crashdump_set **result, /** - * Get the VTPMs field of the given VM. - */ -extern bool -xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm vm); - - -/** * Get the PV/bootloader field of the given VM. */ extern bool diff --git a/tools/libxen/include/xen/api/xen_vtpm.h b/tools/libxen/include/xen/api/xen_vtpm.h deleted file mode 100644 index 9b3b2ebd88..0000000000 --- a/tools/libxen/include/xen/api/xen_vtpm.h +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright (c) 2006-2007, XenSource Inc. - * Copyright (c) 2006, IBM Corp. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef XEN_VTPM_H -#define XEN_VTPM_H - -#include <xen/api/xen_common.h> -#include <xen/api/xen_vm_decl.h> -#include <xen/api/xen_vtpm_decl.h> - - -/* - * The VTPM class. - * - * A virtual TPM device. - */ - - -/** - * Free the given xen_vtpm. The given handle must have been allocated - * by this library. - */ -extern void -xen_vtpm_free(xen_vtpm vtpm); - - -typedef struct xen_vtpm_set -{ - size_t size; - xen_vtpm *contents[]; -} xen_vtpm_set; - -/** - * Allocate a xen_vtpm_set of the given size. - */ -extern xen_vtpm_set * -xen_vtpm_set_alloc(size_t size); - -/** - * Free the given xen_vtpm_set. The given set must have been allocated - * by this library. - */ -extern void -xen_vtpm_set_free(xen_vtpm_set *set); - - -typedef struct xen_vtpm_record -{ - xen_vtpm handle; - char *uuid; - struct xen_vm_record_opt *vm; - struct xen_vm_record_opt *backend; - xen_string_string_map *other_config; -} xen_vtpm_record; - -/** - * Allocate a xen_vtpm_record. - */ -extern xen_vtpm_record * -xen_vtpm_record_alloc(void); - -/** - * Free the given xen_vtpm_record, and all referenced values. The - * given record must have been allocated by this library. - */ -extern void -xen_vtpm_record_free(xen_vtpm_record *record); - - -typedef struct xen_vtpm_record_opt -{ - bool is_record; - union - { - xen_vtpm handle; - xen_vtpm_record *record; - } u; -} xen_vtpm_record_opt; - -/** - * Allocate a xen_vtpm_record_opt. - */ -extern xen_vtpm_record_opt * -xen_vtpm_record_opt_alloc(void); - -/** - * Free the given xen_vtpm_record_opt, and all referenced values. The - * given record_opt must have been allocated by this library. - */ -extern void -xen_vtpm_record_opt_free(xen_vtpm_record_opt *record_opt); - - -typedef struct xen_vtpm_record_set -{ - size_t size; - xen_vtpm_record *contents[]; -} xen_vtpm_record_set; - -/** - * Allocate a xen_vtpm_record_set of the given size. - */ -extern xen_vtpm_record_set * -xen_vtpm_record_set_alloc(size_t size); - -/** - * Free the given xen_vtpm_record_set, and all referenced values. The - * given set must have been allocated by this library. - */ -extern void -xen_vtpm_record_set_free(xen_vtpm_record_set *set); - - - -typedef struct xen_vtpm_record_opt_set -{ - size_t size; - xen_vtpm_record_opt *contents[]; -} xen_vtpm_record_opt_set; - -/** - * Allocate a xen_vtpm_record_opt_set of the given size. - */ -extern xen_vtpm_record_opt_set * -xen_vtpm_record_opt_set_alloc(size_t size); - -/** - * Free the given xen_vtpm_record_opt_set, and all referenced values. - * The given set must have been allocated by this library. - */ -extern void -xen_vtpm_record_opt_set_free(xen_vtpm_record_opt_set *set); - - -/** - * Get a record containing the current state of the given VTPM. - */ -extern bool -xen_vtpm_get_record(xen_session *session, xen_vtpm_record **result, xen_vtpm vtpm); - - -/** - * Get a reference to the VTPM instance with the specified UUID. - */ -extern bool -xen_vtpm_get_by_uuid(xen_session *session, xen_vtpm *result, char *uuid); - - -/** - * Create a new VTPM instance, and return its handle. - */ -extern bool -xen_vtpm_create(xen_session *session, xen_vtpm *result, xen_vtpm_record *record); - - -/** - * Destroy the specified VTPM instance. - */ -extern bool -xen_vtpm_destroy(xen_session *session, xen_vtpm vtpm); - - -/** - * Get the uuid field of the given VTPM. - */ -extern bool -xen_vtpm_get_uuid(xen_session *session, char **result, xen_vtpm vtpm); - - -/** - * Get the VM field of the given VTPM. - */ -extern bool -xen_vtpm_get_vm(xen_session *session, xen_vm *result, xen_vtpm vtpm); - - -/** - * Get the backend field of the given VTPM. - */ -extern bool -xen_vtpm_get_backend(xen_session *session, xen_vm *result, xen_vtpm vtpm); - - -/** - * Get the other_config field of the given VTPM. - */ -extern bool -xen_vtpm_get_other_config(xen_session *session, - xen_string_string_map **result, - xen_vtpm vtpm); - - -/** - * Set the other_config field of the given VTPM. - */ -extern bool -xen_vtpm_set_other_config(xen_session *session, - xen_vtpm vtpm, - xen_string_string_map *other_config); - - -#endif diff --git a/tools/libxen/include/xen/api/xen_vtpm_decl.h b/tools/libxen/include/xen/api/xen_vtpm_decl.h deleted file mode 100644 index 7798e3856d..0000000000 --- a/tools/libxen/include/xen/api/xen_vtpm_decl.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2006, XenSource Inc. - * Copyright (c) 2006, IBM Corp. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef XEN_VTPM_DECL_H -#define XEN_VTPM_DECL_H - -typedef void *xen_vtpm; - -struct xen_vtpm_set; -struct xen_vtpm_record; -struct xen_vtpm_record_set; -struct xen_vtpm_record_opt; -struct xen_vtpm_record_opt_set; - -#endif |