From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48841)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1a3kid-0004Bx-PA
	for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:11:44 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1a3kia-00072U-IF
	for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:11:43 -0500
Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:36385)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1a3kia-00072P-Cg
	for qemu-devel@nongnu.org; Tue, 01 Dec 2015 08:11:40 -0500
Received: by wmww144 with SMTP id w144so172245103wmw.1
	for <qemu-devel@nongnu.org>; Tue, 01 Dec 2015 05:11:39 -0800 (PST)
References: <1448901890-17012-1-git-send-email-marcandre.lureau@redhat.com>
	<1448901890-17012-3-git-send-email-marcandre.lureau@redhat.com>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <1448901890-17012-3-git-send-email-marcandre.lureau@redhat.com>
Date: Tue, 01 Dec 2015 13:11:38 +0000
Message-ID: <874mg2b9f9.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PATCH for-2.5 v4 2/4] vhost-user-test: use unix
	port for migration
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: marcandre.lureau@redhat.com
Cc: qemu-devel@nongnu.org, mst@redhat.com


marcandre.lureau@redhat.com writes:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> TCP port 1234 may be used by another process concurrently. Instead use a
> temporary unix socket.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/vhost-user-test.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> index 261f4b7..29205ed 100644
> --- a/tests/vhost-user-test.c
> +++ b/tests/vhost-user-test.c
> @@ -123,6 +123,7 @@ static VhostUserMsg m __attribute__ ((unused));
>
>  typedef struct TestServer {
>      gchar *socket_path;
> +    gchar *mig_path;
>      gchar *chr_name;
>      CharDriverState *chr;
>      int fds_num;
> @@ -364,6 +365,7 @@ static TestServer *test_server_new(const gchar *name)
>      gchar *chr_path;
>
>      server->socket_path = g_strdup_printf("%s/%s.sock", tmpfs, name);
> +    server->mig_path = g_strdup_printf("%s/%s.mig", tmpfs, name);
>
>      chr_path = g_strdup_printf("unix:%s,server,nowait", server->socket_path);
>      server->chr_name = g_strdup_printf("chr-%s", name);
> @@ -405,6 +407,9 @@ static gboolean _test_server_free(TestServer *server)
>      unlink(server->socket_path);
>      g_free(server->socket_path);
>
> +    unlink(server->mig_path);
> +    g_free(server->mig_path);
> +
>      g_free(server->chr_name);
>      g_free(server);
>
> @@ -512,7 +517,7 @@ static void test_migrate(void)
>  {
>      TestServer *s = test_server_new("src");
>      TestServer *dest = test_server_new("dest");
> -    const char *uri = "tcp:127.0.0.1:1234";
> +    char *uri = g_strdup_printf("%s%s", "unix:", dest->mig_path);
>      QTestState *global = global_qtest, *from, *to;
>      GSource *source;
>      gchar *cmd;
> @@ -583,6 +588,7 @@ static void test_migrate(void)
>      test_server_free(dest);
>      qtest_quit(from);
>      test_server_free(s);
> +    g_free(uri);
>
>      global_qtest = global;
>  }


--
Alex Bennée