ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration-test: machine_opts is really arch specific 

And it needs to be in both source and target, so put it on arch_opts.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-7-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2023-06-09 00:49:07 +02:00
parent 832c732c5d
commit bc28a6111d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/qtest/migration-test.c
View File

@ -711,7 +711,6 @@ static int test_migrate_start(QTestState **from, QTestState **to,
g_autofree char *shmem_opts = NULL; g_autofree char *shmem_opts = NULL;
g_autofree char *shmem_path = NULL; g_autofree char *shmem_path = NULL;
const char *arch = qtest_get_arch(); const char *arch = qtest_get_arch();
const char *machine_opts = NULL;
const char *memory_size; const char *memory_size;
if (args->use_shmem) { if (args->use_shmem) {
@ -739,7 +738,6 @@ static int test_migrate_start(QTestState **from, QTestState **to,
start_address = S390_TEST_MEM_START; start_address = S390_TEST_MEM_START;
end_address = S390_TEST_MEM_END; end_address = S390_TEST_MEM_END;
} else if (strcmp(arch, "ppc64") == 0) { } else if (strcmp(arch, "ppc64") == 0) {
machine_opts = "-machine vsmt=8";
memory_size = "256M"; memory_size = "256M";
start_address = PPC_TEST_MEM_START; start_address = PPC_TEST_MEM_START;
end_address = PPC_TEST_MEM_END; end_address = PPC_TEST_MEM_END;
@ -747,12 +745,12 @@ static int test_migrate_start(QTestState **from, QTestState **to,
"'nvramrc=hex .\" _\" begin %x %x " "'nvramrc=hex .\" _\" begin %x %x "
"do i c@ 1 + i c! 1000 +loop .\" B\" 0 " "do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
"until'", end_address, start_address); "until'", end_address, start_address);
arch_opts = g_strdup("-nodefaults"); arch_opts = g_strdup("-nodefaults -machine vsmt=8");
} else if (strcmp(arch, "aarch64") == 0) { } else if (strcmp(arch, "aarch64") == 0) {
init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel)); init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel));
machine_opts = "-machine virt,gic-version=max";
memory_size = "150M"; memory_size = "150M";
arch_opts = g_strdup_printf("-cpu max -kernel %s", bootpath); arch_opts = g_strdup_printf("-machine virt,gic-version=max -cpu max "
"-kernel %s", bootpath);
start_address = ARM_TEST_MEM_START; start_address = ARM_TEST_MEM_START;
end_address = ARM_TEST_MEM_END; end_address = ARM_TEST_MEM_END;
@ -787,14 +785,13 @@ static int test_migrate_start(QTestState **from, QTestState **to,
shmem_opts = g_strdup(""); shmem_opts = g_strdup("");
} }
cmd_source = g_strdup_printf("-accel kvm%s -accel tcg %s " cmd_source = g_strdup_printf("-accel kvm%s -accel tcg "
"-name source,debug-threads=on " "-name source,debug-threads=on "
"-m %s " "-m %s "
"-serial file:%s/src_serial " "-serial file:%s/src_serial "
"%s %s %s %s %s", "%s %s %s %s %s",
args->use_dirty_ring ? args->use_dirty_ring ?
",dirty-ring-size=4096" : "", ",dirty-ring-size=4096" : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs, memory_size, tmpfs,
arch_opts ? arch_opts : "", arch_opts ? arch_opts : "",
arch_source ? arch_source : "", arch_source ? arch_source : "",
@ -808,7 +805,7 @@ static int test_migrate_start(QTestState **from, QTestState **to,
&got_src_stop); &got_src_stop);
} }
cmd_target = g_strdup_printf("-accel kvm%s -accel tcg %s " cmd_target = g_strdup_printf("-accel kvm%s -accel tcg "
"-name target,debug-threads=on " "-name target,debug-threads=on "
"-m %s " "-m %s "
"-serial file:%s/dest_serial " "-serial file:%s/dest_serial "
@ -816,7 +813,6 @@ static int test_migrate_start(QTestState **from, QTestState **to,
"%s %s %s %s %s", "%s %s %s %s %s",
args->use_dirty_ring ? args->use_dirty_ring ?
",dirty-ring-size=4096" : "", ",dirty-ring-size=4096" : "",
machine_opts ? machine_opts : "",
memory_size, tmpfs, uri, memory_size, tmpfs, uri,
arch_opts ? arch_opts : "", arch_opts ? arch_opts : "",
arch_target ? arch_target : "", arch_target ? arch_target : "",