* Philippe Mathieu-Daudé (phi...@linaro.org) wrote: > Part 3/4: Convert accelerator options. > > Reviewed-by: Richard Henderson <richard.hender...@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > tests/qtest/migration-test.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 670097a956..1ed3505c91 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -603,6 +603,13 @@ static int test_migrate_start(QTestState **from, > QTestState **to, > got_stop = false; > > cmd_common = g_string_new(""); > + /* KVM first */ > + if (args->use_dirty_ring) { > + g_string_append(cmd_common, "-accel kvm,dirty-ring-size=4096 "); > + } else { > + g_string_append(cmd_common, "-accel kvm "); > + } > + g_string_append(cmd_common, "-accel tcg ");
Yep, that's the right way around this time :-) Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > bootpath = g_strdup_printf("%s/bootsect", tmpfs); > if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { > @@ -678,12 +685,10 @@ static int test_migrate_start(QTestState **from, > QTestState **to, > if (!args->only_target) { > g_autofree gchar *cmd_source = NULL; > > - cmd_source = g_strdup_printf("-accel kvm%s -accel tcg %s " > + cmd_source = g_strdup_printf("%s " > "-name source,debug-threads=on " > "-serial file:%s/src_serial " > "%s %s %s", > - args->use_dirty_ring ? > - ",dirty-ring-size=4096" : "", > cmd_common->str, > tmpfs, > arch_source, > @@ -692,13 +697,11 @@ static int test_migrate_start(QTestState **from, > QTestState **to, > *from = qtest_init(cmd_source); > } > > - cmd_target = g_strdup_printf("-accel kvm%s -accel tcg %s " > + cmd_target = g_strdup_printf("%s " > "-name target,debug-threads=on " > "-serial file:%s/dest_serial " > "-incoming %s " > "%s %s %s", > - args->use_dirty_ring ? > - ",dirty-ring-size=4096" : "", > cmd_common->str, > tmpfs, uri, > arch_target, > -- > 2.38.1 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK