[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/54] tpm: simplify driver registration & lookup
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 07/54] tpm: simplify driver registration & lookup |
Date: |
Tue, 22 Aug 2017 15:22:08 +0200 |
Make be_drivers[n] match order of TpmType enum.
Use qapi_enum_parse() in tpm_get_backend_driver.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/sysemu/tpm_backend.h | 2 +-
tpm.c | 42 ++++++++++++------------------------------
2 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index b58f52d39f..1d21c6b19b 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -227,6 +227,6 @@ TPMBackend *qemu_find_tpm(const char *id);
const TPMDriverOps *tpm_get_backend_driver(const char *type);
int tpm_register_model(enum TpmModel model);
-int tpm_register_driver(const TPMDriverOps *tdo);
+void tpm_register_driver(const TPMDriverOps *tdo);
#endif
diff --git a/tpm.c b/tpm.c
index c3b731b3f2..f175661bfe 100644
--- a/tpm.c
+++ b/tpm.c
@@ -26,9 +26,8 @@ static QLIST_HEAD(, TPMBackend) tpm_backends =
#define TPM_MAX_MODELS 1
-#define TPM_MAX_DRIVERS 1
-static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] = {
+static TPMDriverOps const *be_drivers[TPM_TYPE__MAX] = {
NULL,
};
@@ -64,31 +63,18 @@ static bool tpm_model_is_registered(enum TpmModel model)
const TPMDriverOps *tpm_get_backend_driver(const char *type)
{
- int i;
+ int i = qapi_enum_parse(TpmType_lookup, type, TPM_TYPE__MAX, -1, NULL);
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
- if (!strcmp(TpmType_lookup[be_drivers[i]->type], type)) {
- return be_drivers[i];
- }
- }
-
- return NULL;
+ return i >= 0 ? be_drivers[i] : NULL;
}
#ifdef CONFIG_TPM
-int tpm_register_driver(const TPMDriverOps *tdo)
+void tpm_register_driver(const TPMDriverOps *tdo)
{
- int i;
+ assert(!be_drivers[tdo->type]);
- for (i = 0; i < TPM_MAX_DRIVERS; i++) {
- if (!be_drivers[i]) {
- be_drivers[i] = tdo;
- return 0;
- }
- }
- error_report("Could not register TPM driver");
- return 1;
+ be_drivers[tdo->type] = tdo;
}
/*
@@ -101,9 +87,12 @@ static void tpm_display_backend_drivers(void)
fprintf(stderr, "Supported TPM types (choose only one):\n");
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
+ for (i = 0; i < TPM_TYPE__MAX; i++) {
+ if (be_drivers[i] == NULL) {
+ continue;
+ }
fprintf(stderr, "%12s %s\n",
- qapi_enum_lookup(TpmType_lookup, be_drivers[i]->type),
+ qapi_enum_lookup(TpmType_lookup, i),
be_drivers[i]->desc());
}
fprintf(stderr, "\n");
@@ -241,14 +230,7 @@ int tpm_config_parse(QemuOptsList *opts_list, const char
*optarg)
static const TPMDriverOps *tpm_driver_find_by_type(enum TpmType type)
{
- int i;
-
- for (i = 0; i < TPM_MAX_DRIVERS && be_drivers[i] != NULL; i++) {
- if (be_drivers[i]->type == type) {
- return be_drivers[i];
- }
- }
- return NULL;
+ return be_drivers[type];
}
static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv)
--
2.14.1.146.gd35faa819
[Qemu-devel] [PATCH v2 07/54] tpm: simplify driver registration & lookup,
Marc-André Lureau <=
[Qemu-devel] [PATCH v2 26/54] qapi-types: refactor variants handling, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 15/54] qapi: add 'if' to top-level expressions, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 36/54] qapi: add #if conditions to generated variants, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 28/54] qapi: do not define enumeration value explicitely, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 34/54] qapi: add #if conditions to generated struct members, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 20/54] qapi-introspect: modify to_qlit() to take an optional suffix, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 18/54] qapi: add 'ifcond' to visitor methods, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 39/54] qapi: add #if conditions to generated alternate variants, Marc-André Lureau, 2017/08/22