diff mbox

tests: fix tpm-crb tpm-tis tests race

Message ID 10f6e1a1-ad16-9877-4b71-14b9cc46a58f@linux.vnet.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Stefan Berger May 31, 2018, 5:28 p.m. UTC 
Please apply the following commit to QEMU 2.12:


commit 7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date:   Tue May 8 11:29:35 2018 -0400

     tests: fix tpm-crb tpm-tis tests race

     No need to close the TPM data socket on the emulator end, qemu will
     close it after a SHUTDOWN. This avoids a race between close() and
     read() in the TPM data thread.

     Reported-by: Peter Maydell <peter.maydell@linaro.org>
     Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

     Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

     Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

     Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


          }
diff mbox

Patch

diff --git a/tests/tpm-emu.c b/tests/tpm-emu.c
index 4dada76834..8c2bd53cad 100644
--- a/tests/tpm-emu.c
+++ b/tests/tpm-emu.c
@@ -125,7 +125,7 @@  void *tpm_emu_ctrl_thread(void *data)
          case CMD_SHUTDOWN: {
              ptm_res res = 0;
              qio_channel_write(ioc, (char *)&res, sizeof(res), 
&error_abort);
-            qio_channel_close(s->tpm_ioc, &error_abort);
+            /* the tpm data thread is expected to finish now */
              g_thread_join(s->emu_tpm_thread);
              break;