diff options
author | Marc-André Lureau | 2015-11-27 15:41:19 +0100 |
---|---|---|
committer | Michael S. Tsirkin | 2015-12-02 15:42:26 +0100 |
commit | a899b1ea2a6d6baa18f1c12da566aad35cb0d807 (patch) | |
tree | 2a8caa427d405f4a36b9f351f56301559897ce0b /tests | |
parent | vhost-user-test: fix chardriver race (diff) | |
download | qemu-a899b1ea2a6d6baa18f1c12da566aad35cb0d807.tar.gz qemu-a899b1ea2a6d6baa18f1c12da566aad35cb0d807.tar.xz qemu-a899b1ea2a6d6baa18f1c12da566aad35cb0d807.zip |
vhost-user-test: use unix port for migration
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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vhost-user-test.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 261f4b711a..29205edc81 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; } |