| Message ID | 20200707201625.4177419-2-stefanb@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | tpm: Some fixes | expand |
Hi On Wed, Jul 8, 2020 at 12:17 AM Stefan Berger <stefanb@linux.vnet.ibm.com> wrote: > Exit on TPM backend failures in the same way as the TPM CRB and TIS device > models do. With this change we now get an error report when the backend > did not start up properly: > > error: internal error: qemu unexpectedly closed the monitor: > 2020-07-07T12:49:28.333928Z qemu-system-ppc64: tpm-emulator: \ > TPM result for CMD_INIT: 0x101 operation failed > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> > --- > hw/tpm/tpm_spapr.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c > index cb4dfd1e6a..8288ab0a15 100644 > --- a/hw/tpm/tpm_spapr.c > +++ b/hw/tpm/tpm_spapr.c > @@ -306,7 +306,10 @@ static void tpm_spapr_reset(SpaprVioDevice *dev) > TPM_SPAPR_BUFFER_MAX); > > tpm_backend_reset(s->be_driver); > - tpm_spapr_do_startup_tpm(s, s->be_buffer_size); > + > + if (tpm_spapr_do_startup_tpm(s, s->be_buffer_size) < 0) { > + exit(1); > + } > Not ideal, but consistent with CRB & TIS. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> } > > static enum TPMVersion tpm_spapr_get_version(TPMIf *ti) > -- > 2.24.1 > > >
diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index cb4dfd1e6a..8288ab0a15 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -306,7 +306,10 @@ static void tpm_spapr_reset(SpaprVioDevice *dev) TPM_SPAPR_BUFFER_MAX); tpm_backend_reset(s->be_driver); - tpm_spapr_do_startup_tpm(s, s->be_buffer_size); + + if (tpm_spapr_do_startup_tpm(s, s->be_buffer_size) < 0) { + exit(1); + } } static enum TPMVersion tpm_spapr_get_version(TPMIf *ti)
Exit on TPM backend failures in the same way as the TPM CRB and TIS device models do. With this change we now get an error report when the backend did not start up properly: error: internal error: qemu unexpectedly closed the monitor: 2020-07-07T12:49:28.333928Z qemu-system-ppc64: tpm-emulator: \ TPM result for CMD_INIT: 0x101 operation failed Signed-off-by: Stefan Berger <stefanb@linux.ibm.com> --- hw/tpm/tpm_spapr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)