Commit dd353157 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

tests/test-bdrv-drain: Fix too late qemu_event_reset() 



qemu_event_reset() must be called before the AIO request in a different
iothread is submitted. Otherwise the request could be completed before
we do the qemu_event_reset() and the test would hang in
qemu_event_wait().

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Tested-by: default avatarMax Reitz <mreitz@redhat.com>
parent 90042c6a

tests/test-bdrv-drain.c

+2 −2
Original line number Diff line number Diff line
@@ -694,6 +694,8 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread) 
    s->bh_indirection_ctx = ctx_b;



    aio_ret = -EINPROGRESS;

    qemu_event_reset(&done_event);



    if (drain_thread == 0) {

        acb = blk_aio_preadv(blk, 0, &qiov, 0, test_iothread_aio_cb, &aio_ret);

    } else {
@@ -723,7 +725,6 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread) 
         * but the drain in this thread can continue immediately after

         * bdrv_dec_in_flight() and aio_ret might be assigned only slightly

         * later. */

        qemu_event_reset(&done_event);

        do_drain_begin(drain_type, bs);

        g_assert_cmpint(bs->in_flight, ==, 0);
@@ -743,7 +744,6 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread) 
        }

        break;

    case 1:

        qemu_event_reset(&done_event);

        aio_bh_schedule_oneshot(ctx_a, test_iothread_drain_entry, &data);

        qemu_event_wait(&done_event);

        break;