| Message ID | 20231006123910.17759-2-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | tests/migration-test: Allow testing older machine types | expand |
Fabiano Rosas <farosas@suse.de> wrote: > We're adding support for testing migration using two different QEMU > binaries. We'll provide the second binary in a new environment > variable. > > Allow qtest_qemu_binary() to receive the name of the new variable. If > the new environment variable is not set, that's not an error, we use > QTEST_QEMU_BINARY as a fallback. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com> Thomas, do you want me to get this through the migration tree? I will wait for you ack anyways.
On 11/10/2023 16.17, Juan Quintela wrote: > Fabiano Rosas <farosas@suse.de> wrote: >> We're adding support for testing migration using two different QEMU >> binaries. We'll provide the second binary in a new environment >> variable. >> >> Allow qtest_qemu_binary() to receive the name of the new variable. If >> the new environment variable is not set, that's not an error, we use >> QTEST_QEMU_BINARY as a fallback. >> >> Signed-off-by: Fabiano Rosas <farosas@suse.de> > > Reviewed-by: Juan Quintela <quintela@redhat.com> > > Thomas, do you want me to get this through the migration tree? I'm fine either way, but please give me one or two more days for review first. Thomas
Thomas Huth <thuth@redhat.com> wrote: > On 11/10/2023 16.17, Juan Quintela wrote: >> Fabiano Rosas <farosas@suse.de> wrote: >>> We're adding support for testing migration using two different QEMU >>> binaries. We'll provide the second binary in a new environment >>> variable. >>> >>> Allow qtest_qemu_binary() to receive the name of the new variable. If >>> the new environment variable is not set, that's not an error, we use >>> QTEST_QEMU_BINARY as a fallback. >>> >>> Signed-off-by: Fabiano Rosas <farosas@suse.de> >> Reviewed-by: Juan Quintela <quintela@redhat.com> >> Thomas, do you want me to get this through the migration tree? > > I'm fine either way, but please give me one or two more days for review first. Sure.
On 06/10/2023 14.39, Fabiano Rosas wrote: > We're adding support for testing migration using two different QEMU > binaries. We'll provide the second binary in a new environment > variable. > > Allow qtest_qemu_binary() to receive the name of the new variable. If > the new environment variable is not set, that's not an error, we use > QTEST_QEMU_BINARY as a fallback. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> > --- > tests/qtest/libqtest.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index b1eba71ffe..1f971b98e0 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -336,10 +336,17 @@ void qtest_remove_abrt_handler(void *data) } } -static const char *qtest_qemu_binary(void) +static const char *qtest_qemu_binary(const char *var) { const char *qemu_bin; + if (var) { + qemu_bin = getenv(var); + if (qemu_bin) { + return qemu_bin; + } + } + qemu_bin = getenv("QTEST_QEMU_BINARY"); if (!qemu_bin) { fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); @@ -392,7 +399,7 @@ static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu(const char *fmt, ...) va_start(ap, fmt); g_string_append_printf(command, CMD_EXEC "%s %s", - qtest_qemu_binary(), tracearg); + qtest_qemu_binary(NULL), tracearg); g_string_append_vprintf(command, fmt, ap); va_end(ap); @@ -907,7 +914,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) const char *qtest_get_arch(void) { - const char *qemu = qtest_qemu_binary(); + const char *qemu = qtest_qemu_binary(NULL); const char *end = strrchr(qemu, '-'); if (!end) {
We're adding support for testing migration using two different QEMU binaries. We'll provide the second binary in a new environment variable. Allow qtest_qemu_binary() to receive the name of the new variable. If the new environment variable is not set, that's not an error, we use QTEST_QEMU_BINARY as a fallback. Signed-off-by: Fabiano Rosas <farosas@suse.de> --- tests/qtest/libqtest.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)