Commit 3779d180 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Pull request

# gpg: Signature made Mon 14 Oct 2019 09:52:03 BST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  test-bdrv-drain: fix iothread_join() hang

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4a512a95 69de4844

tests/iothread.c

+8 −2
Original line number Diff line number Diff line
@@ -55,10 +55,16 @@ static void *iothread_run(void *opaque) 
    return NULL;

}



void iothread_join(IOThread *iothread)

static void iothread_stop_bh(void *opaque)

{

    IOThread *iothread = opaque;



    iothread->stopping = true;

    aio_notify(iothread->ctx);

}



void iothread_join(IOThread *iothread)

{

    aio_bh_schedule_oneshot(iothread->ctx, iothread_stop_bh, iothread);

    qemu_thread_join(&iothread->thread);

    qemu_cond_destroy(&iothread->init_done_cond);

    qemu_mutex_destroy(&iothread->init_done_lock);