[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH] tests: fix tpm-crb tpm-tis tests race
From: |
Stefan Berger |
Subject: |
[Qemu-stable] [PATCH] tests: fix tpm-crb tpm-tis tests race |
Date: |
Thu, 31 May 2018 13:28:49 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
Please apply the following commit to QEMU 2.12:
commit 7647d5c6b5e3b3f36a6e0441c81ae3fe797eb233
Author: Marc-André Lureau <address@hidden>
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 <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-stable] [PATCH] tests: fix tpm-crb tpm-tis tests race,
Stefan Berger <=