[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] linux-user: Use #if to only call validate_gue
From: |
Luke Shumaker |
Subject: |
[Qemu-devel] [PATCH 01/10] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target |
Date: |
Thu, 28 Dec 2017 13:08:04 -0500 |
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>
---
linux-user/elfload.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 20f3d8c2c3..cac991159c 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.
@@ -1823,15 +1822,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,
@@ -1845,11 +1835,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 defined(TARGET_ARM) && !defined(TARGET_AARCH64)
if (validate_guest_space(host_start, host_size) == 1) {
- return host_start;
- } else {
return (unsigned long)-1;
}
+#endif
+ return host_start;
}
/* Setup the initial flags and start address. */
@@ -1888,6 +1879,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) {
@@ -1896,6 +1889,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.15.1
- [Qemu-devel] [PATCH 00/10] linux-user: Speed up guest space initialization on 32-bit ARM target, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 02/10] linux-user: Rename validate_guest_space => init_guest_commpage, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 06/10] linux-user: init_guest_commpage: Add a comment about size check, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 05/10] linux-user: init_guest_space: Clarify page alignment logic, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 04/10] linux-user: init_guest_space: Correctly handle guest_start in commpage initialization, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 03/10] linux-user: init_guest_space: Clean up if we can't initialize the commpage, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 08/10] linux-user: init_guest_space: Don't try to align if we'll reject it, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 10/10] linux-user: init_guest_space: Try to make ARM space+commpage continuous, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 01/10] linux-user: Use #if to only call validate_guest_space for 32-bit ARM target,
Luke Shumaker <=
- [Qemu-devel] [PATCH 07/10] linux-user: init_guest_space: Clean up control flow a bit, Luke Shumaker, 2017/12/28
- [Qemu-devel] [PATCH 09/10] linux-user: init_guest_space: Add a comment about search strategy, Luke Shumaker, 2017/12/28