From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 18/46] linux-user/i386: Return const data from get_elf_platform
Date: Thu, 28 Aug 2025 09:19:55 +1000 [thread overview]
Message-ID: <20250827232023.50398-19-richard.henderson@linaro.org> (raw)
In-Reply-To: <20250827232023.50398-1-richard.henderson@linaro.org>
Rather than modify a static buffer, index into an array of const data.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/i386/elfload.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/linux-user/i386/elfload.c b/linux-user/i386/elfload.c
index 1b759098ca..ef3a6c35d2 100644
--- a/linux-user/i386/elfload.c
+++ b/linux-user/i386/elfload.c
@@ -17,13 +17,9 @@ abi_ulong get_elf_hwcap(CPUState *cs)
const char *get_elf_platform(CPUState *cs)
{
- static char elf_platform[] = "i386";
+ static const char elf_platform[4][5] = { "i386", "i486", "i586", "i686" };
int family = object_property_get_int(OBJECT(cs), "family", NULL);
- if (family > 6) {
- family = 6;
- }
- if (family >= 3) {
- elf_platform[1] = '0' + family;
- }
- return elf_platform;
+
+ family = MAX(MIN(family, 6), 3);
+ return elf_platform[family - 3];
}
--
2.43.0
next prev parent reply other threads:[~2025-08-27 23:25 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-27 23:19 [PULL 00/46] linux-user patch queue Richard Henderson
2025-08-27 23:19 ` [PULL 01/46] semihosting: Retrieve stack top from image_info Richard Henderson
2025-08-27 23:19 ` [PULL 02/46] semihosting: Initialize heap once per process Richard Henderson
2025-08-27 23:19 ` [PULL 03/46] linux-user: Create target/elfload.c files Richard Henderson
2025-08-27 23:19 ` [PULL 04/46] linux-user: Move ppc uabi/asm/elf.h workaround to osdep.h Richard Henderson
2025-08-27 23:19 ` [PULL 05/46] linux-user: Move get_elf_cpu_model to target/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 06/46] linux-user: Move get_elf_hwcap to {i386, x86_64}/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 07/46] linux-user: Move hwcap functions to {arm, aarch64}/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 08/46] linux-user: Move get_elf_hwcap to sparc/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 09/46] linux-user: Move hwcap functions to ppc/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 10/46] linux-user: Move get_elf_hwcap to loongarch64/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 11/46] linux-user: Move get_elf_hwcap to mips/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 12/46] linux-user: Move get_elf_hwcap to sh4/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 13/46] linux-user: Move hwcap functions to s390x/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 14/46] linux-user: Move get_elf_hwcap to riscv/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 15/46] linux-user: Remove ELF_HWCAP Richard Henderson
2025-08-27 23:19 ` [PULL 16/46] linux-user: Remove ELF_HWCAP2 Richard Henderson
2025-08-27 23:19 ` [PULL 17/46] linux-user: Move get_elf_platform to {i386, x86_64}/elfload.c Richard Henderson
2025-08-27 23:19 ` Richard Henderson [this message]
2025-08-27 23:19 ` [PULL 19/46] linux-user: Move get_elf_platform to arm/elfload.c Richard Henderson
2025-08-27 23:19 ` [PULL 20/46] linux-user/loongarch64: Create get_elf_platform Richard Henderson
2025-08-27 23:19 ` [PULL 21/46] linux-user/hppa: " Richard Henderson
2025-08-27 23:19 ` [PULL 22/46] linux-user: Remove ELF_PLATFORM Richard Henderson
2025-08-27 23:20 ` [PULL 23/46] linux-user: Move get_elf_base_platform to mips/elfload.c Richard Henderson
2025-08-27 23:20 ` [PULL 24/46] linux-user: Move target_cpu_copy_regs decl to qemu.h Richard Henderson
2025-08-27 23:20 ` [PULL 25/46] linux-user: Create do_init_main_thread Richard Henderson
2025-08-27 23:20 ` [PULL 26/46] linux-user/i386: Create init_main_thread Richard Henderson
2025-08-27 23:20 ` [PULL 27/46] linux-user/arm: " Richard Henderson
2025-08-27 23:20 ` [PULL 28/46] linux-user/arm: Remove a.out startup remenents Richard Henderson
2025-08-27 23:20 ` [PULL 29/46] linux-user/aarch64: Create init_main_thread Richard Henderson
2025-08-27 23:20 ` [PULL 30/46] linux-user/sparc: " Richard Henderson
2025-08-27 23:20 ` [PULL 31/46] linux-user/ppc: " Richard Henderson
2025-08-27 23:20 ` [PULL 32/46] linux-user/loongarch64: " Richard Henderson
2025-08-27 23:20 ` [PULL 33/46] linux-user/mips: " Richard Henderson
2025-08-27 23:20 ` [PULL 34/46] linux-user/microblaze: " Richard Henderson
2025-08-27 23:20 ` [PULL 35/46] linux-user/openrisc: " Richard Henderson
2025-08-27 23:20 ` [PULL 36/46] linux-user/sh4: " Richard Henderson
2025-08-27 23:20 ` [PULL 37/46] linux-user/m68k: " Richard Henderson
2025-08-27 23:20 ` [PULL 38/46] linux-user/alpha: " Richard Henderson
2025-08-27 23:20 ` [PULL 39/46] linux-user/s390x: " Richard Henderson
2025-08-27 23:20 ` [PULL 40/46] linux-user/riscv: " Richard Henderson
2025-08-27 23:20 ` [PULL 41/46] linux-user/hppa: " Richard Henderson
2025-08-27 23:20 ` [PULL 42/46] linux-user/xtensa: " Richard Henderson
2025-08-27 23:20 ` [PULL 43/46] linux-user/hexagon: " Richard Henderson
2025-08-27 23:20 ` [PULL 44/46] linux-user: Remove do_init_main_thread Richard Henderson
2025-08-27 23:20 ` [PULL 45/46] linux-user: Add strace for rseq Richard Henderson
2025-08-27 23:20 ` [PULL 46/46] linux-user: do not print IP socket options by default Richard Henderson
2025-08-28 2:47 ` [PULL 00/46] linux-user patch queue Richard Henderson
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=20250827232023.50398-19-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).