aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2018-05-08 11:29:35 -0400
committerMichael Tokarev <mjt@tls.msk.ru>2018-05-20 08:38:38 +0300
commit7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233 (patch)
treee9d8daf15f36740f10fb27dfe5af0b77e632c318
parent6b1875476313ce320a6a1d1827e85511365a469c (diff)
downloadqemu-7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233.zip
qemu-7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233.tar.gz
qemu-7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233.tar.bz2
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>
-rw-r--r--tests/tpm-emu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tpm-emu.c b/tests/tpm-emu.c
index 4dada76..8c2bd53 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;
}