From bdc02bfb7bdad347f8e256bb767dfeca4975b4a4 Mon Sep 17 00:00:00 2001 From: Matthew Fioravante Date: Mon, 19 Nov 2012 12:59:50 +0000 Subject: tools: Remove old vtpm stuff from tools/libxen Signed-off-by: Matthew Fioravante Acked-by: Ian Campbell Committed-by: Ian Campbell --- tools/libxen/src/xen_vm.c | 22 ----- tools/libxen/src/xen_vtpm.c | 235 -------------------------------------------- 2 files changed, 257 deletions(-) delete mode 100644 tools/libxen/src/xen_vtpm.c (limited to 'tools/libxen/src') diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c index b762fbea29..dcd650c174 100644 --- a/tools/libxen/src/xen_vm.c +++ b/tools/libxen/src/xen_vm.c @@ -35,7 +35,6 @@ #include #include #include -#include #include @@ -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) { diff --git a/tools/libxen/src/xen_vtpm.c b/tools/libxen/src/xen_vtpm.c deleted file mode 100644 index 0ca7b41965..0000000000 --- a/tools/libxen/src/xen_vtpm.c +++ /dev/null @@ -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 -#include - -#include "xen_internal.h" -#include -#include -#include - - -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; -} -- cgit v1.2.3