Commit 0bd2d233 authored by Peter Xu's avatar Peter Xu Committed by Stefan Hajnoczi
Browse files

iothread: create main loop unconditionally 



Since we've have the gcontext always there, create the main loop
altogether.  The iothread_run() is even cleaner.

Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-id: 20190306115532.23025-4-peterx@redhat.com
Message-Id: <20190306115532.23025-4-peterx@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b506e0f1

iothread.c

+3 −9
Original line number Diff line number Diff line
@@ -66,17 +66,8 @@ static void *iothread_run(void *opaque) 
         * changed in previous aio_poll()

         */

        if (iothread->running && atomic_read(&iothread->run_gcontext)) {

            GMainLoop *loop;



            g_main_context_push_thread_default(iothread->worker_context);

            iothread->main_loop =

                g_main_loop_new(iothread->worker_context, TRUE);

            loop = iothread->main_loop;



            g_main_loop_run(iothread->main_loop);

            iothread->main_loop = NULL;

            g_main_loop_unref(loop);



            g_main_context_pop_thread_default(iothread->worker_context);

        }

    }
@@ -141,6 +132,8 @@ static void iothread_instance_finalize(Object *obj) 
    if (iothread->worker_context) {

        g_main_context_unref(iothread->worker_context);

        iothread->worker_context = NULL;

        g_main_loop_unref(iothread->main_loop);

        iothread->main_loop = NULL;

    }

    qemu_sem_destroy(&iothread->init_done_sem);

}
@@ -153,6 +146,7 @@ static void iothread_init_gcontext(IOThread *iothread) 
    source = aio_get_g_source(iothread_get_aio_context(iothread));

    g_source_attach(source, iothread->worker_context);

    g_source_unref(source);

    iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);

}



static void iothread_complete(UserCreatable *obj, Error **errp)