[PATCH 08/18] tests: merge code for UNIX and TCP migration pre-copy tests

["Daniel P. Berrangé" <berrange@redhat.com>]

The test cases differ only in the URI they provide to the migration
commands, and the ability to set the dirty_ring mode. This code is
trivially merged into a common helper.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 roms/seabios                 |  2 +-
 tests/qtest/migration-test.c | 86 ++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/roms/seabios b/roms/seabios
index 6a62e0cb0d..2dd4b9b3f8 160000
--- a/roms/seabios
+++ b/roms/seabios
@@ -1 +1 @@
-Subproject commit 6a62e0cb0dfe9cd28b70547dbea5caf76847c3a9
+Subproject commit 2dd4b9b3f84019668719344b40dba79d681be41c
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 7b42f6fd90..c1058dc944 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -796,19 +796,34 @@ static void test_baddest(void)
     test_migrate_end(from, to, false);
 }
 
-static void test_precopy_unix_common(bool dirty_ring)
+/*
+ * Common helper for running a precopy migration test
+ *
+ * @listen_uri: the URI for the dst QEMU to listen on
+ * @connect_uri: the URI for the src QEMU to connect to
+ * @dirty_ring: true to use dirty ring tracking
+ *
+ * If @connect_uri is NULL, then it will query the dst
+ * QEMU for its actual listening address and use that
+ * as the connect address. This allows for dynamically
+ * picking a free TCP port.
+ */
+static void test_precopy_common(const char *listen_uri,
+                                const char *connect_uri,
+                                bool dirty_ring)
 {
-    g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
     MigrateStart *args = migrate_start_new();
+    g_autofree char *local_connect_uri = NULL;
     QTestState *from, *to;
 
     args->use_dirty_ring = dirty_ring;
 
-    if (test_migrate_start(&from, &to, uri, args)) {
+    if (test_migrate_start(&from, &to, listen_uri, args)) {
         return;
     }
 
-    /* We want to pick a speed slow enough that the test completes
+    /*
+     * We want to pick a speed slow enough that the test completes
      * quickly, but that it doesn't complete precopy even on a slow
      * machine, so also set the downtime.
      */
@@ -820,7 +835,12 @@ static void test_precopy_unix_common(bool dirty_ring)
     /* Wait for the first serial output from the source */
     wait_for_serial("src_serial");
 
-    migrate_qmp(from, uri, "{}");
+    if (!connect_uri) {
+        local_connect_uri = migrate_get_socket_address(to, "socket-address");
+        connect_uri = local_connect_uri;
+    }
+
+    migrate_qmp(from, connect_uri, "{}");
 
     wait_for_migration_pass(from);
 
@@ -838,16 +858,23 @@ static void test_precopy_unix_common(bool dirty_ring)
     test_migrate_end(from, to, true);
 }
 
+static void test_precopy_unix_common(bool dirty_ring)
+{
+    g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
+
+    test_precopy_common(uri,
+                        uri,
+                        dirty_ring);
+}
+
 static void test_precopy_unix(void)
 {
-    /* Using default dirty logging */
-    test_precopy_unix_common(false);
+    test_precopy_unix_common(false /* dirty_ring */);
 }
 
 static void test_precopy_unix_dirty_ring(void)
 {
-    /* Using dirty ring tracking */
-    test_precopy_unix_common(true);
+    test_precopy_unix_common(true /* dirty_ring */);
 }
 
 #if 0
@@ -942,44 +969,9 @@ static void test_xbzrle_unix(void)
 
 static void test_precopy_tcp(void)
 {
-    MigrateStart *args = migrate_start_new();
-    g_autofree char *uri = NULL;
-    QTestState *from, *to;
-
-    if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", args)) {
-        return;
-    }
-
-    /*
-     * We want to pick a speed slow enough that the test completes
-     * quickly, but that it doesn't complete precopy even on a slow
-     * machine, so also set the downtime.
-     */
-    /* 1 ms should make it not converge*/
-    migrate_set_parameter_int(from, "downtime-limit", 1);
-    /* 1GB/s */
-    migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
-
-    /* Wait for the first serial output from the source */
-    wait_for_serial("src_serial");
-
-    uri = migrate_get_socket_address(to, "socket-address");
-
-    migrate_qmp(from, uri, "{}");
-
-    wait_for_migration_pass(from);
-
-    migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME);
-
-    if (!got_stop) {
-        qtest_qmp_eventwait(from, "STOP");
-    }
-    qtest_qmp_eventwait(to, "RESUME");
-
-    wait_for_serial("dest_serial");
-    wait_for_migration_complete(from);
-
-    test_migrate_end(from, to, true);
+    test_precopy_common("tcp:127.0.0.1:0",
+                        NULL, /* connect_uri */
+                        false /* dirty_ring */);
 }
 
 static void test_migrate_fd_proto(void)
-- 
2.34.1