[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/42] tpm: lookup tpm backend class in tpm_driver_f
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 04/42] tpm: lookup tpm backend class in tpm_driver_find_by_type() |
Date: |
Tue, 10 Oct 2017 00:55:45 +0200 |
One step towards removing TPMDriverOps and driver registration.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tpm.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/tpm.c b/tpm.c
index bc7d7470a8..04de8da5fd 100644
--- a/tpm.c
+++ b/tpm.c
@@ -47,6 +47,24 @@ void tpm_register_driver(const TPMDriverOps *tdo)
be_drivers[tdo->type] = tdo;
}
+static const TPMDriverOps *
+tpm_driver_find_by_type(enum TpmType type)
+{
+ ObjectClass *oc;
+ TPMBackendClass *bc;
+ char *typename = g_strdup_printf("tpm-%s", TpmType_str(type));
+
+ oc = object_class_by_name(typename);
+ g_free(typename);
+
+ if (!object_class_dynamic_cast(oc, TYPE_TPM_BACKEND)) {
+ return NULL;
+ }
+
+ bc = TPM_BACKEND_CLASS(oc);
+ return bc->ops;
+}
+
/*
* Walk the list of available TPM backend drivers and display them on the
* screen.
@@ -58,11 +76,11 @@ static void tpm_display_backend_drivers(void)
fprintf(stderr, "Supported TPM types (choose only one):\n");
for (i = 0; i < TPM_TYPE__MAX; i++) {
- if (be_drivers[i] == NULL) {
+ const TPMDriverOps *ops = tpm_driver_find_by_type(i);
+ if (!ops) {
continue;
}
- fprintf(stderr, "%12s %s\n",
- TpmType_str(i), be_drivers[i]->desc);
+ fprintf(stderr, "%12s %s\n", TpmType_str(i), ops->desc);
}
fprintf(stderr, "\n");
}
@@ -196,11 +214,6 @@ int tpm_config_parse(QemuOptsList *opts_list, const char
*optarg)
#endif /* CONFIG_TPM */
-static const TPMDriverOps *tpm_driver_find_by_type(enum TpmType type)
-{
- return be_drivers[type];
-}
-
/*
* Walk the list of active TPM backends and collect information about them
* following the schema description in qapi-schema.json.
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 00/42] TPM: code cleanup & CRB device, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 01/42] tpm-tis: remove unused hw_access argument, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 02/42] tpm-tis: remove RAISE_STS_IRQ, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 03/42] tpm: make tpm_get_backend_driver() static, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 04/42] tpm: lookup tpm backend class in tpm_driver_find_by_type(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 05/42] tpm: replace tpm_get_backend_driver() to drop be_drivers, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 07/42] tpm: move TPMSizedBuffer to tpm_tis.h, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 06/42] tpm: remove tpm_register_driver(), Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 08/42] tpm: remove TPMDriverOps, Marc-André Lureau, 2017/10/09