[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen stable-4.14] tpm: tpm_spapr: Exit on TPM backend failures



commit 42e9a42083bdb253f32766038fa64063d6351b5e
Author:     Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>
AuthorDate: Tue Jul 7 16:16:24 2020 -0400
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Sep 2 19:06:19 2020 -0500

    tpm: tpm_spapr: Exit on TPM backend failures
    
    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@xxxxxxxxxxxxx>
    Reviewed-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
    Message-id: 20200707201625.4177419-2-stefanb@xxxxxxxxxxxxxxxxxx
    (cherry picked from commit f8b332a1ff107dc014a52eaf9bf547995205f18a)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 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 ce65eb2e45..b67aafb24e 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)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.14



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.