david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: Rename validate_guest_space => init_guest_commpage

Browse Source 
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>
This commit is contained in:
Luke Shumaker 2017-12-28 13:08:05 -05:00 committed by Laurent Vivier
parent 8756e1361d
commit c3637eaf61
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux-user/elfload.c
View File

@ -362,8 +362,8 @@ enum {
* The guest code may leave a page mapped and populate it if the * The guest code may leave a page mapped and populate it if the
* address is suitable. * address is suitable.
*/ */
static int validate_guest_space(unsigned long guest_base, static int init_guest_commpage(unsigned long guest_base,
unsigned long guest_size) unsigned long guest_size)
{ {
unsigned long real_start, test_page_addr; unsigned long real_start, test_page_addr;
@ -1810,7 +1810,7 @@ unsigned long init_guest_space(unsigned long host_start,
* address. */ * address. */
if (host_start && !host_size) { if (host_start && !host_size) {
#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) #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; return (unsigned long)-1;
} }
#endif #endif
@ -1855,8 +1855,8 @@ unsigned long init_guest_space(unsigned long host_start,
if (!host_start || real_start == current_start) { if (!host_start || real_start == current_start) {
#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) #if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
/* On 32-bit ARM, we need to also be able to map the commpage. */ /* On 32-bit ARM, we need to also be able to map the commpage. */
int valid = validate_guest_space(real_start - guest_start, int valid = init_guest_commpage(real_start - guest_start,
real_size); real_size);
if (valid == 1) { if (valid == 1) {
break; break;
} else if (valid == -1) { } else if (valid == -1) {