diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2017-12-28 13:08:05 -0500 |
---|---|---|
committer | Laurent Vivier <laurent@vivier.eu> | 2018-03-09 21:23:03 +0100 |
commit | c3637eaf61c9c4a74edaa078599f349eeefa49c6 (patch) | |
tree | b515534bd60836ab3e7830bb69bbc398d590defa /linux-user/elfload.c | |
parent | 8756e1361d177e91dc6d88f37749b809fd2407fb (diff) |
linux-user: Rename validate_guest_space => init_guest_commpage
init_guest_commpage is a much more honest description of what the function
does. validate_guest_space not only suggests that the function has no
side-effects, but also introduces confusion as to why it is only needed on
32-bit ARM targets.
Signed-off-by: Luke Shumaker <lukeshu@parabola.nu>
Message-Id: <20171228180814.9749-3-lukeshu@lukeshu.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/elfload.c')
-rw-r--r-- | linux-user/elfload.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7aebc21c04..eaa52afe79 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -362,8 +362,8 @@ enum { * The guest code may leave a page mapped and populate it if the * address is suitable. */ -static int validate_guest_space(unsigned long guest_base, - unsigned long guest_size) +static int init_guest_commpage(unsigned long guest_base, + unsigned long guest_size) { unsigned long real_start, test_page_addr; @@ -1810,7 +1810,7 @@ unsigned long init_guest_space(unsigned long host_start, * address. */ if (host_start && !host_size) { #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) - if (validate_guest_space(host_start, host_size) != 1) { + if (init_guest_commpage(host_start, host_size) != 1) { return (unsigned long)-1; } #endif @@ -1855,8 +1855,8 @@ unsigned long init_guest_space(unsigned long host_start, 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); + int valid = init_guest_commpage(real_start - guest_start, + real_size); if (valid == 1) { break; } else if (valid == -1) { |