1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From b5b929b0423e5db333c9d5dfc104bb3598ff4182 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Thu, 28 Dec 2017 08:03:26 -0500
Subject: [PATCH 02/10] 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>
---
linux-user/elfload.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index cac991159c..453394239c 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;
@@ -1836,7 +1836,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
@@ -1881,8 +1881,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) {
--
2.15.1
|
