[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/20] linux-user/mips: Do not try to use removed R5900 CPU
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PULL 09/20] linux-user/mips: Do not try to use removed R5900 CPU |
|
Date: |
Tue, 20 Aug 2024 00:51:05 +0200 |
R5900 emulation was removed in commit 823f2897bd.
Remove it from ELF parsing in order to avoid:
$ qemu-mipsn32 ./test5900
qemu-mipsn32: unable to find CPU model 'R5900'
This reverts commit 4d9e5a0eb7df6e98ac6cf5e16029f35dd05b9537.
Fixes: 823f2897bd ("target/mips: Disable R5900 support")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240814133928.6746-2-philmd@linaro.org>
---
linux-user/mips/target_elf.h | 3 ---
linux-user/mips64/target_elf.h | 3 ---
2 files changed, 6 deletions(-)
diff --git a/linux-user/mips/target_elf.h b/linux-user/mips/target_elf.h
index b965e86b2b..71a32315a8 100644
--- a/linux-user/mips/target_elf.h
+++ b/linux-user/mips/target_elf.h
@@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags)
if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_32R6) {
return "mips32r6-generic";
}
- if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) {
- return "R5900";
- }
if (eflags & EF_MIPS_NAN2008) {
return "P5600";
}
diff --git a/linux-user/mips64/target_elf.h b/linux-user/mips64/target_elf.h
index 5f2f2df29f..ec55d8542a 100644
--- a/linux-user/mips64/target_elf.h
+++ b/linux-user/mips64/target_elf.h
@@ -12,9 +12,6 @@ static inline const char *cpu_get_model(uint32_t eflags)
if ((eflags & EF_MIPS_ARCH) == EF_MIPS_ARCH_64R6) {
return "I6400";
}
- if ((eflags & EF_MIPS_MACH) == EF_MIPS_MACH_5900) {
- return "R5900";
- }
return "5KEf";
}
#endif
--
2.45.2
- [PULL 05/20] target/mips: Use correct MMU index in get_pte(), (continued)
- [PULL 05/20] target/mips: Use correct MMU index in get_pte(), Philippe Mathieu-Daudé, 2024/08/19
- [PULL 07/20] hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma, Philippe Mathieu-Daudé, 2024/08/19
- [PULL 04/20] target/mips: Pass page table entry size as MemOp to get_pte(), Philippe Mathieu-Daudé, 2024/08/19
- [PULL 08/20] hw/remote/message.c: Don't directly invoke DeviceClass:reset, Philippe Mathieu-Daudé, 2024/08/19
- [PULL 16/20] target/sparc: Restrict STQF to sparcv9, Philippe Mathieu-Daudé, 2024/08/19
- [PULL 18/20] hw/i386/pc: Unify vmport=auto handling, Philippe Mathieu-Daudé, 2024/08/19
[PULL 09/20] linux-user/mips: Do not try to use removed R5900 CPU,
Philippe Mathieu-Daudé <=
[PULL 20/20] crypto/tlscredspsk: Free username on finalize, Philippe Mathieu-Daudé, 2024/08/19
[PULL 11/20] linux-user/mips: Select MIPS64R2-generic for Rel2 binaries, Philippe Mathieu-Daudé, 2024/08/19
[PULL 13/20] tests/avocado: exec_command should not consume console output, Philippe Mathieu-Daudé, 2024/08/19
[PULL 17/20] hw/ppc/Kconfig: Add missing SERIAL_ISA dependency to POWERNV machine, Philippe Mathieu-Daudé, 2024/08/19
[PULL 06/20] target/mips: Load PTE as DATA, Philippe Mathieu-Daudé, 2024/08/19
[PULL 10/20] linux-user/mips: Select Octeon68XX CPU for Octeon binaries, Philippe Mathieu-Daudé, 2024/08/19
[PULL 12/20] linux-user/mips: Select Loongson CPU for Loongson binaries, Philippe Mathieu-Daudé, 2024/08/19
[PULL 15/20] contrib/plugins/execlog: Fix shadowed declaration warning, Philippe Mathieu-Daudé, 2024/08/19
[PULL 19/20] hw/i386/pc: Ensure vmport prerequisites are fulfilled, Philippe Mathieu-Daudé, 2024/08/19
[PULL 14/20] tests/avocado: Mark ppc_hv_tests.py as non-flaky after fixed console interaction, Philippe Mathieu-Daudé, 2024/08/19