Commit 7647d5c6 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael Tokarev
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 6b187547

tests/tpm-emu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }