[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/22] tests: fix tpm-crb tpm-tis tests race
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 12/22] tests: fix tpm-crb tpm-tis tests race |
Date: |
Sun, 20 May 2018 09:14:58 +0300 |
From: Marc-André Lureau <address@hidden>
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>
---
tests/tpm-emu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
--
2.11.0
- Re: [Qemu-trivial] [Qemu-devel] [PULL 20/22] gdbstub: Handle errors in gdb_accept(), (continued)
- [Qemu-trivial] [PULL 08/22] qemu-img: remove references to GEN_DOCS, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 07/22] qemu-img.texi: fix command ordering, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 22/22] acpi: fix a comment about aml_call0(), Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 10/22] qemu-img-cmds.hx: add passive-aggressive note, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 21/22] qapi/net.json: Fix the version number of the "vlan" removal, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 05/22] HACKING: document preference for g_new instead of g_malloc, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 09/22] qemu-img: Make documentation between .texi and .hx consistent, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 16/22] qemu-options: Allow -no-user-config again, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 11/22] hw/ide/ahci: Keep ALLWINNER_AHCI() macro internal, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 12/22] tests: fix tpm-crb tpm-tis tests race,
Michael Tokarev <=
- [Qemu-trivial] [PULL 19/22] gdbstub: Use qemu_set_cloexec(), Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 18/22] replace functions which are only available in glib-2.24, Michael Tokarev, 2018/05/20
- [Qemu-trivial] [PULL 14/22] Remove unnecessary variables for function return value, Michael Tokarev, 2018/05/20
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2018-05-20, Peter Maydell, 2018/05/21