david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Consolidate accelerators declaration

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2018-01-05 12:49:59 +01:00 committed by Dr. David Alan Gilbert
parent 1f90d79711
commit 63b2d935f7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/migration-test.c
View File

@ -422,27 +422,29 @@ static void test_migrate_start(QTestState **from, QTestState **to,
gchar *cmd_src, *cmd_dst; gchar *cmd_src, *cmd_dst;
char *bootpath = g_strdup_printf("%s/bootsect", tmpfs); char *bootpath = g_strdup_printf("%s/bootsect", tmpfs);
const char *arch = qtest_get_arch(); const char *arch = qtest_get_arch();
const char *accel = "kvm:tcg";
got_stop = false; got_stop = false;
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
init_bootfile_x86(bootpath); 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" " -name pcsource,debug-threads=on"
" -serial file:%s/src_serial" " -serial file:%s/src_serial"
" -drive file=%s,format=raw", " -drive file=%s,format=raw",
tmpfs, bootpath); accel, tmpfs, bootpath);
cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 150M" cmd_dst = g_strdup_printf("-machine accel=%s -m 150M"
" -name pcdest,debug-threads=on" " -name pcdest,debug-threads=on"
" -serial file:%s/dest_serial" " -serial file:%s/dest_serial"
" -drive file=%s,format=raw" " -drive file=%s,format=raw"
" -incoming %s", " -incoming %s",
tmpfs, bootpath, uri); accel, tmpfs, bootpath, uri);
} else if (strcmp(arch, "ppc64") == 0) { } else if (strcmp(arch, "ppc64") == 0) {
const char *accel;
/* On ppc64, the test only works with kvm-hv, but not with kvm-pr */ /* 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); init_bootfile_ppc(bootpath);
cmd_src = g_strdup_printf("-machine accel=%s -m 256M" cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
" -name pcsource,debug-threads=on" " -name pcsource,debug-threads=on"