From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Fri, 9 Oct 2015 15:17:35 +0000 (+0200)
Subject: vhost-user-test: move wait_for_fds() out
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cf72b57f894dd47c32750cf51de1d195a19c5e48;p=qemu.git

vhost-user-test: move wait_for_fds() out

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>
---

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 56df5cc552..827c0c4a97 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -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++) {