From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: "Juan Quintela" <quintela@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH v2 5/9] tests/qtest: Introduce qtest_resolve_machine_alias
Date: Fri, 6 Oct 2023 09:39:06 -0300 [thread overview]
Message-ID: <20231006123910.17759-6-farosas@suse.de> (raw)
In-Reply-To: <20231006123910.17759-1-farosas@suse.de>
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"
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 c0e4f05979..f2f1756de1 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -1522,6 +1522,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 083b2a6520..75f9310bb0 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -894,6 +894,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
next prev parent reply other threads:[~2023-10-06 12:40 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-06 12:39 [PATCH v2 0/9] tests/migration-test: Allow testing older machine types Fabiano Rosas
2023-10-06 12:39 ` [PATCH v2 1/9] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable Fabiano Rosas
2023-10-11 14:17 ` Juan Quintela
2023-10-11 14:30 ` Thomas Huth
2023-10-11 14:32 ` Juan Quintela
2023-10-11 14:55 ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 2/9] tests/qtest: Introduce qtest_init_with_env Fabiano Rosas
2023-10-11 14:20 ` Juan Quintela
2023-10-11 14:56 ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Fabiano Rosas
2023-10-11 14:22 ` Juan Quintela
2023-10-11 15:05 ` Thomas Huth
2023-10-12 7:49 ` Thomas Huth
2023-10-12 14:53 ` Fabiano Rosas
2023-10-16 16:00 ` Fabiano Rosas
2023-10-06 12:39 ` [PATCH v2 4/9] tests/qtest: Introduce qtest_has_machine_with_env Fabiano Rosas
2023-10-11 14:22 ` Juan Quintela
2023-10-11 15:06 ` Thomas Huth
2023-10-06 12:39 ` Fabiano Rosas [this message]
2023-10-11 14:23 ` [PATCH v2 5/9] tests/qtest: Introduce qtest_resolve_machine_alias Juan Quintela
2023-10-11 15:25 ` Thomas Huth
2023-10-11 15:47 ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 6/9] tests/qtest/migration: Introduce find_common_machine_version Fabiano Rosas
2023-10-11 14:25 ` Juan Quintela
2023-10-11 15:50 ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 7/9] tests/qtest/migration: Define a machine for all architectures Fabiano Rosas
2023-10-11 14:28 ` Juan Quintela
2023-10-11 14:40 ` Fabiano Rosas
2023-10-11 14:48 ` Daniel P. Berrangé
2023-10-11 14:59 ` Fabiano Rosas
2023-10-17 12:53 ` Fabiano Rosas
2023-10-11 15:55 ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 8/9] tests/qtest/migration: Support more than one QEMU binary Fabiano Rosas
2023-10-11 14:31 ` Juan Quintela
2023-10-06 12:39 ` [PATCH v2 9/9] tests/qtest: Don't print messages from query instances Fabiano Rosas
2023-10-11 14:31 ` Juan Quintela
2023-10-11 15:59 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231006123910.17759-6-farosas@suse.de \
--to=farosas@suse.de \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=leobras@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).