Skip to content

Commit

Permalink
tests/qtest: Introduce qtest_has_machine_with_env
Browse files Browse the repository at this point in the history
Add a variant of qtest_has_machine() that receives an environment
variable containing an alternate QEMU binary path.

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-5-farosas@suse.de>
  • Loading branch information
Fabiano Rosas authored and Juan Quintela committed Oct 20, 2023
1 parent 41b2eba commit 1027fc0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
9 changes: 7 additions & 2 deletions tests/qtest/libqtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -1565,12 +1565,12 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
}
}

bool qtest_has_machine(const char *machine)
bool qtest_has_machine_with_env(const char *var, const char *machine)
{
struct MachInfo *machines;
int i;

machines = qtest_get_machines(NULL);
machines = qtest_get_machines(var);

for (i = 0; machines[i].name != NULL; i++) {
if (g_str_equal(machine, machines[i].name) ||
Expand All @@ -1582,6 +1582,11 @@ bool qtest_has_machine(const char *machine)
return false;
}

bool qtest_has_machine(const char *machine)
{
return qtest_has_machine_with_env(NULL, machine);
}

bool qtest_has_device(const char *device)
{
static QList *list;
Expand Down
9 changes: 9 additions & 0 deletions tests/qtest/libqtest.h
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,15 @@ void qtest_cb_for_every_machine(void (*cb)(const char *machine),
*/
bool qtest_has_machine(const char *machine);

/**
* qtest_has_machine_with_env:
* @var: Environment variable from where to take the QEMU binary
* @machine: The machine to look for
*
* Returns: true if the machine is available in the specified binary.
*/
bool qtest_has_machine_with_env(const char *var, const char *machine);

/**
* qtest_has_device:
* @device: The device to look for
Expand Down

0 comments on commit 1027fc0

Please sign in to comment.