[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/28] tpm-tis: use DEFINE_PROP_TPMBE
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 27/28] tpm-tis: use DEFINE_PROP_TPMBE |
Date: |
Mon, 6 Nov 2017 19:39:24 +0100 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/tpm/tpm_tis.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index dccc56ab09..a00779f3aa 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -86,7 +86,6 @@ typedef struct TPMState {
TPMBackendCmd cmd;
- char *backend;
TPMBackend *be_driver;
TPMVersion be_tpm_version;
} TPMState;
@@ -1049,7 +1048,7 @@ static const VMStateDescription vmstate_tpm_tis = {
static Property tpm_tis_properties[] = {
DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
- DEFINE_PROP_STRING("tpmdev", TPMState, backend),
+ DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
DEFINE_PROP_END_OF_LIST(),
};
@@ -1062,17 +1061,10 @@ static void tpm_tis_realizefn(DeviceState *dev, Error
**errp)
return;
}
- s->be_driver = qemu_find_tpm_be(s->backend);
if (!s->be_driver) {
- error_setg(errp, "backend driver with id %s could not be found",
- s->backend);
+ error_setg(errp, "'tpmdev' property is required");
return;
}
-
- if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
- return;
- }
-
if (s->irq_num > 15) {
error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
s->irq_num);
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PATCH v2 24/28] tpm-tis: check that at most one TPM device exists, (continued)
[Qemu-devel] [PATCH v2 26/28] qdev: add DEFINE_PROP_TPMBE, Marc-André Lureau, 2017/11/06
[Qemu-devel] [PATCH v2 27/28] tpm-tis: use DEFINE_PROP_TPMBE,
Marc-André Lureau <=
[Qemu-devel] [PATCH v2 28/28] tpm: remove tpm_register_model(), Marc-André Lureau, 2017/11/06
Re: [Qemu-devel] [PATCH v2 00/28] TPM: code cleanup (not 2.11), Stefan Berger, 2017/11/06