Commit c3637eaf authored by Luke Shumaker's avatar Luke Shumaker Committed by Laurent Vivier
Browse files

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: default avatarLuke Shumaker <lukeshu@parabola.nu>
Message-Id: <20171228180814.9749-3-lukeshu@lukeshu.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 8756e136

linux-user/elfload.c

+5 −5
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ 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,

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,7 +1855,7 @@ 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,

            int valid = init_guest_commpage(real_start - guest_start,

                                            real_size);

            if (valid == 1) {

                break;