Commit cf72b57f authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

vhost-user-test: move wait_for_fds() out 



This function is a precondition for most vhost-user tests.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarThibaut Collet <thibaut.collet@6wind.com>
parent 31190ed7

tests/vhost-user-test.c

+14 −4
Original line number Diff line number Diff line
@@ -126,12 +126,9 @@ static gboolean g_cond_wait_until(CompatGCond cond, CompatGMutex mutex, 
}

#endif



static void read_guest_mem(void)

static void wait_for_fds(void)

{

    uint32_t *guest_mem;

    gint64 end_time;

    int i, j;

    size_t size;



    g_mutex_lock(&data_mutex);
@@ -148,6 +145,19 @@ static void read_guest_mem(void) 
    g_assert_cmpint(fds_num, >, 0);

    g_assert_cmpint(fds_num, ==, memory.nregions);



    g_mutex_unlock(&data_mutex);

}



static void read_guest_mem(void)

{

    uint32_t *guest_mem;

    int i, j;

    size_t size;



    wait_for_fds();



    g_mutex_lock(&data_mutex);



    /* iterate all regions */

    for (i = 0; i < fds_num; i++) {