[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 04/21] tpm: lookup tpm backend class in tpm_driver
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 04/21] tpm: lookup tpm backend class in tpm_driver_find_by_type() |
Date: |
Thu, 19 Oct 2017 14:02:38 -0400 |
From: Marc-André Lureau <address@hidden>
One step towards removing TPMDriverOps and driver registration.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
tpm.c | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/tpm.c b/tpm.c
index bc7d747..04de8da 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.5.5
- [Qemu-devel] [PULL v1 00/21] Merge tpm 2017/10/19, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 16/21] tpm: remove locty_data from TPMState, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 01/21] tpm-tis: remove unused hw_access argument, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 21/21] tpm: move recv_data_callback to TPM interface, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 11/21] tpm: remove unused TPMBackendCmd, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 09/21] tpm: remove init() class method, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 04/21] tpm: lookup tpm backend class in tpm_driver_find_by_type(),
Stefan Berger <=
- [Qemu-devel] [PULL v1 13/21] tpm: remove locty argument from receive_cb, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 12/21] tpm: remove needless cast, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 20/21] tpm: add a QOM TPM interface, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 06/21] tpm: remove tpm_register_driver(), Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 15/21] tpm-emulator: fix error handling, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 14/21] tpm: add TPMBackendCmd to hold the request state, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 18/21] tpm-tis: remove tpm_tis.h header, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 17/21] tpm-tis: move TPMState to TIS header, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 19/21] tpm-tis: fold TPMTISEmuState in TPMState, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 10/21] tpm: remove configure_tpm() hop, Stefan Berger, 2017/10/19