Fix mremap, based on patch by Kirill A. Shutemov
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6056 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
d445bde7e8
commit
3af72a4d98
|
@ -24,6 +24,8 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
#include <linux/mman.h>
|
||||||
|
#include <linux/unistd.h>
|
||||||
|
|
||||||
#include "qemu.h"
|
#include "qemu.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
|
@ -546,10 +548,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
|
||||||
|
|
||||||
mmap_lock();
|
mmap_lock();
|
||||||
|
|
||||||
#if defined(MREMAP_FIXED)
|
|
||||||
if (flags & MREMAP_FIXED)
|
if (flags & MREMAP_FIXED)
|
||||||
host_addr = mremap(g2h(old_addr), old_size, new_size,
|
host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
|
||||||
flags, new_addr);
|
old_size, new_size,
|
||||||
|
flags,
|
||||||
|
new_addr);
|
||||||
else if (flags & MREMAP_MAYMOVE) {
|
else if (flags & MREMAP_MAYMOVE) {
|
||||||
abi_ulong mmap_start;
|
abi_ulong mmap_start;
|
||||||
|
|
||||||
|
@ -559,11 +562,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
host_addr = MAP_FAILED;
|
host_addr = MAP_FAILED;
|
||||||
} else
|
} else
|
||||||
host_addr = mremap(g2h(old_addr), old_size, new_size,
|
host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
|
||||||
flags | MREMAP_FIXED, g2h(mmap_start));
|
old_size, new_size,
|
||||||
} else
|
flags | MREMAP_FIXED,
|
||||||
#endif
|
g2h(mmap_start));
|
||||||
{
|
} else {
|
||||||
host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
|
host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
|
||||||
/* Check if address fits target address space */
|
/* Check if address fits target address space */
|
||||||
if ((unsigned long)host_addr + new_size > (abi_ulong)-1) {
|
if ((unsigned long)host_addr + new_size > (abi_ulong)-1) {
|
||||||
|
|
Loading…
Reference in New Issue