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 v3 06/11] tests/qtest/migration: Introduce find_common_machine_version
Date: Wed, 18 Oct 2023 11:07:31 -0300 [thread overview]
Message-ID: <20231018140736.3618-7-farosas@suse.de> (raw)
In-Reply-To: <20231018140736.3618-1-farosas@suse.de>
When using two different QEMU binaries for migration testing, we'll
need to find what is the machine version that will work with both
binaries. Add a helper for that.
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/migration-helpers.c | 24 ++++++++++++++++++++++++
tests/qtest/migration-helpers.h | 2 ++
2 files changed, 26 insertions(+)
diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
index 0c185db450..1fb0362af7 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -240,3 +240,27 @@ void wait_for_migration_fail(QTestState *from, bool allow_active)
g_assert(qdict_get_bool(rsp_return, "running"));
qobject_unref(rsp_return);
}
+
+char *find_common_machine_version(const char *mtype, const char *var1,
+ const char *var2)
+{
+ g_autofree char *type1 = qtest_resolve_machine_alias(var1, mtype);
+ g_autofree char *type2 = qtest_resolve_machine_alias(var2, mtype);
+
+ g_assert(type1 && type2);
+
+ if (g_str_equal(type1, type2)) {
+ /* either can be used */
+ return g_strdup(type1);
+ }
+
+ if (qtest_has_machine_with_env(var2, type1)) {
+ return g_strdup(type1);
+ }
+
+ if (qtest_has_machine_with_env(var1, type2)) {
+ return g_strdup(type2);
+ }
+
+ g_assert_not_reached();
+}
diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h
index 4f51d0f8bc..d1c2351d33 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration-helpers.h
@@ -43,4 +43,6 @@ void wait_for_migration_complete(QTestState *who);
void wait_for_migration_fail(QTestState *from, bool allow_active);
+char *find_common_machine_version(const char *mtype, const char *var1,
+ const char *var2);
#endif /* MIGRATION_HELPERS_H */
--
2.35.3
next prev parent reply other threads:[~2023-10-18 14:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 14:07 [PATCH v3 00/11] tests/migration-test: Allow testing older machine types Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 01/11] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 02/11] tests/qtest: Introduce qtest_init_with_env Fabiano Rosas
2023-10-18 14:13 ` Juan Quintela
2023-10-18 14:07 ` [PATCH v3 03/11] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 04/11] tests/qtest: Introduce qtest_has_machine_with_env Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 05/11] tests/qtest: Introduce qtest_resolve_machine_alias Fabiano Rosas
2023-10-18 14:07 ` Fabiano Rosas [this message]
2023-10-18 14:07 ` [PATCH v3 07/11] tests/qtest/migration: Define a machine for all architectures Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 08/11] tests/qtest/migration: Specify the geometry of the bootsector Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 09/11] tests/qtest/migration: Set q35 as the default machine for x86_86 Fabiano Rosas
2023-10-18 14:07 ` [PATCH v3 10/11] tests/qtest/migration: Support more than one QEMU binary Fabiano Rosas
2023-10-18 14:25 ` Juan Quintela
2023-10-18 14:36 ` Fabiano Rosas
2023-10-18 14:45 ` Juan Quintela
2023-10-18 18:43 ` Peter Xu
2023-10-18 14:07 ` [PATCH v3 11/11] tests/qtest: Don't print messages from query instances Fabiano Rosas
2023-10-18 14:19 ` [PATCH v3 00/11] tests/migration-test: Allow testing older machine types Fabiano Rosas
2023-10-18 14:35 ` Daniel P. Berrangé
2023-10-18 19:01 ` Peter Xu
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=20231018140736.3618-7-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).