[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/28] tpm: add TPM interface to lookup TPM versi
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 19/28] tpm: add TPM interface to lookup TPM version |
Date: |
Mon, 6 Nov 2017 19:39:16 +0100 |
Do not hardcode TPM device model to lookup version, use an interface
instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
---
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 2fe0f1e120..650b4b8565 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -42,6 +42,7 @@ typedef struct TPMIfClass {
enum TpmModel model;
void (*request_completed)(TPMIf *obj);
+ enum TPMVersion (*get_version)(TPMIf *obj);
} TPMIfClass;
#define TYPE_TPM_TIS "tpm-tis"
@@ -54,15 +55,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 1e846f1201..a0b39b6211 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -990,9 +990,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);
}
@@ -1098,6 +1098,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;
}
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PATCH v2 09/28] tpm-passthrough: don't save guessed cancel_path in options, (continued)
- [Qemu-devel] [PATCH v2 09/28] tpm-passthrough: don't save guessed cancel_path in options, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 11/28] tpm-passthrough: pass TPMPassthruState to handle_device_opts, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 12/28] tpm-backend: move set 'id' to common code, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 10/28] tpm-be: update optional function pointers, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 13/28] tpm-passthrough: make it safer to destroy after creation, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 14/28] tpm-passthrough: simplify create(), Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 15/28] tpm-passthrough: workaround a possible race, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 16/28] tpm-tis: simplify header inclusion, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 17/28] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be(), Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 18/28] tpm: lookup the the TPM interface instead of TIS device, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 19/28] tpm: add TPM interface to lookup TPM version,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 20/28] tpm: add tpm_cmd_get_size() to tpm_util, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 21/28] acpi: change TPM TIS data conditions, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 22/28] tpm-emulator: add a FIXME comment about blocking cancel, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 23/28] tpm-tis: remove redundant 'tpm_tis:' in error messages, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 24/28] tpm-tis: check that at most one TPM device exists, Marc-André Lureau, 2017/11/06
- [Qemu-devel] [PATCH v2 25/28] tpm-emulator: protect concurrent ctrl_chr access, Marc-André Lureau, 2017/11/06