Thomas Huth <th...@redhat.com> writes: > On 18/10/2023 21.27, Fabiano Rosas wrote: >> Stop relying on defaults and select a machine explicitly for every >> architecture. >> This is a prerequisite for being able to select machine types for >> migration using different QEMU binaries for source and destination. >> Signed-off-by: Fabiano Rosas <faro...@suse.de> >> --- >> tests/qtest/migration-test.c | 16 +++++++++++++--- >> 1 file changed, 13 insertions(+), 3 deletions(-) >> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c >> index e1c110537b..43d0b83771 100644 >> --- a/tests/qtest/migration-test.c >> +++ b/tests/qtest/migration-test.c
[...] >> @@ -829,12 +837,14 @@ static int test_migrate_start(QTestState **from, >> QTestState **to, >> } >> cmd_target = g_strdup_printf("-accel kvm%s -accel tcg " >> + "-machine %s,%s " > > If machine_opts is empty, there will be a lonely "," at the end of the > parameter ... seems to work, but it's a little bit ugly. keyval_parse() & friends accept trailing ',' to help with keeping things simple. > Anyway: > Reviewed-by: Thomas Huth <th...@redhat.com> > > >> "-name target,debug-threads=on " >> "-m %s " >> "-serial file:%s/dest_serial " >> "-incoming %s " >> "%s %s %s %s %s", >> kvm_opts ? kvm_opts : "", >> + machine_alias, machine_opts, >> memory_size, tmpfs, uri, >> arch_opts ? arch_opts : "", >> arch_target ? arch_target : "",