ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/qtest: Introduce qtest_resolve_machine_alias 

The migration tests are being enhanced to test migration between
different QEMU versions. A requirement of migration is that the
machine type between source and destination matches, including the
version.

We cannot hardcode machine types in the tests because those change
with each release. QEMU provides a machine type alias that has a fixed
name, but points to the latest machine type at each release.

Add a helper to resolve the alias into the exact machine
type. E.g. "-machine pc" resolves to "pc-i440fx-8.2"

Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231018192741.25885-6-farosas@suse.de>
This commit is contained in:
Fabiano Rosas 2023-10-18 16:27:34 -03:00 committed by Juan Quintela
parent 1027fc0ae4
commit a3c0ebc9b0
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/qtest/libqtest.c
View File

@ -1565,6 +1565,22 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
} }
} }
char *qtest_resolve_machine_alias(const char *var, const char *alias)
{
struct MachInfo *machines;
int i;
machines = qtest_get_machines(var);
for (i = 0; machines[i].name != NULL; i++) {
if (machines[i].alias && g_str_equal(alias, machines[i].alias)) {
return g_strdup(machines[i].name);
}
}
return NULL;
}
bool qtest_has_machine_with_env(const char *var, const char *machine) bool qtest_has_machine_with_env(const char *var, const char *machine)
{ {
struct MachInfo *machines; struct MachInfo *machines;

10
tests/qtest/libqtest.h
View File

@ -922,6 +922,16 @@ void qtest_qmp_fds_assert_success(QTestState *qts, int *fds, size_t nfds,
void qtest_cb_for_every_machine(void (*cb)(const char *machine), void qtest_cb_for_every_machine(void (*cb)(const char *machine),
bool skip_old_versioned); bool skip_old_versioned);
/**
* qtest_resolve_machine_alias:
* @var: Environment variable from where to take the QEMU binary
* @alias: The alias to resolve
*
* Returns: the machine type corresponding to the alias if any,
* otherwise NULL.
*/
char *qtest_resolve_machine_alias(const char *var, const char *alias);
/** /**
* qtest_has_machine: * qtest_has_machine:
* @machine: The machine to look for * @machine: The machine to look for