haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
(cherry picked from commit 7647d5c6b5)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
stable-2.12
Marc-André Lureau 2018-05-08 11:29:35 -04:00 committed by Michael Roth
parent 4743c23509
commit 4319ae939c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/tpm-emu.c
View File

@ -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;
}