[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 27/32] tpm: remove tpm_register_model()
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 27/32] tpm: remove tpm_register_model() |
Date: |
Sat, 16 Dec 2017 12:41:44 -0500 |
From: Marc-André Lureau <address@hidden>
Query object classes that implements TPMIf instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
hw/tpm/tpm_tis.c | 1 -
include/sysemu/tpm_backend.h | 2 --
tpm.c | 20 ++++++--------------
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 97cd7f5..98c11a4 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -1119,7 +1119,6 @@ static const TypeInfo tpm_tis_info = {
static void tpm_tis_register(void)
{
type_register_static(&tpm_tis_info);
- tpm_register_model(TPM_MODEL_TPM_TIS);
}
type_init(tpm_tis_register)
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index c42d83a..590e8b4 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -194,6 +194,4 @@ TPMInfo *tpm_backend_query_tpm(TPMBackend *s);
TPMBackend *qemu_find_tpm_be(const char *id);
-void tpm_register_model(enum TpmModel model);
-
#endif
diff --git a/tpm.c b/tpm.c
index 4661dfc..61a4341 100644
--- a/tpm.c
+++ b/tpm.c
@@ -23,13 +23,6 @@
static QLIST_HEAD(, TPMBackend) tpm_backends =
QLIST_HEAD_INITIALIZER(tpm_backends);
-static bool tpm_models[TPM_MODEL__MAX];
-
-void tpm_register_model(enum TpmModel model)
-{
- tpm_models[model] = true;
-}
-
static const TPMBackendClass *
tpm_be_find_by_type(enum TpmType type)
{
@@ -236,18 +229,16 @@ TpmTypeList *qmp_query_tpm_types(Error **errp)
return head;
}
-
TpmModelList *qmp_query_tpm_models(Error **errp)
{
- unsigned int i = 0;
TpmModelList *head = NULL, *prev = NULL, *cur_item;
+ GSList *e, *l = object_class_get_list(TYPE_TPM_IF, false);
+
+ for (e = l; e; e = e->next) {
+ TPMIfClass *c = TPM_IF_CLASS(e->data);
- for (i = 0; i < TPM_MODEL__MAX; i++) {
- if (!tpm_models[i]) {
- continue;
- }
cur_item = g_new0(TpmModelList, 1);
- cur_item->value = i;
+ cur_item->value = c->model;
if (prev) {
prev->next = cur_item;
@@ -257,6 +248,7 @@ TpmModelList *qmp_query_tpm_models(Error **errp)
}
prev = cur_item;
}
+ g_slist_free(l);
return head;
}
--
2.5.5
- [Qemu-devel] [PULL v1 18/32] tpm: lookup the the TPM interface instead of TIS device, (continued)
- [Qemu-devel] [PULL v1 18/32] tpm: lookup the the TPM interface instead of TIS device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 16/32] tpm-tis: simplify header inclusion, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 20/32] tpm: add tpm_cmd_get_size() to tpm_util, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 19/32] tpm: add TPM interface to lookup TPM version, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 21/32] acpi: change TPM TIS data conditions, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 22/32] tpm-emulator: add a FIXME comment about blocking cancel, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 23/32] tpm-tis: remove redundant 'tpm_tis:' in error messages, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 25/32] qdev: add DEFINE_PROP_TPMBE, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 24/32] tpm-tis: check that at most one TPM device exists, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 26/32] tpm-tis: use DEFINE_PROP_TPMBE, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 27/32] tpm: remove tpm_register_model(),
Stefan Berger <=
- [Qemu-devel] [PULL v1 30/32] tpm: tpm_passthrough: Read the buffer size from the host device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 28/32] tpm: Move getting TPM buffer size to backends, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 29/32] tpm: pull tpm_util_request() out of tpm_util_test(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 31/32] tpm: tpm_emulator: get and set buffer size of device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 32/32] tpm: tpm_passthrough: Fail startup if FE buffer size < BE buffer size, Stefan Berger, 2017/12/16
- Re: [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15, Peter Maydell, 2017/12/17