From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwpTe-0000lI-4m for qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:00:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwpTZ-0004JC-Ap for qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:00:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51138) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwpTZ-0004HW-3w for qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:00:37 -0400 From: Eduardo Habkost Date: Tue, 26 Sep 2017 10:00:28 -0300 Message-Id: <20170926130028.12471-1-ehabkost@redhat.com> In-Reply-To: <20170926122427.GC4115@localhost.localdomain> References: <20170926122427.GC4115@localhost.localdomain> Subject: [Qemu-devel] [PATCH] iothread: Make iothread_stop() idempotent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Maydell , Marcel Apfelbaum , Christian Borntraeger , Stefan Hajnoczi , Igor Mammedov Currently, iothread_stop_all() makes all iothread objects unsafe to be destroyed, because qemu_thread_join() ends up being called twice. To fix this, make iothread_stop() idempotent by checking thread->stopped. Fixes the following crash: qemu-system-x86_64 -object iothread,id=iothread0 -monitor stdio -display none QEMU 2.10.50 monitor - type 'help' for more information (qemu) quit qemu: qemu_thread_join: No such process Aborted (core dumped) Reported-by: Christian Borntraeger Signed-off-by: Eduardo Habkost --- iothread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iothread.c b/iothread.c index 44c8944dc4..59d0850988 100644 --- a/iothread.c +++ b/iothread.c @@ -85,7 +85,7 @@ static int iothread_stop(Object *object, void *opaque) IOThread *iothread; iothread = (IOThread *)object_dynamic_cast(object, TYPE_IOTHREAD); - if (!iothread || !iothread->ctx) { + if (!iothread || !iothread->ctx || iothread->stopping) { return 0; } iothread->stopping = true; -- 2.13.5