[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] linux-user: Use #if to only call validate_gues
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 10/18] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target |
Date: |
Tue, 13 Mar 2018 18:33:47 +0100 |
From: Luke Shumaker <address@hidden>
Instead of defining a bogus validate_guest_space that always returns 1 on
targets other than 32-bit ARM, use #if blocks to only call it on 32-bit ARM
targets. This makes the "normal" flow control clearer.
Signed-off-by: Luke Shumaker <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
[lv: fix condition to "!= 1" as requested by Peter]
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/elfload.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 85462d30db..7aebc21c04 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -354,7 +354,6 @@ enum {
/* The commpage only exists for 32 bit kernels */
-#define TARGET_HAS_VALIDATE_GUEST_SPACE
/* Return 1 if the proposed guest space is suitable for the guest.
* Return 0 if the proposed guest space isn't suitable, but another
* address space should be tried.
@@ -1797,15 +1796,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int
argc, int envc,
return sp;
}
-#ifndef TARGET_HAS_VALIDATE_GUEST_SPACE
-/* If the guest doesn't have a validation function just agree */
-static int validate_guest_space(unsigned long guest_base,
- unsigned long guest_size)
-{
- return 1;
-}
-#endif
-
unsigned long init_guest_space(unsigned long host_start,
unsigned long host_size,
unsigned long guest_start,
@@ -1819,11 +1809,12 @@ unsigned long init_guest_space(unsigned long host_start,
/* If just a starting address is given, then just verify that
* address. */
if (host_start && !host_size) {
- if (validate_guest_space(host_start, host_size) == 1) {
- return host_start;
- } else {
+#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+ if (validate_guest_space(host_start, host_size) != 1) {
return (unsigned long)-1;
}
+#endif
+ return host_start;
}
/* Setup the initial flags and start address. */
@@ -1862,6 +1853,8 @@ unsigned long init_guest_space(unsigned long host_start,
/* Check to see if the address is valid. */
if (!host_start || real_start == current_start) {
+#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
+ /* On 32-bit ARM, we need to also be able to map the commpage. */
int valid = validate_guest_space(real_start - guest_start,
real_size);
if (valid == 1) {
@@ -1870,6 +1863,10 @@ unsigned long init_guest_space(unsigned long host_start,
return (unsigned long)-1;
}
/* valid == 0, so try again. */
+#else
+ /* On other architectures, whatever we have here is fine. */
+ break;
+#endif
}
/* That address didn't work. Unmap and try a different one.
--
2.14.3
- [Qemu-devel] [PULL 00/18] Linux user for 2.12 patches, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 03/18] linux-user: allows to use "--systemd ALL" with qemu-binfmt-conf.sh, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 07/18] linux-user: fix target_mprotect/target_munmap error return values, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 06/18] linux-user: fix assertion in shmdt, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 05/18] linux-user: fix mmap/munmap/mprotect/mremap/shmat, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 04/18] linux-user: Support f_flags in statfs when available., Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 09/18] qemu-binfmt-conf.sh: add qemu-xtensa, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 02/18] linux-user: Remove the unused "not implemented" signal handling stubs, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 08/18] linux-user: drop unused target_msync function, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 01/18] linux-user: Drop unicore32 code, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 10/18] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target,
Laurent Vivier <=
- [Qemu-devel] [PULL 12/18] linux-user: init_guest_space: Clean up if we can't initialize the commpage, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 17/18] linux-user: init_guest_space: Don't try to align if we'll reject it, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 14/18] linux-user: init_guest_space: Clarify page alignment logic, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 11/18] linux-user: Rename validate_guest_space => init_guest_commpage, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 16/18] linux-user: init_guest_space: Clean up control flow a bit, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 15/18] linux-user: init_guest_commpage: Add a comment about size check, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 18/18] linux-user: init_guest_space: Add a comment about search strategy, Laurent Vivier, 2018/03/13
- [Qemu-devel] [PULL 13/18] linux-user: init_guest_space: Correctly handle guest_start in commpage initialization, Laurent Vivier, 2018/03/13
- Re: [Qemu-devel] [PULL 00/18] Linux user for 2.12 patches, no-reply, 2018/03/14
- Re: [Qemu-devel] [PULL 00/18] Linux user for 2.12 patches, Peter Maydell, 2018/03/15