[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/25] vhost-user-test: move wait_for_fds() out
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/25] vhost-user-test: move wait_for_fds() out |
Date: |
Fri, 9 Oct 2015 00:18:00 +0300 |
From: Marc-André Lureau <address@hidden>
This function is a precondition for most vhost-user tests.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/vhost-user-test.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 56df5cc..827c0c4 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++) {
--
MST
- [Qemu-devel] [PULL 11/25] vhost-user: add a migration blocker, (continued)
- [Qemu-devel] [PULL 11/25] vhost-user: add a migration blocker, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 08/25] vhost-user: add vhost_user_requires_shm_log(), Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 23/25] vhost-user-test: add live-migration test, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 18/25] vhost: add migration block if memfd failed, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 02/25] linux-headers: add unistd.h, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 12/25] vhost: use a function for each call, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 16/25] vhost user: add rarp sending after live migration for legacy guest, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 17/25] vhost-user: use an enum helper for features mask, Michael S. Tsirkin, 2015/10/09
- [Qemu-devel] [PULL 19/25] vhost-user-test: move wait_for_fds() out,
Michael S. Tsirkin <=
- Re: [Qemu-devel] [PULL 00/25] virtio,pc features, fixes, Peter Maydell, 2015/10/10