[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 03/32] tpm-backend: store TPMIf interface, improve
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 03/32] tpm-backend: store TPMIf interface, improve backend_init() |
Date: |
Sat, 16 Dec 2017 12:41:20 -0500 |
From: Marc-André Lureau <address@hidden>
Store the TPM interface, the actual object may be different from
TPMState. Keep a reference on the interface, and check the backend
wasn't already initialized.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
backends/tpm.c | 11 +++++++++--
hw/tpm/tpm_emulator.c | 4 ++--
hw/tpm/tpm_passthrough.c | 4 ++--
hw/tpm/tpm_tis.c | 2 +-
include/sysemu/tpm.h | 2 +-
include/sysemu/tpm_backend.h | 6 +++---
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/backends/tpm.c b/backends/tpm.c
index 1e416d7..86f0e7e 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -43,9 +43,15 @@ enum TpmType tpm_backend_get_type(TPMBackend *s)
return k->type;
}
-int tpm_backend_init(TPMBackend *s, TPMState *state)
+int tpm_backend_init(TPMBackend *s, TPMIf *tpmif)
{
- s->tpm_state = state;
+ if (s->tpmif) {
+ return -1;
+ }
+
+ s->tpmif = tpmif;
+ object_ref(OBJECT(tpmif));
+
s->had_startup_error = false;
return 0;
@@ -193,6 +199,7 @@ static void tpm_backend_instance_finalize(Object *obj)
{
TPMBackend *s = TPM_BACKEND(obj);
+ object_unref(OBJECT(s->tpmif));
g_free(s->id);
tpm_backend_thread_end(s);
}
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index e1a6810..5f88975 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -186,7 +186,7 @@ static int tpm_emulator_set_locality(TPMEmulator *tpm_emu,
uint8_t locty_number,
static void tpm_emulator_handle_request(TPMBackend *tb, TPMBackendCmd *cmd)
{
TPMEmulator *tpm_emu = TPM_EMULATOR(tb);
- TPMIfClass *tic = TPM_IF_GET_CLASS(tb->tpm_state);
+ TPMIfClass *tic = TPM_IF_GET_CLASS(tb->tpmif);
Error *err = NULL;
DPRINTF("processing TPM command");
@@ -201,7 +201,7 @@ static void tpm_emulator_handle_request(TPMBackend *tb,
TPMBackendCmd *cmd)
goto error;
}
- tic->request_completed(TPM_IF(tb->tpm_state));
+ tic->request_completed(tb->tpmif);
return;
error:
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index c440aff..2ad74ba 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -139,14 +139,14 @@ err_exit:
static void tpm_passthrough_handle_request(TPMBackend *tb, TPMBackendCmd *cmd)
{
TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
- TPMIfClass *tic = TPM_IF_GET_CLASS(tb->tpm_state);
+ TPMIfClass *tic = TPM_IF_GET_CLASS(tb->tpmif);
DPRINTF("tpm_passthrough: processing command %p\n", cmd);
tpm_passthrough_unix_tx_bufs(tpm_pt, cmd->in, cmd->in_len,
cmd->out, cmd->out_len, &cmd->selftest_done);
- tic->request_completed(TPM_IF(tb->tpm_state));
+ tic->request_completed(tb->tpmif);
}
static void tpm_passthrough_reset(TPMBackend *tb)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 880ca1a..9a2360e 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -1082,7 +1082,7 @@ static void tpm_tis_realizefn(DeviceState *dev, Error
**errp)
s->be_driver->fe_model = TPM_MODEL_TPM_TIS;
- if (tpm_backend_init(s->be_driver, s)) {
+ if (tpm_backend_init(s->be_driver, TPM_IF(s))) {
error_setg(errp, "tpm_tis: backend driver with id %s could not be "
"initialized", s->backend);
return;
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 452cdb9..fb1719e 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -12,8 +12,8 @@
#ifndef QEMU_TPM_H
#define QEMU_TPM_H
-#include "qemu/option.h"
#include "qom/object.h"
+#include "qapi-types.h"
typedef struct TPMState TPMState;
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index 03ea5a3..b5f21ed 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -43,8 +43,8 @@ struct TPMBackend {
Object parent;
/*< protected >*/
+ TPMIf *tpmif;
bool opened;
- TPMState *tpm_state;
GThreadPool *thread_pool;
bool had_startup_error;
@@ -96,14 +96,14 @@ enum TpmType tpm_backend_get_type(TPMBackend *s);
/**
* tpm_backend_init:
* @s: the backend to initialized
- * @state: TPMState
+ * @tpmif: TPM interface
* @datacb: callback for sending data to frontend
*
* Initialize the backend with the given variables.
*
* Returns 0 on success.
*/
-int tpm_backend_init(TPMBackend *s, TPMState *state);
+int tpm_backend_init(TPMBackend *s, TPMIf *tpmif);
/**
* tpm_backend_startup_tpm:
--
2.5.5
- [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 01/32] tpm-tis: remove unused locty_number, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 02/32] tpm: move TpmIf in include/sysemu/tpm.h, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 03/32] tpm-backend: store TPMIf interface, improve backend_init(),
Stefan Berger <=
- [Qemu-devel] [PULL v1 07/32] tpm-be: ask model to the TPM interface, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 06/32] tpm-be: report error instead of front-end, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 05/32] tpm-be: call request_completed() out of thread, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 04/32] tpm-tis: no longer expose TPMState, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 08/32] tpm: remove unused opened code, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 13/32] tpm-passthrough: make it safer to destroy after creation, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 11/32] tpm-passthrough: pass TPMPassthruState to handle_device_opts, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 10/32] tpm-be: update optional function pointers, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 09/32] tpm-passthrough: don't save guessed cancel_path in options, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 12/32] tpm-backend: move set 'id' to common code, Stefan Berger, 2017/12/16