[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 18/38] target/arm: make arm_casq_ptw CONFIG_TCG only
From: |
Alex Bennée |
Subject: |
[PATCH v4 18/38] target/arm: make arm_casq_ptw CONFIG_TCG only |
Date: |
Fri, 30 Jun 2023 19:04:03 +0100 |
The ptw code is accessed by non-TCG code (specifically arm_pamax and
arm_cpu_get_phys_page_attrs_debug) but most of it is really only for
TCG emulation. Seeing as we already assert for a non TARGET_AARCH64
build lets extend the test rather than further messing with the ifdef
ladder.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
v2
- tweak comment to rth's suggestion
---
target/arm/ptw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/arm/ptw.c b/target/arm/ptw.c
index 6015121b99..42355caa9b 100644
--- a/target/arm/ptw.c
+++ b/target/arm/ptw.c
@@ -628,7 +628,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t
old_val,
uint64_t new_val, S1Translate *ptw,
ARMMMUFaultInfo *fi)
{
-#ifdef TARGET_AARCH64
+#if defined(TARGET_AARCH64) && defined(CONFIG_TCG)
uint64_t cur_val;
void *host = ptw->out_host;
@@ -709,7 +709,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t
old_val,
return cur_val;
#else
- /* AArch32 does not have FEAT_HADFS. */
+ /* AArch32 does not have FEAT_HADFS; non-TCG guests only use debug-mode. */
g_assert_not_reached();
#endif
}
--
2.39.2
- [PATCH v4 36/38] gdbstub: Add support for info proc mappings, (continued)
- [PATCH v4 36/38] gdbstub: Add support for info proc mappings, Alex Bennée, 2023/06/30
- [PATCH v4 33/38] linux-user: Emulate /proc/self/smaps, Alex Bennée, 2023/06/30
- [PATCH v4 34/38] gdbstub: Expose gdb_get_process() and gdb_get_first_cpu_in_process(), Alex Bennée, 2023/06/30
- [PATCH v4 31/38] linux-user: Expose do_guest_openat() and do_guest_readlink(), Alex Bennée, 2023/06/30
- [PATCH v4 16/38] tests/avocado: update firmware to enable sbsa-ref/max, Alex Bennée, 2023/06/30
- [PATCH v4 25/38] docs/devel/qom.rst: Correct code style, Alex Bennée, 2023/06/30
- [PATCH v4 29/38] gdbstub: Permit reverse step/break to provide stop response, Alex Bennée, 2023/06/30
- [PATCH v4 17/38] tests/avocado: Make the test_arm_bpim2u_gmac test more reliable, Alex Bennée, 2023/06/30
- [PATCH v4 35/38] gdbstub: Report the actual qemu-user pid, Alex Bennée, 2023/06/30
- [PATCH v4 24/38] include/hw/qdev-core: fixup kerneldoc annotations, Alex Bennée, 2023/06/30
- [PATCH v4 18/38] target/arm: make arm_casq_ptw CONFIG_TCG only,
Alex Bennée <=
- [PATCH v4 23/38] include/migration: mark vmstate_register() as a legacy function, Alex Bennée, 2023/06/30
- [PATCH v4 15/38] tests/docker: convert riscv64-cross to lcitool, Alex Bennée, 2023/06/30
- [PATCH v4 22/38] docs/devel: add some front matter to the devel index, Alex Bennée, 2023/06/30
- [PATCH v4 19/38] plugins: force slow path when plugins instrument memory ops, Alex Bennée, 2023/06/30