[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/14] tests: Consolidate accelerators declaration
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 07/14] tests: Consolidate accelerators declaration |
Date: |
Tue, 6 Feb 2018 15:49:29 +0000 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
tests/migration-test.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 0428d450df..3732682a29 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -422,27 +422,29 @@ static void test_migrate_start(QTestState **from,
QTestState **to,
gchar *cmd_src, *cmd_dst;
char *bootpath = g_strdup_printf("%s/bootsect", tmpfs);
const char *arch = qtest_get_arch();
+ const char *accel = "kvm:tcg";
got_stop = false;
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
init_bootfile_x86(bootpath);
- cmd_src = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
+ cmd_src = g_strdup_printf("-machine accel=%s -m 150M"
" -name pcsource,debug-threads=on"
" -serial file:%s/src_serial"
" -drive file=%s,format=raw",
- tmpfs, bootpath);
- cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 150M"
+ accel, tmpfs, bootpath);
+ cmd_dst = g_strdup_printf("-machine accel=%s -m 150M"
" -name pcdest,debug-threads=on"
" -serial file:%s/dest_serial"
" -drive file=%s,format=raw"
" -incoming %s",
- tmpfs, bootpath, uri);
+ accel, tmpfs, bootpath, uri);
} else if (strcmp(arch, "ppc64") == 0) {
- const char *accel;
/* On ppc64, the test only works with kvm-hv, but not with kvm-pr */
- accel = access("/sys/module/kvm_hv", F_OK) ? "tcg" : "kvm:tcg";
+ if (access("/sys/module/kvm_hv", F_OK)) {
+ accel = "tcg";
+ }
init_bootfile_ppc(bootpath);
cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
" -name pcsource,debug-threads=on"
--
2.14.3
- [Qemu-devel] [PULL 00/14] migration queue, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 01/14] migration: Allow migrate_fd_connect to take an Error *, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 02/14] migration: Route errors down through migration_channel_connect, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 03/14] migration/savevm.c: set MAX_VM_CMD_PACKAGED_SIZE to 1ul << 32, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 04/14] migration: use s->threshold_size inside migration_update_counters, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 05/14] migration: Drop current address parameter from save_zero_page(), Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 06/14] tests: Remove deprecated migration tests commands, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 07/14] tests: Consolidate accelerators declaration,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 08/14] tests: Use consistent names for migration, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 09/14] tests: Add deprecated commands migration test, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 10/14] tests: Create migrate-start-postcopy command, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 11/14] tests: Adjust sleeps for migration test, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 12/14] migration: Recover block devices if failure in device state, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 13/14] migration: Don't leak IO channels, Dr. David Alan Gilbert (git), 2018/02/06
- [Qemu-devel] [PULL 14/14] migration: incoming postcopy advise sanity checks, Dr. David Alan Gilbert (git), 2018/02/06
- Re: [Qemu-devel] [PULL 00/14] migration queue, Peter Maydell, 2018/02/07