david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost-user-test: move wait_for_fds() out

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
This commit is contained in:
Marc-André Lureau 2015-10-09 17:17:35 +02:00 committed by Michael S. Tsirkin
parent 31190ed781
commit cf72b57f89
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/vhost-user-test.c
View File

@ -126,12 +126,9 @@ static gboolean g_cond_wait_until(CompatGCond cond, CompatGMutex mutex,
} }
#endif #endif
static void read_guest_mem(void) static void wait_for_fds(void)
{ {
uint32_t *guest_mem;
gint64 end_time; gint64 end_time;
int i, j;
size_t size;
g_mutex_lock(&data_mutex); 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, >, 0);
g_assert_cmpint(fds_num, ==, memory.nregions); 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 */ /* iterate all regions */
for (i = 0; i < fds_num; i++) { for (i = 0; i < fds_num; i++) {