From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Juan Quintela <quintela@redhat.com>
Subject: [PATCH 03/10] migration-test: Move -machine to common commandline
Date: Thu, 12 Dec 2019 23:20:26 +0100 [thread overview]
Message-ID: <20191212222033.1026-4-quintela@redhat.com> (raw)
In-Reply-To: <20191212222033.1026-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/migration-test.c | 51 +++++++++++++++++++++++++-----------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 372e66c755..39203f6d46 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -563,7 +563,8 @@ static int test_migrate_start(QTestState **from, QTestState **to,
char *extra_opts = NULL;
char *shmem_path = NULL;
const char *arch = qtest_get_arch();
- const char *accel = "kvm:tcg";
+ const char *machine_type;
+ const char *machine_args;
opts_src = opts_src ? opts_src : "";
opts_dst = opts_dst ? opts_dst : "";
@@ -582,72 +583,78 @@ static int test_migrate_start(QTestState **from, QTestState **to,
/* the assembled x86 boot sector should be exactly one sector large */
assert(sizeof(x86_bootsect) == 512);
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("-machine accel=%s -m 150M"
+ cmd_src = g_strdup_printf("-m 150M"
" -name source,debug-threads=on"
" -serial file:%s/src_serial"
" -drive file=%s,format=raw %s",
- accel, tmpfs, bootpath,
+ tmpfs, bootpath,
extra_opts ? extra_opts : "");
- cmd_dst = g_strdup_printf("-machine accel=%s -m 150M"
+ cmd_dst = g_strdup_printf("-m 150M"
" -name target,debug-threads=on"
" -serial file:%s/dest_serial"
" -drive file=%s,format=raw"
" -incoming %s %s",
- accel, tmpfs, bootpath, uri,
+ tmpfs, bootpath, uri,
extra_opts ? extra_opts : "");
start_address = X86_TEST_MEM_START;
end_address = X86_TEST_MEM_END;
} else if (g_str_equal(arch, "s390x")) {
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("-machine accel=%s -m 128M"
+ cmd_src = g_strdup_printf("-m 128M"
" -name source,debug-threads=on"
" -serial file:%s/src_serial -bios %s %s",
- accel, tmpfs, bootpath,
+ tmpfs, bootpath,
extra_opts ? extra_opts : "");
- cmd_dst = g_strdup_printf("-machine accel=%s -m 128M"
+ cmd_dst = g_strdup_printf("-m 128M"
" -name target,debug-threads=on"
" -serial file:%s/dest_serial -bios %s"
" -incoming %s %s",
- accel, tmpfs, bootpath, uri,
+ tmpfs, bootpath, uri,
extra_opts ? extra_opts : "");
start_address = S390_TEST_MEM_START;
end_address = S390_TEST_MEM_END;
} 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("-machine accel=%s,vsmt=8 -m 256M -nodefaults"
+ cmd_src = g_strdup_printf("-m 256M -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", accel, tmpfs, end_address,
+ "until' %s", tmpfs, end_address,
start_address, extra_opts ? extra_opts : "");
- cmd_dst = g_strdup_printf("-machine accel=%s,vsmt=8 -m 256M"
+ cmd_dst = g_strdup_printf("-m 256M"
" -name target,debug-threads=on"
" -serial file:%s/dest_serial"
" -incoming %s %s",
- accel, tmpfs, uri,
+ tmpfs, uri,
extra_opts ? extra_opts : "");
start_address = PPC_TEST_MEM_START;
end_address = PPC_TEST_MEM_END;
} else if (strcmp(arch, "aarch64") == 0) {
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;
- cmd_src = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
- "-name vmsource,debug-threads=on -cpu max "
+ cmd_src = g_strdup_printf("-name vmsource,debug-threads=on -cpu max "
"-m 150M -serial file:%s/src_serial "
"-kernel %s %s",
- accel, tmpfs, bootpath,
+ tmpfs, bootpath,
extra_opts ? extra_opts : "");
- cmd_dst = g_strdup_printf("-machine virt,accel=%s,gic-version=max "
- "-name vmdest,debug-threads=on -cpu max "
+ cmd_dst = g_strdup_printf("-name vmdest,debug-threads=on -cpu max "
"-m 150M -serial file:%s/dest_serial "
"-kernel %s "
"-incoming %s %s",
- accel, tmpfs, bootpath, uri,
+ tmpfs, bootpath, uri,
extra_opts ? extra_opts : "");
start_address = ARM_TEST_MEM_START;
@@ -667,13 +674,15 @@ static int test_migrate_start(QTestState **from, QTestState **to,
ignore_stderr = "";
}
- cmd_source = g_strdup_printf("%s %s %s",
+ cmd_source = g_strdup_printf("-machine %saccel=kvm:tcg%s %s %s %s",
+ machine_type, machine_args,
cmd_src, opts_src, ignore_stderr);
g_free(cmd_src);
*from = qtest_init(cmd_source);
g_free(cmd_source);
- cmd_target = g_strdup_printf("%s %s %s",
+ cmd_target = g_strdup_printf("-machine %saccel=kvm:tcg%s %s %s %s",
+ machine_type, machine_args,
cmd_dst, opts_dst, ignore_stderr);
g_free(cmd_dst);
*to = qtest_init(cmd_target);
--
2.21.0
next prev parent reply other threads:[~2019-12-12 22:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 22:20 [PATCH 00/10] Migration Arguments cleanup Juan Quintela
2019-12-12 22:20 ` [PATCH 01/10] migration-test: Create cmd_soure and cmd_target Juan Quintela
2019-12-16 13:31 ` Paolo Bonzini
2019-12-16 15:47 ` Juan Quintela
2019-12-12 22:20 ` [PATCH 02/10] migration-test: Move hide_stderr to common commandline Juan Quintela
2019-12-12 22:20 ` Juan Quintela [this message]
2019-12-12 22:20 ` [PATCH 04/10] migration-test: Move memory size " Juan Quintela
2019-12-12 22:20 ` [PATCH 05/10] migration-test: Move shmem handling " Juan Quintela
2019-12-12 22:20 ` [PATCH 06/10] migration-test: Move -name " Juan Quintela
2019-12-12 22:20 ` [PATCH 07/10] migration-test: Move -serial " Juan Quintela
2019-12-12 22:20 ` [PATCH 08/10] migration-test: Move -incomming " Juan Quintela
2019-12-12 22:20 ` [PATCH 09/10] migration-test: Rename cmd_src/dst to arch_source/arch_target Juan Quintela
2019-12-12 22:20 ` [PATCH 10/10] migration-test: Use a struct for test_migrate_start parameters Juan Quintela
2019-12-16 13:23 ` [PATCH 00/10] Migration Arguments cleanup Cornelia Huck
2019-12-16 13:48 ` Laurent Vivier
2019-12-16 14:01 ` Paolo Bonzini
2019-12-16 15:46 ` Juan Quintela
2019-12-16 16:20 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191212222033.1026-4-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).