| Message ID | 20171009225623.29232-39-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | TPM: code cleanup & CRB device | expand |
On 10/09/2017 06:56 PM, Marc-André Lureau wrote: > Do not hardcode TPM device model to lookup version, use an interface > instead. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/sysemu/tpm.h | 5 ++--- > hw/tpm/tpm_tis.c | 5 +++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h > index dbd2b0cc7a..9439330cf1 100644 > --- a/include/sysemu/tpm.h > +++ b/include/sysemu/tpm.h > @@ -38,6 +38,7 @@ typedef struct TPMIfClass { > > enum TpmModel model; > void (*request_completed)(TPMIf *obj); > + enum TPMVersion (*get_version)(TPMIf *obj); > } TPMIfClass; > > int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); > @@ -53,15 +54,13 @@ static inline TPMIf *tpm_find(void) > return TPM_IF(obj); > } > > -TPMVersion tpm_tis_get_tpm_version(Object *obj); > - > static inline TPMVersion tpm_get_version(TPMIf *ti) > { > if (!ti) { > 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 */ > diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c > index 954b7b0e5d..6aac9bfe6b 100644 > --- a/hw/tpm/tpm_tis.c > +++ b/hw/tpm/tpm_tis.c > @@ -989,9 +989,9 @@ static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb) > /* > * 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); > > return tpm_backend_get_tpm_version(s->be_driver); > } > @@ -1097,6 +1097,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data) > dc->reset = tpm_tis_reset; > dc->vmsd = &vmstate_tpm_tis; > tc->model = TPM_MODEL_TPM_TIS; > + tc->get_version = tpm_tis_get_tpm_version; > tc->request_completed = tpm_tis_request_completed; > } > Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index dbd2b0cc7a..9439330cf1 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -38,6 +38,7 @@ typedef struct TPMIfClass { enum TpmModel model; void (*request_completed)(TPMIf *obj); + enum TPMVersion (*get_version)(TPMIf *obj); } TPMIfClass; int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); @@ -53,15 +54,13 @@ static inline TPMIf *tpm_find(void) return TPM_IF(obj); } -TPMVersion tpm_tis_get_tpm_version(Object *obj); - static inline TPMVersion tpm_get_version(TPMIf *ti) { if (!ti) { 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 */ diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 954b7b0e5d..6aac9bfe6b 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -989,9 +989,9 @@ static void tpm_tis_realloc_buffer(TPMSizedBuffer *sb) /* * 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); return tpm_backend_get_tpm_version(s->be_driver); } @@ -1097,6 +1097,7 @@ static void tpm_tis_class_init(ObjectClass *klass, void *data) dc->reset = tpm_tis_reset; dc->vmsd = &vmstate_tpm_tis; tc->model = TPM_MODEL_TPM_TIS; + tc->get_version = tpm_tis_get_tpm_version; tc->request_completed = tpm_tis_request_completed; }
Do not hardcode TPM device model to lookup version, use an interface instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/sysemu/tpm.h | 5 ++--- hw/tpm/tpm_tis.c | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-)