[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/28] tpm-backend: move set 'id' to common code
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 12/28] tpm-backend: move set 'id' to common code |
Date: |
Mon, 6 Nov 2017 19:39:09 +0100 |
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
---
include/sysemu/tpm_backend.h | 2 +-
hw/tpm/tpm_emulator.c | 12 +++---------
hw/tpm/tpm_passthrough.c | 9 +++------
tpm.c | 3 ++-
4 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index ce8dee58cf..1ad27ec374 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -63,7 +63,7 @@ struct TPMBackendClass {
/* get a descriptive text of the backend to display to the user */
const char *desc;
- TPMBackend *(*create)(QemuOpts *opts, const char *id);
+ TPMBackend *(*create)(QemuOpts *opts);
/* start up the TPM on the backend - optional */
int (*startup_tpm)(TPMBackend *t);
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 883e8c0c2d..ff5fcbae03 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -453,22 +453,16 @@ err:
return -1;
}
-static TPMBackend *tpm_emulator_create(QemuOpts *opts, const char *id)
+static TPMBackend *tpm_emulator_create(QemuOpts *opts)
{
TPMBackend *tb = TPM_BACKEND(object_new(TYPE_TPM_EMULATOR));
- tb->id = g_strdup(id);
-
if (tpm_emulator_handle_device_opts(TPM_EMULATOR(tb), opts)) {
- goto err_exit;
+ object_unref(OBJECT(tb));
+ return NULL;
}
return tb;
-
-err_exit:
- object_unref(OBJECT(tb));
-
- return NULL;
}
static TpmTypeOptions *tpm_emulator_get_tpm_options(TPMBackend *tb)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 9326cbfdc9..7371d50739 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -284,13 +284,10 @@ tpm_passthrough_handle_device_opts(TPMPassthruState
*tpm_pt, QemuOpts *opts)
return 1;
}
-static TPMBackend *tpm_passthrough_create(QemuOpts *opts, const char *id)
+static TPMBackend *tpm_passthrough_create(QemuOpts *opts)
{
Object *obj = object_new(TYPE_TPM_PASSTHROUGH);
- TPMBackend *tb = TPM_BACKEND(obj);
- TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
-
- tb->id = g_strdup(id);
+ TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(obj);
if (tpm_passthrough_handle_device_opts(tpm_pt, opts)) {
goto err_exit;
@@ -301,7 +298,7 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts,
const char *id)
goto err_exit;
}
- return tb;
+ return TPM_BACKEND(obj);
err_exit:
object_unref(obj);
diff --git a/tpm.c b/tpm.c
index 32d398aadf..520f449234 100644
--- a/tpm.c
+++ b/tpm.c
@@ -127,11 +127,12 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts,
Error **errp)
return 1;
}
- drv = be->create(opts, id);
+ drv = be->create(opts);
if (!drv) {
return 1;
}
+ drv->id = g_strdup(id);
QLIST_INSERT_HEAD(&tpm_backends, drv, list);
return 0;
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PATCH v2 03/28] tpm-backend: store TPMIf interface, improve backend_init(), (continued)
- [Qemu-devel] [PATCH v2 03/28] tpm-backend: store TPMIf interface, improve backend_init(), Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 04/28] tpm-tis: no longer expose TPMState, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 06/28] tpm-be: report error instead of front-end, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 05/28] tpm-be: call request_completed() out of thread, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 07/28] tpm-be: ask model to the TPM interface, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 08/28] tpm: remove unused opened code, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 09/28] tpm-passthrough: don't save guessed cancel_path in options, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 11/28] tpm-passthrough: pass TPMPassthruState to handle_device_opts, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 12/28] tpm-backend: move set 'id' to common code,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 10/28] tpm-be: update optional function pointers, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 13/28] tpm-passthrough: make it safer to destroy after creation, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 14/28] tpm-passthrough: simplify create(), Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 15/28] tpm-passthrough: workaround a possible race, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 16/28] tpm-tis: simplify header inclusion, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 17/28] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be(), Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 18/28] tpm: lookup the the TPM interface instead of TIS device, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 19/28] tpm: add TPM interface to lookup TPM version, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 20/28] tpm: add tpm_cmd_get_size() to tpm_util, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 21/28] acpi: change TPM TIS data conditions, Marc-André Lureau, 2017/11/06