diff options
| author | Richard Henderson | 2021-02-12 19:48:41 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-02-16 12:04:53 +0100 |
| commit | a78a6363cb8e55cc8ede334ba68d54ba8a185409 (patch) | |
| tree | 9ced000eaaffd42e54d4c081cbdc2a98c4c6bf59 /include/exec | |
| parent | linux-user: Do not use guest_addr_valid for h2g_valid (diff) | |
| download | qemu-a78a6363cb8e55cc8ede334ba68d54ba8a185409.tar.gz qemu-a78a6363cb8e55cc8ede334ba68d54ba8a185409.tar.xz qemu-a78a6363cb8e55cc8ede334ba68d54ba8a185409.zip | |
linux-user: Fix guest_addr_valid vs reserved_va
We must always use GUEST_ADDR_MAX, because even 32-bit hosts can
use -R <reserved_va> to restrict the memory address of the guest.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210212184902.1251044-11-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/cpu_ldst.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 4e6ef3d542..e62f4fba00 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -72,11 +72,10 @@ typedef uint64_t abi_ptr; /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ #define g2h(x) ((void *)((uintptr_t)(abi_ptr)(x) + guest_base)) -#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS -#define guest_addr_valid(x) (1) -#else -#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX) -#endif +static inline bool guest_addr_valid(abi_ulong x) +{ + return x <= GUEST_ADDR_MAX; +} static inline bool guest_range_valid(abi_ulong start, abi_ulong len) { |