mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
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>
This commit is contained in:
1 parent
3b1c654c9a
commit
bdc02bfb7b
6 files changed
-516
No files matched your search
@@ -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
|
||||
@@ -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;
|
||||
@@ -395,13 +393,6 @@ extern bool
|
||||
xen_vm_get_crash_dumps(xen_session *session, struct xen_crashdump_set **result, xen_vm vm);
|
||||
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -35,7 +35,6 @@
|
||||
#include <xen/api/xen_vm.h>
|
||||
#include <xen/api/xen_vm_guest_metrics.h>
|
||||
#include <xen/api/xen_vm_metrics.h>
|
||||
#include <xen/api/xen_vtpm.h>
|
||||
#include <xen/api/xen_cpu_pool.h>
|
||||
|
||||
|
||||
@@ -119,9 +118,6 @@ static const struct_member xen_vm_record_struct_members[] =
|
||||
{ .key = "crash_dumps",
|
||||
.type = &abstract_type_ref_set,
|
||||
.offset = offsetof(xen_vm_record, crash_dumps) },
|
||||
{ .key = "VTPMs",
|
||||
.type = &abstract_type_ref_set,
|
||||
.offset = offsetof(xen_vm_record, vtpms) },
|
||||
{ .key = "PV_bootloader",
|
||||
.type = &abstract_type_string,
|
||||
.offset = offsetof(xen_vm_record, pv_bootloader) },
|
||||
@@ -203,7 +199,6 @@ xen_vm_record_free(xen_vm_record *record)
|
||||
xen_vif_record_opt_set_free(record->vifs);
|
||||
xen_vbd_record_opt_set_free(record->vbds);
|
||||
xen_crashdump_record_opt_set_free(record->crash_dumps);
|
||||
xen_vtpm_record_opt_set_free(record->vtpms);
|
||||
free(record->pv_bootloader);
|
||||
free(record->pv_kernel);
|
||||
free(record->pv_ramdisk);
|
||||
@@ -667,23 +662,6 @@ xen_vm_get_crash_dumps(xen_session *session, struct xen_crashdump_set **result,
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vm_get_vtpms(xen_session *session, struct xen_vtpm_set **result, xen_vm vm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vm }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string_set;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VM.get_VTPMs");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vm_get_pv_bootloader(xen_session *session, char **result, xen_vm vm)
|
||||
{
|
||||
|
||||
@@ -1,235 +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
|
||||
*/
|
||||
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "xen_internal.h"
|
||||
#include <xen/api/xen_common.h>
|
||||
#include <xen/api/xen_vm.h>
|
||||
#include <xen/api/xen_vtpm.h>
|
||||
|
||||
|
||||
XEN_FREE(xen_vtpm)
|
||||
XEN_SET_ALLOC_FREE(xen_vtpm)
|
||||
XEN_ALLOC(xen_vtpm_record)
|
||||
XEN_SET_ALLOC_FREE(xen_vtpm_record)
|
||||
XEN_ALLOC(xen_vtpm_record_opt)
|
||||
XEN_RECORD_OPT_FREE(xen_vtpm)
|
||||
XEN_SET_ALLOC_FREE(xen_vtpm_record_opt)
|
||||
|
||||
|
||||
static const struct_member xen_vtpm_record_struct_members[] =
|
||||
{
|
||||
{ .key = "uuid",
|
||||
.type = &abstract_type_string,
|
||||
.offset = offsetof(xen_vtpm_record, uuid) },
|
||||
{ .key = "VM",
|
||||
.type = &abstract_type_ref,
|
||||
.offset = offsetof(xen_vtpm_record, vm) },
|
||||
{ .key = "backend",
|
||||
.type = &abstract_type_ref,
|
||||
.offset = offsetof(xen_vtpm_record, backend) },
|
||||
{ .key = "other_config",
|
||||
.type = &abstract_type_string_string_map,
|
||||
.offset = offsetof(xen_vtpm_record, other_config) }
|
||||
};
|
||||
|
||||
const abstract_type xen_vtpm_record_abstract_type_ =
|
||||
{
|
||||
.typename = STRUCT,
|
||||
.struct_size = sizeof(xen_vtpm_record),
|
||||
.member_count =
|
||||
sizeof(xen_vtpm_record_struct_members) / sizeof(struct_member),
|
||||
.members = xen_vtpm_record_struct_members
|
||||
};
|
||||
|
||||
|
||||
void
|
||||
xen_vtpm_record_free(xen_vtpm_record *record)
|
||||
{
|
||||
if (record == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
free(record->handle);
|
||||
free(record->uuid);
|
||||
xen_vm_record_opt_free(record->vm);
|
||||
xen_vm_record_opt_free(record->backend);
|
||||
xen_string_string_map_free(record->other_config);
|
||||
free(record);
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_record(xen_session *session, xen_vtpm_record **result, xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
abstract_type result_type = xen_vtpm_record_abstract_type_;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_record");
|
||||
|
||||
if (session->ok)
|
||||
{
|
||||
(*result)->handle = xen_strdup_((*result)->uuid);
|
||||
}
|
||||
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_by_uuid(xen_session *session, xen_vtpm *result, char *uuid)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = uuid }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_by_uuid");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_create(xen_session *session, xen_vtpm *result, xen_vtpm_record *record)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &xen_vtpm_record_abstract_type_,
|
||||
.u.struct_val = record }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.create");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_destroy(xen_session *session, xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
xen_call_(session, "VTPM.destroy", param_values, 1, NULL, NULL);
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_vm(xen_session *session, xen_vm *result, xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_VM");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_backend(xen_session *session, xen_vm *result, xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_backend");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_uuid(xen_session *session, char **result, xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_uuid");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_get_other_config(xen_session *session, xen_string_string_map **result,
|
||||
xen_vtpm vtpm)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm }
|
||||
};
|
||||
|
||||
abstract_type result_type = abstract_type_string_string_map;
|
||||
|
||||
*result = NULL;
|
||||
XEN_CALL_("VTPM.get_other_config");
|
||||
return session->ok;
|
||||
}
|
||||
|
||||
|
||||
bool
|
||||
xen_vtpm_set_other_config(xen_session *session, xen_vtpm vtpm,
|
||||
xen_string_string_map *other_config)
|
||||
{
|
||||
abstract_value param_values[] =
|
||||
{
|
||||
{ .type = &abstract_type_string,
|
||||
.u.string_val = vtpm },
|
||||
{ .type = &abstract_type_string_string_map,
|
||||
.u.set_val = (arbitrary_set *)other_config }
|
||||
};
|
||||
|
||||
xen_call_(session, "VTPM.set_other_config", param_values, 2, NULL, NULL);
|
||||
return session->ok;
|
||||
}
|
||||