qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v2 6/9] tests/qtest/migration: Introduce find_common_machine_version
Date: Fri,  6 Oct 2023 09:39:07 -0300	[thread overview]
Message-ID: <20231006123910.17759-7-farosas@suse.de> (raw)
In-Reply-To: <20231006123910.17759-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.

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 be00c52d00..8512134b92 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -180,3 +180,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 009e250e90..fc7f693fb6 100644
--- a/tests/qtest/migration-helpers.h
+++ b/tests/qtest/migration-helpers.h
@@ -33,4 +33,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



  parent reply	other threads:[~2023-10-06 12:41 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-06 12:39 [PATCH v2 0/9] tests/migration-test: Allow testing older machine types Fabiano Rosas
2023-10-06 12:39 ` [PATCH v2 1/9] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable Fabiano Rosas
2023-10-11 14:17   ` Juan Quintela
2023-10-11 14:30     ` Thomas Huth
2023-10-11 14:32       ` Juan Quintela
2023-10-11 14:55   ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 2/9] tests/qtest: Introduce qtest_init_with_env Fabiano Rosas
2023-10-11 14:20   ` Juan Quintela
2023-10-11 14:56   ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 3/9] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Fabiano Rosas
2023-10-11 14:22   ` Juan Quintela
2023-10-11 15:05   ` Thomas Huth
2023-10-12  7:49   ` Thomas Huth
2023-10-12 14:53     ` Fabiano Rosas
2023-10-16 16:00       ` Fabiano Rosas
2023-10-06 12:39 ` [PATCH v2 4/9] tests/qtest: Introduce qtest_has_machine_with_env Fabiano Rosas
2023-10-11 14:22   ` Juan Quintela
2023-10-11 15:06   ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 5/9] tests/qtest: Introduce qtest_resolve_machine_alias Fabiano Rosas
2023-10-11 14:23   ` Juan Quintela
2023-10-11 15:25   ` Thomas Huth
2023-10-11 15:47   ` Thomas Huth
2023-10-06 12:39 ` Fabiano Rosas [this message]
2023-10-11 14:25   ` [PATCH v2 6/9] tests/qtest/migration: Introduce find_common_machine_version Juan Quintela
2023-10-11 15:50   ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 7/9] tests/qtest/migration: Define a machine for all architectures Fabiano Rosas
2023-10-11 14:28   ` Juan Quintela
2023-10-11 14:40     ` Fabiano Rosas
2023-10-11 14:48     ` Daniel P. Berrangé
2023-10-11 14:59       ` Fabiano Rosas
2023-10-17 12:53     ` Fabiano Rosas
2023-10-11 15:55   ` Thomas Huth
2023-10-06 12:39 ` [PATCH v2 8/9] tests/qtest/migration: Support more than one QEMU binary Fabiano Rosas
2023-10-11 14:31   ` Juan Quintela
2023-10-06 12:39 ` [PATCH v2 9/9] tests/qtest: Don't print messages from query instances Fabiano Rosas
2023-10-11 14:31   ` Juan Quintela
2023-10-11 15:59   ` Thomas Huth

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=20231006123910.17759-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).