[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/42] tpm-be: report error instead of front-end
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 25/42] tpm-be: report error instead of front-end |
Date: |
Tue, 10 Oct 2017 00:56:06 +0200 |
Backend can give more accurate error description, and lift out the job
from the frontend.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/sysemu/tpm_backend.h | 3 ++-
backends/tpm.c | 3 ++-
hw/tpm/tpm_tis.c | 4 +---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index dd4fb288ea..51dfc0de9c 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -100,12 +100,13 @@ enum TpmType tpm_backend_get_type(TPMBackend *s);
* @s: the backend to initialized
* @tpmif: TPM interface
* @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.
*
* 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:
diff --git a/backends/tpm.c b/backends/tpm.c
index 58f823d54c..7b108bd5d8 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -54,9 +54,10 @@ enum TpmType tpm_backend_get_type(TPMBackend *s)
return k->type;
}
-int tpm_backend_init(TPMBackend *s, TPMIf *tpmif)
+int tpm_backend_init(TPMBackend *s, TPMIf *tpmif, Error **errp)
{
if (s->tpmif) {
+ error_setg(errp, "TPM backend '%s' is already initialized", s->id);
return -1;
}
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index 355427ab29..2fbc760730 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -1069,9 +1069,7 @@ static void tpm_tis_realizefn(DeviceState *dev, Error
**errp)
s->be_driver->fe_model = TPM_MODEL_TPM_TIS;
- if (tpm_backend_init(s->be_driver, TPM_IF(s))) {
- error_setg(errp, "tpm_tis: backend driver with id %s could not be "
- "initialized", s->backend);
+ if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
return;
}
--
2.14.1.146.gd35faa819
- Re: [Qemu-devel] [PATCH 21/42] tpm: move recv_data_callback to TPM interface, (continued)
- [Qemu-devel] [PATCH 22/42] tpm-backend: store TPMIf interface, improve backend_init(), Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 23/42] tpm-tis: no longer expose TPMState, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 24/42] tpm-be: call request_completed() out of thread, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 25/42] tpm-be: report error instead of front-end,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 26/42] tpm-be: ask model to the TPM interface, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 27/42] tpm: remove unused opened code, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 28/42] tpm-passthrough: don't save guessed cancel_path in options, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 29/42] tpm-be: update optional function pointers, Marc-André Lureau, 2017/10/09