mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-11-05 20:35:44 +00:00
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>
This commit is contained in:
parent
8756e1361d
commit
c3637eaf61
1 changed files with 5 additions and 5 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue