[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate
From: |
Fabiano Rosas |
Subject: |
[PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary |
Date: |
Fri, 6 Oct 2023 09:39:04 -0300 |
We're adding support for using more than one QEMU binary in
tests. Modify qtest_get_machines() to take an environment variable
that contains the QEMU binary path.
Since the function keeps a cache of the machines list in the form of a
static variable, refresh it any time the environment variable changes.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/libqtest.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 88b79cb477..47c8b6d46f 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -1441,9 +1441,10 @@ struct MachInfo {
* Returns an array with pointers to the available machine names.
* The terminating entry has the name set to NULL.
*/
-static struct MachInfo *qtest_get_machines(void)
+static struct MachInfo *qtest_get_machines(const char *var)
{
static struct MachInfo *machines;
+ static char *qemu_var;
QDict *response, *minfo;
QList *list;
const QListEntry *p;
@@ -1452,11 +1453,19 @@ static struct MachInfo *qtest_get_machines(void)
QTestState *qts;
int idx;
+ if (g_strcmp0(qemu_var, var)) {
+ qemu_var = g_strdup(var);
+
+ /* new qemu, clear the cache */
+ g_free(machines);
+ machines = NULL;
+ }
+
if (machines) {
return machines;
}
- qts = qtest_init("-machine none");
+ qts = qtest_init_with_env(qemu_var, "-machine none");
response = qtest_qmp(qts, "{ 'execute': 'query-machines' }");
g_assert(response);
list = qdict_get_qlist(response, "return");
@@ -1497,7 +1506,7 @@ void qtest_cb_for_every_machine(void (*cb)(const char
*machine),
struct MachInfo *machines;
int i;
- machines = qtest_get_machines();
+ machines = qtest_get_machines(NULL);
for (i = 0; machines[i].name != NULL; i++) {
/* Ignore machines that cannot be used for qtests */
@@ -1518,7 +1527,7 @@ bool qtest_has_machine(const char *machine)
struct MachInfo *machines;
int i;
- machines = qtest_get_machines();
+ machines = qtest_get_machines(NULL);
for (i = 0; machines[i].name != NULL; i++) {
if (g_str_equal(machine, machines[i].name) ||
--
2.35.3
Re: [PATCH v2 7/9] tests/qtest/migration: Define a machine for all architectures, Thomas Huth, 2023/10/11
[PATCH v2 4/9] tests/qtest: Introduce qtest_has_machine_with_env, Fabiano Rosas, 2023/10/06
[PATCH v2 9/9] tests/qtest: Don't print messages from query instances, Fabiano Rosas, 2023/10/06
[PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary,
Fabiano Rosas <=