openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

tpm-be: report error instead of front-end 

Backend can give more accurate error description, and lift out the job
from the frontend.

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:03 +01:00 committed by Stefan Berger
parent 689990598a
commit 0bd6c8a9cf
3 changed files with 5 additions and 5 deletions
backends
tpm.c
hw/tpm
tpm_tis.c
include/sysemu
tpm_backend.h

3
backends/tpm.c
View File

@ -54,9 +54,10 @@ enum TpmType tpm_backend_get_type(TPMBackend *s)
return k->type; return k->type;
} }
int tpm_backend_init(TPMBackend *s, TPMIf *tpmif) int tpm_backend_init(TPMBackend *s, TPMIf *tpmif, Error **errp)
{ {
if (s->tpmif) { if (s->tpmif) {
error_setg(errp, "TPM backend '%s' is already initialized", s->id);
return -1; return -1;
} }

4
hw/tpm/tpm_tis.c
View File

@ -1074,9 +1074,7 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
s->be_driver->fe_model = TPM_MODEL_TPM_TIS; s->be_driver->fe_model = TPM_MODEL_TPM_TIS;
if (tpm_backend_init(s->be_driver, TPM_IF(s))) { if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
error_setg(errp, "tpm_tis: backend driver with id %s could not be "
"initialized", s->backend);
return; return;
} }

3
include/sysemu/tpm_backend.h
View File

@ -99,12 +99,13 @@ enum TpmType tpm_backend_get_type(TPMBackend *s);
* @s: the backend to initialized * @s: the backend to initialized
* @tpmif: TPM interface * @tpmif: TPM interface
* @datacb: callback for sending data to frontend * @datacb: callback for sending data to frontend
* @errp: a pointer to return the #Error object if an error occurs.
* *
* Initialize the backend with the given variables. * Initialize the backend with the given variables.
* *
* Returns 0 on success. * Returns 0 on success.
*/ */
int tpm_backend_init(TPMBackend *s, TPMIf *tpmif); int tpm_backend_init(TPMBackend *s, TPMIf *tpmif, Error **errp);
/** /**
* tpm_backend_startup_tpm: * tpm_backend_startup_tpm: