Skip to content

Commit

Permalink
migration-test: Move memory size to common commandline
Browse files Browse the repository at this point in the history 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Tested-by: Cornelia Huck <cohuck@redhat.com> #s390x
Tested-by: Laurent Vivier <lvivier@redhat.com>
  • Loading branch information
@bonzini
Juan Quintela authored and bonzini committed Dec 17, 2019
1 parent e022c27 commit 7b6d44c
Showing 1 changed file with 25 additions and 19 deletions.
44 changes: 25 additions & 19 deletions tests/migration-test.c
View file
Expand Up @@ -565,6 +565,7 @@ static int test_migrate_start(QTestState **from, QTestState **to,
const char *arch = qtest_get_arch();
const char *machine_type;
const char *machine_args;
const char *memory_size;

opts_src = opts_src ? opts_src : "";
opts_dst = opts_dst ? opts_dst : "";
Expand All @@ -585,15 +586,14 @@ static int test_migrate_start(QTestState **from, QTestState **to,
init_bootfile(bootpath, x86_bootsect, sizeof(x86_bootsect));
machine_type = "";
machine_args = "";
extra_opts = use_shmem ? get_shmem_opts("150M", shmem_path) : NULL;
cmd_src = g_strdup_printf("-m 150M"
" -name source,debug-threads=on"
memory_size = "150M";
extra_opts = use_shmem ? get_shmem_opts(memory_size, shmem_path) : NULL;
cmd_src = g_strdup_printf(" -name source,debug-threads=on"
" -serial file:%s/src_serial"
" -drive file=%s,format=raw %s",
tmpfs, bootpath,
extra_opts ? extra_opts : "");
cmd_dst = g_strdup_printf("-m 150M"
" -name target,debug-threads=on"
cmd_dst = g_strdup_printf(" -name target,debug-threads=on"
" -serial file:%s/dest_serial"
" -drive file=%s,format=raw"
" -incoming %s %s",
Expand All @@ -605,14 +605,13 @@ static int test_migrate_start(QTestState **from, QTestState **to,
init_bootfile(bootpath, s390x_elf, sizeof(s390x_elf));
machine_type = "";
machine_args = "";
extra_opts = use_shmem ? get_shmem_opts("128M", shmem_path) : NULL;
cmd_src = g_strdup_printf("-m 128M"
" -name source,debug-threads=on"
memory_size = "128M";
extra_opts = use_shmem ? get_shmem_opts(memory_size, shmem_path) : NULL;
cmd_src = g_strdup_printf(" -name source,debug-threads=on"
" -serial file:%s/src_serial -bios %s %s",
tmpfs, bootpath,
extra_opts ? extra_opts : "");
cmd_dst = g_strdup_printf("-m 128M"
" -name target,debug-threads=on"
cmd_dst = g_strdup_printf(" -name target,debug-threads=on"
" -serial file:%s/dest_serial -bios %s"
" -incoming %s %s",
tmpfs, bootpath, uri,
Expand All @@ -622,17 +621,17 @@ static int test_migrate_start(QTestState **from, QTestState **to,
} else if (strcmp(arch, "ppc64") == 0) {
machine_type = "";
machine_args = ",vsmt=8";
extra_opts = use_shmem ? get_shmem_opts("256M", shmem_path) : NULL;
cmd_src = g_strdup_printf("-m 256M -nodefaults"
memory_size = "256M";
extra_opts = use_shmem ? get_shmem_opts(memory_size, shmem_path) : NULL;
cmd_src = g_strdup_printf("-nodefaults"
" -name source,debug-threads=on"
" -serial file:%s/src_serial"
" -prom-env 'use-nvramrc?=true' -prom-env "
"'nvramrc=hex .\" _\" begin %x %x "
"do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
"until' %s", tmpfs, end_address,
start_address, extra_opts ? extra_opts : "");
cmd_dst = g_strdup_printf("-m 256M"
" -name target,debug-threads=on"
cmd_dst = g_strdup_printf(" -name target,debug-threads=on"
" -serial file:%s/dest_serial"
" -incoming %s %s",
tmpfs, uri,
Expand All @@ -644,14 +643,15 @@ static int test_migrate_start(QTestState **from, QTestState **to,
init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel));
machine_type = "virt,";
machine_args = "gic-version=max";
extra_opts = use_shmem ? get_shmem_opts("150M", shmem_path) : NULL;
memory_size = "150M";
extra_opts = use_shmem ? get_shmem_opts(memory_size, shmem_path) : NULL;
cmd_src = g_strdup_printf("-name vmsource,debug-threads=on -cpu max "
"-m 150M -serial file:%s/src_serial "
"-serial file:%s/src_serial "
"-kernel %s %s",
tmpfs, bootpath,
extra_opts ? extra_opts : "");
cmd_dst = g_strdup_printf("-name vmdest,debug-threads=on -cpu max "
"-m 150M -serial file:%s/dest_serial "
"-serial file:%s/dest_serial "
"-kernel %s "
"-incoming %s %s",
tmpfs, bootpath, uri,
Expand All @@ -674,15 +674,21 @@ static int test_migrate_start(QTestState **from, QTestState **to,
ignore_stderr = "";
}

cmd_source = g_strdup_printf("-machine %saccel=kvm:tcg%s %s %s %s",
cmd_source = g_strdup_printf("-machine %saccel=kvm:tcg%s "
"-m %s "
"%s %s %s",
machine_type, machine_args,
memory_size,
cmd_src, opts_src, ignore_stderr);
g_free(cmd_src);
*from = qtest_init(cmd_source);
g_free(cmd_source);

cmd_target = g_strdup_printf("-machine %saccel=kvm:tcg%s %s %s %s",
cmd_target = g_strdup_printf("-machine %saccel=kvm:tcg%s "
"-m %s "
"%s %s %s",
machine_type, machine_args,
memory_size,
cmd_dst, opts_dst, ignore_stderr);
g_free(cmd_dst);
*to = qtest_init(cmd_target);
Expand Down

0 comments on commit 7b6d44c

Please sign in to comment.