diff options
| author | Juan Quintela <quintela@redhat.com> | 2019-12-12 23:20:31 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:32:24 +0100 |
| commit | cd49673155a7cf4be879d1451c183a836347ee30 (patch) | |
| tree | f2c0cebe49fb05927b7431ab418728ab5f93e650 | |
| parent | c5f40ff9f693e56ad7358a41b46dd01d27ad64e7 (diff) | |
migration-test: Move -incomming handling to common commandline
Signed-off-by: Juan Quintela <quintela@redhat.com>
Tested-by: Cornelia Huck <cohuck@redhat.com> #s390x
Tested-by: Laurent Vivier <lvivier@redhat.com>
| -rw-r--r-- | tests/migration-test.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c index e1304d70fc..14f2ce30fb 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -580,9 +580,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, machine_args = ""; memory_size = "150M"; cmd_src = g_strdup_printf("-drive file=%s,format=raw", bootpath); - cmd_dst = g_strdup_printf("-drive file=%s,format=raw" - " -incoming %s", - bootpath, uri); + cmd_dst = g_strdup(cmd_src); start_address = X86_TEST_MEM_START; end_address = X86_TEST_MEM_END; } else if (g_str_equal(arch, "s390x")) { @@ -591,9 +589,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, machine_args = ""; memory_size = "128M"; cmd_src = g_strdup_printf("-bios %s", bootpath); - cmd_dst = g_strdup_printf("-bios %s" - " -incoming %s", - bootpath, uri); + cmd_dst = g_strdup(cmd_src); start_address = S390_TEST_MEM_START; end_address = S390_TEST_MEM_END; } else if (strcmp(arch, "ppc64") == 0) { @@ -605,7 +601,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, "'nvramrc=hex .\" _\" begin %x %x " "do i c@ 1 + i c! 1000 +loop .\" B\" 0 " "until'", end_address, start_address); - cmd_dst = g_strdup_printf(" -incoming %s", uri); + cmd_dst = g_strdup(""); start_address = PPC_TEST_MEM_START; end_address = PPC_TEST_MEM_END; } else if (strcmp(arch, "aarch64") == 0) { @@ -616,11 +612,7 @@ static int test_migrate_start(QTestState **from, QTestState **to, cmd_src = g_strdup_printf("-cpu max " "-kernel %s", bootpath); - cmd_dst = g_strdup_printf("-cpu max " - "-kernel %s " - "-incoming %s", - bootpath, uri); - + cmd_dst = g_strdup(cmd_src); start_address = ARM_TEST_MEM_START; end_address = ARM_TEST_MEM_END; @@ -650,11 +642,11 @@ static int test_migrate_start(QTestState **from, QTestState **to, cmd_source = g_strdup_printf("-machine %saccel=kvm:tcg%s " "-name source,debug-threads=on " - "-serial file:%s/src_serial " "-m %s " + "-serial file:%s/src_serial " "%s %s %s %s", machine_type, machine_args, - tmpfs, memory_size, + memory_size, tmpfs, cmd_src, shmem_opts, opts_src, ignore_stderr); g_free(cmd_src); *from = qtest_init(cmd_source); @@ -664,9 +656,10 @@ static int test_migrate_start(QTestState **from, QTestState **to, "-name target,debug-threads=on " "-m %s " "-serial file:%s/dest_serial " + "-incoming %s " "%s %s %s %s", machine_type, machine_args, - tmpfs, memory_size, + memory_size, tmpfs, uri, cmd_dst, shmem_opts, opts_dst, ignore_stderr); g_free(cmd_dst); *to = qtest_init(cmd_target); |