OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tpm: add TPM interface to lookup TPM version

Browse Source 
Do not hardcode TPM device model to lookup version, use an interface
instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2017-11-06 19:39:16 +01:00 committed by Stefan Berger
parent 3dfd5a2a50
commit 9af7a72166
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/tpm/tpm_tis.c
View File

@ -990,9 +990,9 @@ static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb)
/* /*
* Get the TPMVersion of the backend device being used * Get the TPMVersion of the backend device being used
*/ */
TPMVersion tpm_tis_get_tpm_version(Object *obj) static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti)
{ {
TPMState *s = TPM(obj); TPMState *s = TPM(ti);
if (tpm_backend_had_startup_error(s->be_driver)) { if (tpm_backend_had_startup_error(s->be_driver)) {
return TPM_VERSION_UNSPEC; return TPM_VERSION_UNSPEC;
@ -1102,6 +1102,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data)
dc->reset = tpm_tis_reset; dc->reset = tpm_tis_reset;
dc->vmsd = &vmstate_tpm_tis; dc->vmsd = &vmstate_tpm_tis;
tc->model = TPM_MODEL_TPM_TIS; tc->model = TPM_MODEL_TPM_TIS;
tc->get_version = tpm_tis_get_tpm_version;
tc->request_completed = tpm_tis_request_completed; tc->request_completed = tpm_tis_request_completed;
} }

5
include/sysemu/tpm.h
View File

@ -42,6 +42,7 @@ typedef struct TPMIfClass {
enum TpmModel model; enum TpmModel model;
void (*request_completed)(TPMIf *obj); void (*request_completed)(TPMIf *obj);
enum TPMVersion (*get_version)(TPMIf *obj);
} TPMIfClass; } TPMIfClass;
#define TYPE_TPM_TIS "tpm-tis" #define TYPE_TPM_TIS "tpm-tis"
@ -54,15 +55,13 @@ static inline TPMIf *tpm_find(void)
return TPM_IF(obj); return TPM_IF(obj);
} }
TPMVersion tpm_tis_get_tpm_version(Object *obj);
static inline TPMVersion tpm_get_version(TPMIf *ti) static inline TPMVersion tpm_get_version(TPMIf *ti)
{ {
if (!ti) { if (!ti) {
return TPM_VERSION_UNSPEC; return TPM_VERSION_UNSPEC;
} }
return tpm_tis_get_tpm_version(OBJECT(ti)); return TPM_IF_GET_CLASS(ti)->get_version(ti);
} }
#endif /* QEMU_TPM_H */ #endif /* QEMU_TPM_H */