[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/16] vhost-user-test: move wait_for_fds() out
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v3 11/16] vhost-user-test: move wait_for_fds() out |
Date: |
Thu, 6 Aug 2015 14:40:47 +0200 |
From: Marc-André Lureau <address@hidden>
This function is a precondition for most vhost-user tests.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/vhost-user-test.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 228acb6..551a664 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -205,15 +205,11 @@ static GThread *_thread_new(const gchar *name,
GThreadFunc func, gpointer data)
return thread;
}
-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);
-
end_time = _get_time() + 5 * G_TIME_SPAN_SECOND;
while (!fds_num) {
if (!_cond_wait_until(data_cond, data_mutex, end_time)) {
@@ -227,6 +223,17 @@ 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();
+
/* iterate all regions */
for (i = 0; i < fds_num; i++) {
--
2.4.3
- [Qemu-devel] [PATCH v3 00/16] vhost-user: add migration log support (for 2.5), marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 01/16] configure: probe for memfd, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 03/16] util: add memfd helpers, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 02/16] util: add linux-only memfd fallback, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 04/16] vhost: alloc shareable log, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 05/16] vhost: document log resizing, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 12/16] vhost-user-test: remove useless static check, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 08/16] vhost-user: send log shm fd along with log_base, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 11/16] vhost-user-test: move wait_for_fds() out,
marcandre . lureau <=
- [Qemu-devel] [PATCH v3 14/16] vhost-user-test: learn to tweak various qemu arguments, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 15/16] vhost-user-test: add live-migration test, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 16/16] vhost-user-test: check ownership during migration, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 10/16] net: add trace_vhost_user_event, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 07/16] vhost-user: start and end the va_list, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 13/16] vhost-user-test: wrap server in TestServer struct, marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 06/16] vhost: use variable arguments for vhost_call(), marcandre . lureau, 2015/08/06
- [Qemu-devel] [PATCH v3 09/16] vhost-user: document migration log, marcandre . lureau, 2015/08/06