[PATCH v2 0/3] qtest/migration: Fixes around multifd_tcp_channels_none migration qtest

[PATCH v2 0/3] qtest/migration: Fixes around multifd_tcp_channels_none migration qtest

[Het Gala]

With the introduction of new patchset to have 'channels' as the start
argument of migrate QAPIs instead of 'uri' (tests/qtest/migration: Add
tests for introducing 'channels' argument in migrate QAPIs), a few minor
issues got went unnoticed, which were caught while trying to introduce
similar qtests in migration-test.c
Fix multifd_tcp_channels_none qtest to actually utilize 'channels' arg
in migrate QAPIs, fix double freeing of addr Qdict and typos in that
patchset.

This patchset is built on top of (tests/qtest/migration: Add tests for
introducing 'channels' argument in migrate QAPIs) 

Can find the build pipeline at : https://gitlab.com/galahet/Qemu/-/pipelines/1245462266

v1 --> v2:
---------
1. Split the second patch into different patches - One to deal with double
   freeing of Qdict and other to add connect_channels inside
   multifd_tcp_channels_none to actually use 'channels' arg.
2. use 'git commit --fixup' to improve commit message as well as
   to inform on which commit is the fix meant to be.

Het Gala (3):
  fixup! tests/qtest/migration: Add negative tests to validate migration
    QAPIs
  fixup! tests/qtest/migration: Add migrate_set_ports into migrate_qmp
    to update migration port value
  fixup! tests/qtest/migration: Add multifd_tcp_plain test using list of
    channels instead of uri

 tests/qtest/migration-helpers.c | 4 ++--
 tests/qtest/migration-test.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-- 
2.22.3

[PATCH v2 1/3] fixup! tests/qtest/migration: Add negative tests to validate migration QAPIs

[Het Gala]

Signed-off-by: Het Gala <het.gala@nutanix.com>
---
 tests/qtest/migration-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index d03a655f83..584d7c496f 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1724,7 +1724,7 @@ static void test_precopy_common(MigrateCommon *args)
     }
 
     if (args->result == MIG_TEST_QMP_ERROR) {
-        migrate_qmp_fail(from, args->connect_uri, args->connect_uri, "{}");
+        migrate_qmp_fail(from, args->connect_uri, args->connect_channels, "{}");
         goto finish;
     }
 
-- 
2.22.3

[PATCH v2 2/3] fixup! tests/qtest/migration: Add migrate_set_ports into migrate_qmp to update migration port value

[Het Gala]

Signed-off-by: Het Gala <het.gala@nutanix.com>
---
 tests/qtest/migration-helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
index b2a90469fb..3b72cad6c1 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -131,7 +131,7 @@ static void migrate_set_ports(QTestState *to, QList *channel_list)
 {
     QDict *addr;
     QListEntry *entry;
-    g_autofree const char *addr_port = NULL;
+    const char *addr_port = NULL;
 
     addr = migrate_get_connect_qdict(to);
 
@@ -143,7 +143,7 @@ static void migrate_set_ports(QTestState *to, QList *channel_list)
             qdict_haskey(addr, "port") &&
             (strcmp(qdict_get_str(addrdict, "port"), "0") == 0)) {
                 addr_port = qdict_get_str(addr, "port");
-                qdict_put_str(addrdict, "port", addr_port);
+                qdict_put_str(addrdict, "port", g_strdup(addr_port));
         }
     }
 
-- 
2.22.3

[PATCH v2 3/3] fixup! tests/qtest/migration: Add multifd_tcp_plain test using list of channels instead of uri

[Het Gala]

Signed-off-by: Het Gala <het.gala@nutanix.com>
---
 tests/qtest/migration-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 584d7c496f..5d6d8cd634 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1728,7 +1728,7 @@ static void test_precopy_common(MigrateCommon *args)
         goto finish;
     }
 
-    migrate_qmp(from, to, args->connect_uri, NULL, "{}");
+    migrate_qmp(from, to, args->connect_uri, args->connect_channels, "{}");
 
     if (args->result != MIG_TEST_SUCCEED) {
         bool allow_active = args->result == MIG_TEST_FAIL;
-- 
2.22.3

Re: [PATCH v2 0/3] qtest/migration: Fixes around multifd_tcp_channels_none migration qtest

[Peter Xu]

On Tue, Apr 09, 2024 at 11:00:08AM +0000, Het Gala wrote:
> With the introduction of new patchset to have 'channels' as the start
> argument of migrate QAPIs instead of 'uri' (tests/qtest/migration: Add
> tests for introducing 'channels' argument in migrate QAPIs), a few minor
> issues got went unnoticed, which were caught while trying to introduce
> similar qtests in migration-test.c
> Fix multifd_tcp_channels_none qtest to actually utilize 'channels' arg
> in migrate QAPIs, fix double freeing of addr Qdict and typos in that
> patchset.
> 
> This patchset is built on top of (tests/qtest/migration: Add tests for
> introducing 'channels' argument in migrate QAPIs) 
> 
> Can find the build pipeline at : https://gitlab.com/galahet/Qemu/-/pipelines/1245462266
> 
> v1 --> v2:
> ---------
> 1. Split the second patch into different patches - One to deal with double
>    freeing of Qdict and other to add connect_channels inside
>    multifd_tcp_channels_none to actually use 'channels' arg.
> 2. use 'git commit --fixup' to improve commit message as well as
>    to inform on which commit is the fix meant to be.
> 
> Het Gala (3):
>   fixup! tests/qtest/migration: Add negative tests to validate migration
>     QAPIs
>   fixup! tests/qtest/migration: Add migrate_set_ports into migrate_qmp
>     to update migration port value
>   fixup! tests/qtest/migration: Add multifd_tcp_plain test using list of
>     channels instead of uri

queued, thanks.

-- 
Peter Xu