mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tpm: Clean up model registration & lookup

Browse Source 
We have a strict separation between enum TpmModel and tpm_models[]:

* TpmModel may have any number of members.  It just happens to have one.

* tpm_register_model() uses the first empty slot in tpm_models[].

  If you register more than tpm_models[] has space,
  tpn_register_model() fails.  Its caller silently ignores the
  failure.

  Register the same TpmModel more than once has no effect other than
  wasting tpm_models[] slots: tpm_model_is_registered() is happy with
  the first one it finds.

Since we only ever register one model, and tpm_models[] has space for
just that one, this contraption even works.

Turn tpm_models[] into a straight map from enum TpmType to bool.  Much
simpler.

Cc: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-5-git-send-email-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[Commit message typo fixed]
This commit is contained in:
Markus Armbruster 2017-08-24 10:45:59 +02:00
parent a9a72aeefb
commit 00bbf50a50
2 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/tpm_backend.h
View File

@ -226,7 +226,7 @@ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s);
TPMBackend *qemu_find_tpm(const char *id); TPMBackend *qemu_find_tpm(const char *id);
const TPMDriverOps *tpm_get_backend_driver(const char *type); const TPMDriverOps *tpm_get_backend_driver(const char *type);
int tpm_register_model(enum TpmModel model); void tpm_register_model(enum TpmModel model);
void tpm_register_driver(const TPMDriverOps *tdo); void tpm_register_driver(const TPMDriverOps *tdo);
#endif #endif

37
tpm.c
View File

@ -24,39 +24,12 @@
static QLIST_HEAD(, TPMBackend) tpm_backends = static QLIST_HEAD(, TPMBackend) tpm_backends =
QLIST_HEAD_INITIALIZER(tpm_backends); QLIST_HEAD_INITIALIZER(tpm_backends);
#define TPM_MAX_MODELS 1
static TPMDriverOps const *be_drivers[TPM_TYPE__MAX]; static TPMDriverOps const *be_drivers[TPM_TYPE__MAX];
static bool tpm_models[TPM_MODEL__MAX];
static enum TpmModel tpm_models[TPM_MAX_MODELS] = { void tpm_register_model(enum TpmModel model)
TPM_MODEL__MAX,
};
int tpm_register_model(enum TpmModel model)
{ {
int i; tpm_models[model] = true;
for (i = 0; i < TPM_MAX_MODELS; i++) {
if (tpm_models[i] == TPM_MODEL__MAX) {
tpm_models[i] = model;
return 0;
}
}
error_report("Could not register TPM model");
return 1;
}
static bool tpm_model_is_registered(enum TpmModel model)
{
int i;
for (i = 0; i < TPM_MAX_MODELS; i++) {
if (tpm_models[i] == model) {
return true;
}
}
return false;
} }
const TPMDriverOps *tpm_get_backend_driver(const char *type) const TPMDriverOps *tpm_get_backend_driver(const char *type)
@ -270,7 +243,7 @@ TPMInfoList *qmp_query_tpm(Error **errp)
TPMInfoList *info, *head = NULL, *cur_item = NULL; TPMInfoList *info, *head = NULL, *cur_item = NULL;
QLIST_FOREACH(drv, &tpm_backends, list) { QLIST_FOREACH(drv, &tpm_backends, list) {
if (!tpm_model_is_registered(drv->fe_model)) { if (!tpm_models[drv->fe_model]) {
continue; continue;
} }
info = g_new0(TPMInfoList, 1); info = g_new0(TPMInfoList, 1);
@ -317,7 +290,7 @@ TpmModelList *qmp_query_tpm_models(Error **errp)
TpmModelList *head = NULL, *prev = NULL, *cur_item; TpmModelList *head = NULL, *prev = NULL, *cur_item;
for (i = 0; i < TPM_MODEL__MAX; i++) { for (i = 0; i < TPM_MODEL__MAX; i++) {
if (!tpm_model_is_registered(i)) { if (!tpm_models[i]) {
continue; continue;
} }
cur_item = g_new0(TpmModelList, 1); cur_item = g_new0(TpmModelList, 1);