| Message ID | 20230119145838.41835-10-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Allow running boot-serial / migration with TCG disabled | expand |
On 1/19/23 04:58, Philippe Mathieu-Daudé wrote: > Part 3/4: Convert accelerator options. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > tests/qtest/migration-test.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 8377b3976a..015b774a9e 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -603,6 +603,9 @@ static int test_migrate_start(QTestState **from, QTestState **to, > got_stop = false; > > cmd_common = g_string_new(""); > + g_string_append_printf(cmd_common, "-accel kvm%s ", > + args->use_dirty_ring ? ",dirty-ring-size=4096" : ""); > + g_string_append(cmd_common, "-accel tcg "); Maybe clearer as if (args->use_dirty_ring) { g_string_append(s, "-accel kvm,dirty-ring-size=4096 "); } else { g_string_append(s, "-accel kvm "); } but what you have works, so, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 19/1/23 22:17, Richard Henderson wrote: > On 1/19/23 04:58, Philippe Mathieu-Daudé wrote: >> Part 3/4: Convert accelerator options. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> tests/qtest/migration-test.c | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) >> >> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c >> index 8377b3976a..015b774a9e 100644 >> --- a/tests/qtest/migration-test.c >> +++ b/tests/qtest/migration-test.c >> @@ -603,6 +603,9 @@ static int test_migrate_start(QTestState **from, >> QTestState **to, >> got_stop = false; >> cmd_common = g_string_new(""); >> + g_string_append_printf(cmd_common, "-accel kvm%s ", >> + args->use_dirty_ring ? >> ",dirty-ring-size=4096" : ""); >> + g_string_append(cmd_common, "-accel tcg "); > > Maybe clearer as > > if (args->use_dirty_ring) { > g_string_append(s, "-accel kvm,dirty-ring-size=4096 "); > } else { > g_string_append(s, "-accel kvm "); > } Agreed, I first did that change, then went back to have simpler "one big patch" in v1. Now since v2 splits the changes I'll do that.
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 8377b3976a..015b774a9e 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -603,6 +603,9 @@ static int test_migrate_start(QTestState **from, QTestState **to, got_stop = false; cmd_common = g_string_new(""); + g_string_append_printf(cmd_common, "-accel kvm%s ", + args->use_dirty_ring ? ",dirty-ring-size=4096" : ""); + g_string_append(cmd_common, "-accel tcg "); bootpath = g_strdup_printf("%s/bootsect", tmpfs); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { @@ -678,25 +681,21 @@ 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, args->opts_source ? args->opts_source : "", ignore_stderr); *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, args->opts_target ? args->opts_target : "", ignore_stderr);
Part 3/4: Convert accelerator options. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- tests/qtest/migration-test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)