From patchwork Thu Aug 6 12:40:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 504924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 89B771402A9 for ; Fri, 7 Aug 2015 07:49:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=aO9szLZ3; dkim-atps=neutral Received: from localhost ([::1]:45019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNKp5-0008J8-Eq for incoming@patchwork.ozlabs.org; Thu, 06 Aug 2015 09:03:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNKUD-0002Ds-Je for qemu-devel@nongnu.org; Thu, 06 Aug 2015 08:41:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNKUA-0008T8-Dg for qemu-devel@nongnu.org; Thu, 06 Aug 2015 08:41:29 -0400 Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]:33362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNKUA-0008Sz-9S for qemu-devel@nongnu.org; Thu, 06 Aug 2015 08:41:26 -0400 Received: by qkdg63 with SMTP id g63so25547834qkd.0 for ; Thu, 06 Aug 2015 05:41:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=nA7Jdz731Ci9oN0E9+wK6jSCc4QZc+eOZoxYk1+B2+0=; b=aO9szLZ3WSTymK59gB8k6QgqZA+L9n4Ywgjd124xyMzZpGyMRQMKBJQDIKauV9z4BI sC/rlD3a5UYPa/r9Et+0mIKAXsjoKoSKM3iCrT+LDTMwHTEkBEXyn9A8K6TiQREv8sGY 5pCcu3YffYQaFcUXl4mjqwWAjHg0zegEBfROp+Wsey9D0qi++sqBZRPA/h3ybNsr3YWB DbvaIjGjyXA87pZUfvQQCZRrrITENPSCHscqRaMzcK5fXmEpq/F+xHY7rM5dxGUKhYCc MRRMKPHyQiuSAOkZ6iJ6BbdoIM3xWBYtkHXmz97FSFowCARBZu2kWYvyMo2T/YJyq1Nn DBbg== X-Received: by 10.55.48.133 with SMTP id w127mr2648859qkw.53.1438864885891; Thu, 06 Aug 2015 05:41:25 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id s5sm3122408qgs.1.2015.08.06.05.41.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Aug 2015 05:41:25 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 6 Aug 2015 14:40:47 +0200 Message-Id: <1438864852-4939-12-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438864852-4939-1-git-send-email-marcandre.lureau@redhat.com> References: <1438864852-4939-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::232 Cc: haifeng.lin@huawei.com, mst@redhat.com, thibaut.collet@6wind.com, jasowang@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH v3 11/16] vhost-user-test: move wait_for_fds() out X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau This function is a precondition for most vhost-user tests. Signed-off-by: Marc-André Lureau --- 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++) {