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

migration-test: Make machine_opts regular with other options 

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

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

@ -739,7 +739,7 @@ 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 = "vsmt=8"; 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;
@ -751,7 +751,7 @@ static int test_migrate_start(QTestState **from, QTestState **to,
arch_target = g_strdup("-nodefaults"); arch_target = g_strdup("-nodefaults");
} 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 = "virt,gic-version=max"; machine_opts = "-machine virt,gic-version=max";
memory_size = "150M"; memory_size = "150M";
arch_source = g_strdup_printf("-cpu max " arch_source = g_strdup_printf("-cpu max "
"-kernel %s", "-kernel %s",
@ -791,14 +791,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%s " cmd_source = g_strdup_printf("-accel kvm%s -accel tcg %s "
"-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",
args->use_dirty_ring ? args->use_dirty_ring ?
",dirty-ring-size=4096" : "", ",dirty-ring-size=4096" : "",
machine_opts ? " -machine " : "",
machine_opts ? machine_opts : "", machine_opts ? machine_opts : "",
memory_size, tmpfs, memory_size, tmpfs,
arch_source, shmem_opts, arch_source, shmem_opts,
@ -811,7 +810,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%s " cmd_target = g_strdup_printf("-accel kvm%s -accel tcg %s "
"-name target,debug-threads=on " "-name target,debug-threads=on "
"-m %s " "-m %s "
"-serial file:%s/dest_serial " "-serial file:%s/dest_serial "
@ -819,7 +818,6 @@ static int test_migrate_start(QTestState **from, QTestState **to,
"%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 " : "",
machine_opts ? machine_opts : "", machine_opts ? machine_opts : "",
memory_size, tmpfs, uri, memory_size, tmpfs, uri,
arch_target, shmem_opts, arch_target, shmem_opts,