ping
On Tue, Aug 21, 2018 at 12:07 PM Marc-André Lureau
<marcandre.lur...@redhat.com> wrote:
>
> -object iothread,id=foo,? will crash qemu:
>
> qemu-system-x86_64:qemu-thread-posix.c:128: qemu_cond_destroy: Assertion
> `cond->initialized' failed.
>
> Use thread_id != -1 to check if iothread_complete() finished
> successfully and the mutex/cond have been initialized.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> iothread.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/iothread.c b/iothread.c
> index aff1281257..2fb1cdf55d 100644
> --- a/iothread.c
> +++ b/iothread.c
> @@ -110,6 +110,7 @@ static void iothread_instance_init(Object *obj)
> IOThread *iothread = IOTHREAD(obj);
>
> iothread->poll_max_ns = IOTHREAD_POLL_MAX_NS_DEFAULT;
> + iothread->thread_id = -1;
> }
>
> static void iothread_instance_finalize(Object *obj)
> @@ -117,6 +118,11 @@ static void iothread_instance_finalize(Object *obj)
> IOThread *iothread = IOTHREAD(obj);
>
> iothread_stop(iothread);
> +
> + if (iothread->thread_id != -1) {
> + qemu_cond_destroy(&iothread->init_done_cond);
> + qemu_mutex_destroy(&iothread->init_done_lock);
> + }
> /*
> * Before glib2 2.33.10, there is a glib2 bug that GSource context
> * pointer may not be cleared even if the context has already been
> @@ -135,8 +141,6 @@ static void iothread_instance_finalize(Object *obj)
> g_main_context_unref(iothread->worker_context);
> iothread->worker_context = NULL;
> }
> - qemu_cond_destroy(&iothread->init_done_cond);
> - qemu_mutex_destroy(&iothread->init_done_lock);
> }
>
> static void iothread_complete(UserCreatable *obj, Error **errp)
> @@ -147,7 +151,6 @@ static void iothread_complete(UserCreatable *obj, Error
> **errp)
>
> iothread->stopping = false;
> iothread->running = true;
> - iothread->thread_id = -1;
> iothread->ctx = aio_context_new(&local_error);
> if (!iothread->ctx) {
> error_propagate(errp, local_error);
> --
> 2.18.0.547.g1d89318c48
>
>
--
Marc-André Lureau
