From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Cédric Le Goater" <clg@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Denis V. Lunev" <den@openvz.org>,
"Juan Quintela" <quintela@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
kvm@vger.kernel.org, "Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Sunil Muthuswamy" <sunilmut@microsoft.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Jagannathan Raman" <jag.raman@oracle.com>,
qemu-arm@nongnu.org,
"Alex Williamson" <alex.williamson@redhat.com>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"Thomas Huth" <thuth@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
qemu-ppc@nongnu.org, "Ilya Leoshkevich" <iii@linux.ibm.com>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Stefan Weil" <sw@weilnetz.de>, "Peter Xu" <peterx@redhat.com>,
"Christian Schoenebeck" <qemu_oss@crudebyte.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Jeff Cody" <codyprime@gmail.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Greg Kurz" <groug@kaod.org>,
qemu-block@nongnu.org
Subject: [PULL 10/17] tests/qtest: Introduce qtest_resolve_machine_alias
Date: Fri, 20 Oct 2023 08:57:44 +0200 [thread overview]
Message-ID: <20231020065751.26047-11-quintela@redhat.com> (raw)
In-Reply-To: <20231020065751.26047-1-quintela@redhat.com>
From: Fabiano Rosas <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"
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>
---
tests/qtest/libqtest.h | 10 ++++++++++
tests/qtest/libqtest.c | 16 ++++++++++++++++
2 files changed, 26 insertions(+)
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
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 603d900e7d..c843c41188 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -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)
{
struct MachInfo *machines;
--
2.41.0
next prev parent reply other threads:[~2023-10-20 7:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 6:57 [PULL 00/17] Migration 20231020 patches Juan Quintela
2023-10-20 6:57 ` [PULL 01/17] tests/qtest/migration-test: Disable the analyze-migration.py test on s390x Juan Quintela
2023-10-20 6:57 ` [PULL 02/17] migration: simplify blockers Juan Quintela
2023-10-20 6:57 ` [PULL 03/17] migration: Fix parse_ramblock() on overwritten retvals Juan Quintela
2023-10-20 6:57 ` [PULL 04/17] migration: simplify notifiers Juan Quintela
2023-10-20 6:57 ` [PULL 05/17] migration/multifd: Stop checking p->quit in multifd_send_thread Juan Quintela
2023-10-20 6:57 ` [PULL 06/17] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable Juan Quintela
2023-10-20 6:57 ` [PULL 07/17] tests/qtest: Introduce qtest_init_with_env Juan Quintela
2023-10-20 6:57 ` [PULL 08/17] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Juan Quintela
2023-10-20 6:57 ` [PULL 09/17] tests/qtest: Introduce qtest_has_machine_with_env Juan Quintela
2023-10-20 6:57 ` Juan Quintela [this message]
2023-10-20 6:57 ` [PULL 11/17] tests/qtest/migration: Introduce find_common_machine_version Juan Quintela
2023-10-20 6:57 ` [PULL 12/17] tests/qtest/migration: Define a machine for all architectures Juan Quintela
2023-10-20 6:57 ` [PULL 13/17] tests/qtest/migration: Specify the geometry of the bootsector Juan Quintela
2023-10-20 6:57 ` [PULL 14/17] tests/qtest/migration: Set q35 as the default machine for x86_86 Juan Quintela
2023-10-20 6:57 ` [PULL 15/17] tests/qtest/migration: Support more than one QEMU binary Juan Quintela
2023-10-20 6:57 ` [PULL 16/17] tests/qtest/migration: Allow user to specify a machine type Juan Quintela
2023-10-20 6:57 ` [PULL 17/17] tests/qtest: Don't print messages from query instances Juan Quintela
2023-10-20 16:07 ` [PULL 00/17] Migration 20231020 patches Stefan Hajnoczi
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=20231020065751.26047-11-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@kaod.org \
--cc=clg@redhat.com \
--cc=codyprime@gmail.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=den@openvz.org \
--cc=elena.ufimtseva@oracle.com \
--cc=fam@euphon.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=groug@kaod.org \
--cc=harshpb@linux.ibm.com \
--cc=hreitz@redhat.com \
--cc=iii@linux.ibm.com \
--cc=jag.raman@oracle.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=npiggin@gmail.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=qemu_oss@crudebyte.com \
--cc=reinoud@netbsd.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
--cc=sunilmut@microsoft.com \
--cc=sw@weilnetz.de \
--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).