[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 26/32] tpm-tis: use DEFINE_PROP_TPMBE
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 26/32] tpm-tis: use DEFINE_PROP_TPMBE |
Date: |
Sat, 16 Dec 2017 12:41:43 -0500 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <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 db101b6..97cd7f5 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;
@@ -1053,7 +1052,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(),
};
@@ -1066,17 +1065,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.5.5
- [Qemu-devel] [PULL v1 17/32] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be(), (continued)
- [Qemu-devel] [PULL v1 17/32] tpm: rename qemu_find_tpm() -> qemu_find_tpm_be(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 18/32] tpm: lookup the the TPM interface instead of TIS device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 16/32] tpm-tis: simplify header inclusion, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 20/32] tpm: add tpm_cmd_get_size() to tpm_util, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 19/32] tpm: add TPM interface to lookup TPM version, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 21/32] acpi: change TPM TIS data conditions, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 22/32] tpm-emulator: add a FIXME comment about blocking cancel, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 23/32] tpm-tis: remove redundant 'tpm_tis:' in error messages, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 25/32] qdev: add DEFINE_PROP_TPMBE, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 24/32] tpm-tis: check that at most one TPM device exists, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 26/32] tpm-tis: use DEFINE_PROP_TPMBE,
Stefan Berger <=
- [Qemu-devel] [PULL v1 27/32] tpm: remove tpm_register_model(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 30/32] tpm: tpm_passthrough: Read the buffer size from the host device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 28/32] tpm: Move getting TPM buffer size to backends, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 29/32] tpm: pull tpm_util_request() out of tpm_util_test(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 31/32] tpm: tpm_emulator: get and set buffer size of device, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 32/32] tpm: tpm_passthrough: Fail startup if FE buffer size < BE buffer size, Stefan Berger, 2017/12/16
- Re: [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15, Peter Maydell, 2017/12/17