[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/38] vhost-user-test: move wait_for_fds() out
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 28/38] vhost-user-test: move wait_for_fds() out |
Date: |
Wed, 21 Oct 2015 13:28:07 +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>
Tested-by: Thibaut Collet <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 18/38] vhost: alloc shareable log, (continued)
- [Qemu-devel] [PULL 18/38] vhost: alloc shareable log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 19/38] vhost-user: send log shm fd along with log_base, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 20/38] vhost-user: add a migration blocker, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 22/38] vhost-user: document migration log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 21/38] vhost: use a function for each call, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 23/38] net: add trace_vhost_user_event, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 24/38] vhost user: add support of live migration, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 25/38] vhost user: add rarp sending after live migration for legacy guest, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 26/38] vhost-user: use an enum helper for features mask, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 27/38] vhost: add migration block if memfd failed, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 28/38] vhost-user-test: move wait_for_fds() out,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 29/38] vhost-user-test: remove useless static check, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 30/38] vhost-user-test: wrap server in TestServer struct, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 31/38] vhost-user-test: learn to tweak various qemu arguments, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 32/38] vhost-user-test: add live-migration test, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 33/38] vhost-user-test: check ownership during migration, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 34/38] seccomp: add memfd_create to whitelist, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 35/38] piix: fix resource leak reported by Coverity, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 36/38] vhost: set the correct queue index in case of migration with multiqueue, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 38/38] hw/isa/lpc_ich9: inject the SMI on the VCPU that is writing to APM_CNT, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 37/38] i386: keep cpu_model field in MachineState uptodate, Michael S. Tsirkin, 2015/10/21