From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxdx6-0003m6-0k for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:08:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wxdww-000442-Fu for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:08:35 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:38764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxdww-00042w-Ar for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:08:26 -0400 Received: by mail-we0-f182.google.com with SMTP id q59so2512827wes.27 for ; Thu, 19 Jun 2014 08:08:25 -0700 (PDT) From: Nikolay Nikolaev Date: Thu, 19 Jun 2014 18:08:18 +0300 Message-ID: <20140619150811.10499.43830.stgit@3820> In-Reply-To: <20140619150355.10499.53297.stgit@3820> References: <20140619150355.10499.53297.stgit@3820> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 4/6] qtest: fix vhost-user-test unbalanced mutex locks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Signed-off-by: Nikolay Nikolaev --- tests/vhost-user-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 2934379..2af2381 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -269,6 +269,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) return; } + g_mutex_lock(data_mutex); memcpy(p, buf, VHOST_USER_HDR_SIZE); if (msg.size) { @@ -302,7 +303,6 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) /* signal the test that it can continue */ g_cond_signal(data_cond); - g_mutex_unlock(data_mutex); break; case VHOST_USER_SET_VRING_KICK: @@ -319,6 +319,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) default: break; } + g_mutex_unlock(data_mutex); } static const char *init_hugepagefs(void) @@ -385,7 +386,6 @@ int main(int argc, char **argv) /* run the main loop thread so the chardev may operate */ data_mutex = _mutex_new(); data_cond = _cond_new(); - g_mutex_lock(data_mutex); _thread_new(NULL, thread_function, NULL); qemu_cmd = g_strdup_printf(QEMU_CMD, hugefs, socket_path);