aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-12-28 13:08:11 -0500
committerLaurent Vivier <laurent@vivier.eu>2018-03-13 15:02:20 +0100
commitaac362e46f13305fd9b4abfe7d0068595d4555f2 (patch)
treeb5e4b027ccc5c8cb1f03ac6fc9983d0dc07ee79b /linux-user
parent7ad75eea86e5e9a327a1f64a3e8ec6dbb6534d1e (diff)
downloadqemu-aac362e46f13305fd9b4abfe7d0068595d4555f2.zip
qemu-aac362e46f13305fd9b4abfe7d0068595d4555f2.tar.gz
qemu-aac362e46f13305fd9b4abfe7d0068595d4555f2.tar.bz2
linux-user: init_guest_space: Don't try to align if we'll reject it
If the ensure-alignment code gets triggered, then the "if (host_start && real_start != current_start)" check will always trigger, so save 2 syscalls and put that check first. Note that we can't just switch to using MAP_FIXED for that check, because then we couldn't differentiate between a failure because "there isn't enough space" and "there isn't enough space *here*". Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> Message-Id: <20171228180814.9749-9-lukeshu@lukeshu.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/elfload.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index c6491a8..5c64299 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1845,6 +1845,11 @@ unsigned long init_guest_space(unsigned long host_start,
return (unsigned long)-1;
}
+ /* Check to see if the address is valid. */
+ if (host_start && real_start != current_start) {
+ goto try_again;
+ }
+
/* Ensure the address is properly aligned. */
if (real_start & ~qemu_host_page_mask) {
/* Ideally, we adjust like
@@ -1879,11 +1884,6 @@ unsigned long init_guest_space(unsigned long host_start,
aligned_start = real_start;
}
- /* Check to see if the address is valid. */
- if (host_start && aligned_start != current_start) {
- goto try_again;
- }
-
#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
/* On 32-bit ARM, we need to also be able to map the commpage. */
int valid = init_guest_commpage(aligned_start - guest_start,