qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, "Cédric Le Goater" <clg@redhat.com>,
	"Halil Pasic" <pasic@linux.ibm.com>,
	"Denis V. Lunev" <den@openvz.org>,
	"Juan Quintela" <quintela@redhat.com>,
	"Fam Zheng" <fam@euphon.net>,
	kvm@vger.kernel.org, "Harsh Prateek Bora" <harshpb@linux.ibm.com>,
	"Nicholas Piggin" <npiggin@gmail.com>,
	"Christian Borntraeger" <borntraeger@linux.ibm.com>,
	"Eric Farman" <farman@linux.ibm.com>,
	"Kevin Wolf" <kwolf@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Jason Wang" <jasowang@redhat.com>,
	"Sunil Muthuswamy" <sunilmut@microsoft.com>,
	"David Gibson" <david@gibson.dropbear.id.au>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Jagannathan Raman" <jag.raman@oracle.com>,
	qemu-arm@nongnu.org,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Reinoud Zandijk" <reinoud@netbsd.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
	qemu-ppc@nongnu.org, "Ilya Leoshkevich" <iii@linux.ibm.com>,
	"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
	"Stefan Weil" <sw@weilnetz.de>, "Peter Xu" <peterx@redhat.com>,
	"Christian Schoenebeck" <qemu_oss@crudebyte.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Jeff Cody" <codyprime@gmail.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	"Hanna Reitz" <hreitz@redhat.com>,
	"Marcelo Tosatti" <mtosatti@redhat.com>,
	"Leonardo Bras" <leobras@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	"Daniel Henrique Barboza" <danielhb413@gmail.com>,
	"Greg Kurz" <groug@kaod.org>,
	qemu-block@nongnu.org
Subject: [PULL 11/17] tests/qtest/migration: Introduce find_common_machine_version
Date: Fri, 20 Oct 2023 08:57:45 +0200	[thread overview]
Message-ID: <20231020065751.26047-12-quintela@redhat.com> (raw)
In-Reply-To: <20231020065751.26047-1-quintela@redhat.com>

From: Fabiano Rosas <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>
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-7-farosas@suse.de>
---
 tests/qtest/migration-helpers.h |  2 ++
 tests/qtest/migration-helpers.c | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

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 */
diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
index 0c185db450..13449c1fe1 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -240,3 +240,29 @@ 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_test_message("No common machine version for machine type '%s' between "
+                   "binaries %s and %s", mtype, getenv(var1), getenv(var2));
+    g_assert_not_reached();
+}
-- 
2.41.0



  parent reply	other threads:[~2023-10-20  7:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-20  6:57 [PULL 00/17] Migration 20231020 patches Juan Quintela
2023-10-20  6:57 ` [PULL 01/17] tests/qtest/migration-test: Disable the analyze-migration.py test on s390x Juan Quintela
2023-10-20  6:57 ` [PULL 02/17] migration: simplify blockers Juan Quintela
2023-10-20  6:57 ` [PULL 03/17] migration: Fix parse_ramblock() on overwritten retvals Juan Quintela
2023-10-20  6:57 ` [PULL 04/17] migration: simplify notifiers Juan Quintela
2023-10-20  6:57 ` [PULL 05/17] migration/multifd: Stop checking p->quit in multifd_send_thread Juan Quintela
2023-10-20  6:57 ` [PULL 06/17] tests/qtest: Allow qtest_qemu_binary to use a custom environment variable Juan Quintela
2023-10-20  6:57 ` [PULL 07/17] tests/qtest: Introduce qtest_init_with_env Juan Quintela
2023-10-20  6:57 ` [PULL 08/17] tests/qtest: Allow qtest_get_machines to use an alternate QEMU binary Juan Quintela
2023-10-20  6:57 ` [PULL 09/17] tests/qtest: Introduce qtest_has_machine_with_env Juan Quintela
2023-10-20  6:57 ` [PULL 10/17] tests/qtest: Introduce qtest_resolve_machine_alias Juan Quintela
2023-10-20  6:57 ` Juan Quintela [this message]
2023-10-20  6:57 ` [PULL 12/17] tests/qtest/migration: Define a machine for all architectures Juan Quintela
2023-10-20  6:57 ` [PULL 13/17] tests/qtest/migration: Specify the geometry of the bootsector Juan Quintela
2023-10-20  6:57 ` [PULL 14/17] tests/qtest/migration: Set q35 as the default machine for x86_86 Juan Quintela
2023-10-20  6:57 ` [PULL 15/17] tests/qtest/migration: Support more than one QEMU binary Juan Quintela
2023-10-20  6:57 ` [PULL 16/17] tests/qtest/migration: Allow user to specify a machine type Juan Quintela
2023-10-20  6:57 ` [PULL 17/17] tests/qtest: Don't print messages from query instances Juan Quintela
2023-10-20 16:07 ` [PULL 00/17] Migration 20231020 patches Stefan Hajnoczi

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=20231020065751.26047-12-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=clg@kaod.org \
    --cc=clg@redhat.com \
    --cc=codyprime@gmail.com \
    --cc=danielhb413@gmail.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=david@redhat.com \
    --cc=den@openvz.org \
    --cc=elena.ufimtseva@oracle.com \
    --cc=fam@euphon.net \
    --cc=farman@linux.ibm.com \
    --cc=farosas@suse.de \
    --cc=groug@kaod.org \
    --cc=harshpb@linux.ibm.com \
    --cc=hreitz@redhat.com \
    --cc=iii@linux.ibm.com \
    --cc=jag.raman@oracle.com \
    --cc=jasowang@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kwolf@redhat.com \
    --cc=leobras@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    --cc=npiggin@gmail.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=peterx@redhat.com \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu_oss@crudebyte.com \
    --cc=reinoud@netbsd.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=stefanha@redhat.com \
    --cc=sunilmut@microsoft.com \
    --cc=sw@weilnetz.de \
    --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).