mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 16:53:55 -06:00
tpm: reorganize headers and split hardware part
The TPM subsystem does not have a full front-end/back-end separation. The sole available backend, tpm_passthrough, depends on the data structures of the sole available frontend, tpm_tis. However, we can at least try to split the user interface (tpm.c) from the implementation (hw/tpm). The patches makes tpm.c not include tpm_int.h, which is shared between tpm_tis.c and tpm_passthrough.c; instead it moves more stuff to tpm_backend.h. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
3b8acc11d3
commit
bdee56f546
15 changed files with 103 additions and 128 deletions
|
@ -18,7 +18,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qapi-types.h"
|
||||
#include "qemu/option.h"
|
||||
#include "tpm/tpm.h"
|
||||
#include "sysemu/tpm.h"
|
||||
|
||||
#define TYPE_TPM_BACKEND "tpm-backend"
|
||||
#define TPM_BACKEND(obj) \
|
||||
|
@ -56,6 +56,39 @@ struct TPMBackend {
|
|||
QLIST_ENTRY(TPMBackend) list;
|
||||
};
|
||||
|
||||
typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
|
||||
|
||||
typedef struct TPMSizedBuffer {
|
||||
uint32_t size;
|
||||
uint8_t *buffer;
|
||||
} TPMSizedBuffer;
|
||||
|
||||
struct TPMDriverOps {
|
||||
enum TpmType type;
|
||||
/* get a descriptive text of the backend to display to the user */
|
||||
const char *(*desc)(void);
|
||||
|
||||
TPMBackend *(*create)(QemuOpts *opts, const char *id);
|
||||
void (*destroy)(TPMBackend *t);
|
||||
|
||||
/* initialize the backend */
|
||||
int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb);
|
||||
/* start up the TPM on the backend */
|
||||
int (*startup_tpm)(TPMBackend *t);
|
||||
/* returns true if nothing will ever answer TPM requests */
|
||||
bool (*had_startup_error)(TPMBackend *t);
|
||||
|
||||
size_t (*realloc_buffer)(TPMSizedBuffer *sb);
|
||||
|
||||
void (*deliver_request)(TPMBackend *t);
|
||||
|
||||
void (*reset)(TPMBackend *t);
|
||||
|
||||
void (*cancel_cmd)(TPMBackend *t);
|
||||
|
||||
bool (*get_tpm_established_flag)(TPMBackend *t);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* tpm_backend_get_type:
|
||||
|
@ -167,4 +200,10 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
|
|||
*/
|
||||
void tpm_backend_open(TPMBackend *s, Error **errp);
|
||||
|
||||
TPMBackend *qemu_find_tpm(const char *id);
|
||||
|
||||
const TPMDriverOps *tpm_get_backend_driver(const char *type);
|
||||
int tpm_register_model(enum TpmModel model);
|
||||
int tpm_register_driver(const TPMDriverOps *tdo);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
#include "qemu/option.h"
|
||||
|
||||
typedef struct TPMState TPMState;
|
||||
typedef struct TPMSizedBuffer TPMSizedBuffer;
|
||||
typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
|
||||
|
||||
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
|
||||
int tpm_init(void);
|
45
include/sysemu/tpm_backend_int.h
Normal file
45
include/sysemu/tpm_backend_int.h
Normal file
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* common TPM backend driver functions
|
||||
*
|
||||
* Copyright (c) 2012-2013 IBM Corporation
|
||||
* Authors:
|
||||
* Stefan Berger <stefanb@us.ibm.com>
|
||||
*
|
||||
* 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 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/>
|
||||
*/
|
||||
|
||||
#ifndef TPM_TPM_BACKEND_H
|
||||
#define TPM_TPM_BACKEND_H
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
typedef struct TPMBackendThread {
|
||||
GThreadPool *pool;
|
||||
} TPMBackendThread;
|
||||
|
||||
void tpm_backend_thread_deliver_request(TPMBackendThread *tbt);
|
||||
void tpm_backend_thread_create(TPMBackendThread *tbt,
|
||||
GFunc func, gpointer user_data);
|
||||
void tpm_backend_thread_end(TPMBackendThread *tbt);
|
||||
void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
|
||||
GFunc func, gpointer user_data);
|
||||
|
||||
typedef enum TPMBackendCmd {
|
||||
TPM_BACKEND_CMD_INIT = 1,
|
||||
TPM_BACKEND_CMD_PROCESS_CMD,
|
||||
TPM_BACKEND_CMD_END,
|
||||
TPM_BACKEND_CMD_TPM_RESET,
|
||||
} TPMBackendCmd;
|
||||
|
||||
#endif /* TPM_TPM_BACKEND_H */
|
Loading…
Add table
Add a link
Reference in a new issue