[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/87] migration-test: Move -incomming handling to common commandl
From: |
Paolo Bonzini |
Subject: |
[PULL 09/87] migration-test: Move -incomming handling to common commandline |
Date: |
Wed, 18 Dec 2019 13:01:35 +0100 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Tested-by: Cornelia Huck <address@hidden> #s390x
Tested-by: Laurent Vivier <address@hidden>
---
tests/migration-test.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index e1304d7..14f2ce3 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);
--
1.8.3.1
- [PULL 00/87] Misc patches for 2019-12-18, Paolo Bonzini, 2019/12/18
- [PULL 01/87] kvm: Reallocate dirty_bmap when we change a slot, Paolo Bonzini, 2019/12/18
- [PULL 02/87] migration-test: Create cmd_soure and cmd_target, Paolo Bonzini, 2019/12/18
- [PULL 03/87] migration-test: Move hide_stderr to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 04/87] migration-test: Move -machine to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 06/87] migration-test: Move shmem handling to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 05/87] migration-test: Move memory size to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 07/87] migration-test: Move -name handling to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 08/87] migration-test: Move -serial handling to common commandline, Paolo Bonzini, 2019/12/18
- [PULL 09/87] migration-test: Move -incomming handling to common commandline,
Paolo Bonzini <=
- [PULL 14/87] tcg: move qemu_tcg_configure to accel/tcg/tcg-all.c, Paolo Bonzini, 2019/12/18
- [PULL 15/87] vl: extract accelerator option processing to a separate function, Paolo Bonzini, 2019/12/18
- [PULL 13/87] vl: move icount configuration earlier, Paolo Bonzini, 2019/12/18
- [PULL 12/87] memory: do not look at current_machine->accel, Paolo Bonzini, 2019/12/18
- [PULL 11/87] migration-test: Use a struct for test_migrate_start parameters, Paolo Bonzini, 2019/12/18
- [PULL 16/87] vl: merge -accel processing into configure_accelerators, Paolo Bonzini, 2019/12/18
- [PULL 22/87] qom: add object_new_with_class, Paolo Bonzini, 2019/12/18
- [PULL 23/87] accel: pass object to accel_init_machine, Paolo Bonzini, 2019/12/18
- [PULL 25/87] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size", Paolo Bonzini, 2019/12/18
- [PULL 31/87] object: Improve documentation of interfaces, Paolo Bonzini, 2019/12/18