[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 05/11] tests/qtest: Introduce qtest_resolve_machine_alias
From: |
Fabiano Rosas |
Subject: |
[PATCH v3 05/11] tests/qtest: Introduce qtest_resolve_machine_alias |
Date: |
Wed, 18 Oct 2023 11:07:30 -0300 |
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>
---
tests/qtest/libqtest.c | 16 ++++++++++++++++
tests/qtest/libqtest.h | 10 ++++++++++
2 files changed, 26 insertions(+)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 7c5628e0dc..fda163836c 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -1553,6 +1553,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)
{
struct MachInfo *machines;
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h
index d16deb9891..6e3d3525bf 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -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),
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:
* @machine: The machine to look for
--
2.35.3
- [PATCH v3 00/11] tests/migration-test: Allow testing older machine types, Fabiano Rosas, 2023/10/18
- [PATCH v3 01/11] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable, Fabiano Rosas, 2023/10/18
- [PATCH v3 02/11] tests/qtest: Introduce qtest_init_with_env, Fabiano Rosas, 2023/10/18
- [PATCH v3 05/11] tests/qtest: Introduce qtest_resolve_machine_alias,
Fabiano Rosas <=
- [PATCH v3 06/11] tests/qtest/migration: Introduce find_common_machine_version, Fabiano Rosas, 2023/10/18
- [PATCH v3 07/11] tests/qtest/migration: Define a machine for all architectures, Fabiano Rosas, 2023/10/18
- [PATCH v3 08/11] tests/qtest/migration: Specify the geometry of the bootsector, Fabiano Rosas, 2023/10/18
- [PATCH v3 11/11] tests/qtest: Don't print messages from query instances, Fabiano Rosas, 2023/10/18
- [PATCH v3 03/11] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary, Fabiano Rosas, 2023/10/18
- [PATCH v3 04/11] tests/qtest: Introduce qtest_has_machine_with_env, Fabiano Rosas, 2023/10/18
- [PATCH v3 09/11] tests/qtest/migration: Set q35 as the default machine for x86_86, Fabiano Rosas, 2023/10/18
- [PATCH v3 10/11] tests/qtest/migration: Support more than one QEMU binary, Fabiano Rosas, 2023/10/18