mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Avoid page_set_flags() assert in qemu-user host page protection code"

Browse Source 
This reverts commit 01c0bef162.

(breaks build on 32-bit hosts)
This commit is contained in:
Aurelien Jarno 2010-04-10 17:20:36 +02:00
parent 837d987bb9
commit fd43690777
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
exec.c
View File

@ -307,14 +307,13 @@ static void page_init(void)
if (h2g_valid(endaddr)) {
endaddr = h2g(endaddr);
page_set_flags(startaddr, endaddr, PAGE_RESERVED);
} else {
#if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS
endaddr = ~0ul;
#else
endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1;
page_set_flags(startaddr, endaddr, PAGE_RESERVED);
#endif
}
page_set_flags(startaddr, endaddr, PAGE_RESERVED);
}
}
free(freep);
@ -325,7 +324,11 @@ static void page_init(void)
last_brk = (unsigned long)sbrk(0);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
f = fopen("/compat/linux/proc/self/maps", "r");
#else
f = fopen("/proc/self/maps", "r");
#endif
if (f) {
mmap_lock();
@ -341,11 +344,7 @@ static void page_init(void)
if (h2g_valid(endaddr)) {
endaddr = h2g(endaddr);
} else {
#if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS
endaddr = ~0ul;
#else
endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1;
#endif
}
page_set_flags(startaddr, endaddr, PAGE_RESERVED);
}