From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-ppc@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Laurent Vivier" <lvivier@redhat.com>
Subject: [PATCH 3/4] tests/libqtest: Introduce qtest_get_base_arch()
Date: Tue, 10 Oct 2023 09:49:51 +0200 [thread overview]
Message-ID: <20231010074952.79165-4-philmd@linaro.org> (raw)
In-Reply-To: <20231010074952.79165-1-philmd@linaro.org>
While qtest_get_arch() returns the target architecture name,
such "i386" or "x86_64", qtest_get_base_arch() return the
"base" (or real underlying) architecture, in this example
that is "x86".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qtest/libqtest.h | 7 +++++++
tests/qtest/libqtest.c | 28 ++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h
index 1e1b42241d..54071e74ec 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -654,6 +654,13 @@ bool qtest_big_endian(QTestState *s);
*/
const char *qtest_get_arch(void);
+/**
+ * qtest_get_base_arch:
+ *
+ * Returns: The base architecture for the QEMU executable under test.
+ */
+const char *qtest_get_base_arch(void);
+
/**
* qtest_get_arch_bits:
*
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index a643a6309c..51cc92af21 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -925,6 +925,34 @@ const char *qtest_get_arch(void)
return end + 1;
}
+const char *qtest_get_base_arch(void)
+{
+ static const struct {
+ const char *const arch;
+ const char *const base;
+ } basearch[] = {
+ { "aarch64", "arm" },
+ { "i386", "x86" },
+ { "loongarch64", "loongarch" },
+ { "mipsel", "mips" },
+ { "mips64", "mips" },
+ { "mips64el", "mips" },
+ { "ppc64", "ppc" },
+ { "riscv32", "riscv" },
+ { "riscv64", "riscv" },
+ { "sparc64", "sparc" },
+ { "x86_64", "x86" },
+ };
+ const char *arch = qtest_get_arch();
+
+ for (unsigned i = 0; i < ARRAY_SIZE(basearch); i++) {
+ if (!strcmp(arch, basearch[i].arch)) {
+ return basearch[i].base;
+ }
+ }
+ g_assert_not_reached();
+}
+
unsigned qtest_get_arch_bits(void)
{
static const char *const arch64[] = {
--
2.41.0
next prev parent reply other threads:[~2023-10-10 7:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-10 7:49 [PATCH 0/4] tests/qtest: Introduce qtest_get_base_arch() and qtest_get_arch_bits() Philippe Mathieu-Daudé
2023-10-10 7:49 ` [PATCH 1/4] tests/libqtest: Introduce qtest_get_arch_bits() Philippe Mathieu-Daudé
2023-10-10 9:46 ` Thomas Huth
2023-10-10 9:48 ` Philippe Mathieu-Daudé
2023-10-10 7:49 ` [PATCH 2/4] tests/qtest: Use qtest_get_arch_bits() Philippe Mathieu-Daudé
2023-10-10 9:49 ` Thomas Huth
2023-10-10 10:03 ` Ani Sinha
2023-10-10 7:49 ` Philippe Mathieu-Daudé [this message]
2023-10-10 8:42 ` [PATCH 3/4] tests/libqtest: Introduce qtest_get_base_arch() Philippe Mathieu-Daudé
2023-10-10 9:50 ` Thomas Huth
2023-10-10 7:49 ` [PATCH 4/4] tests/qtest: Use qtest_get_base_arch() Philippe Mathieu-Daudé
2023-10-10 9:38 ` Akihiko Odaki
2023-10-10 9:58 ` Thomas Huth
2023-10-10 10:37 ` Philippe Mathieu-Daudé
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=20231010074952.79165-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--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).