falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm-tis: use DEFINE_PROP_TPMBE 

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:24 +01:00 committed by Stefan Berger
parent 493b783035
commit c03785440d
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/tpm/tpm_tis.c
View File

@ -86,7 +86,6 @@ typedef struct TPMState {
TPMBackendCmd cmd; TPMBackendCmd cmd;
char *backend;
TPMBackend *be_driver; TPMBackend *be_driver;
TPMVersion be_tpm_version; TPMVersion be_tpm_version;
} TPMState; } TPMState;
@ -1053,7 +1052,7 @@ static const VMStateDescription vmstate_tpm_tis = {
static Property tpm_tis_properties[] = { static Property tpm_tis_properties[] = {
DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ), 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(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -1066,17 +1065,10 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
return; return;
} }
s->be_driver = qemu_find_tpm_be(s->backend);
if (!s->be_driver) { if (!s->be_driver) {
error_setg(errp, "backend driver with id %s could not be found", error_setg(errp, "'tpmdev' property is required");
s->backend);
return; return;
} }
if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
return;
}
if (s->irq_num > 15) { if (s->irq_num > 15) {
error_setg(errp, "IRQ %d is outside valid range of 0 to 15", error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
s->irq_num); s->irq_num);