diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2017-09-26 10:00:28 -0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-29 10:56:56 +0200 |
| commit | 65072c157e466db2785748a929e775703b20eefe (patch) | |
| tree | ca7fac5e1f98dd695c59b93b572f490acd614b27 /iothread.c | |
| parent | cff3e8b8d65abf3ac8be50de2020b92b54df0547 (diff) | |
iothread: Make iothread_stop() idempotent
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 <borntraeger@de.ibm.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170926130028.12471-1-ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'iothread.c')
| -rw-r--r-- | iothread.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |