diff options
| author |   pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-02-04 20:46:24 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-02-04 20:46:24 +0000 |
| commit | e89f07d38427dc9e3aab17298d1bc0d339ed3004 (patch) | |
| tree | 55e3f7bca502f4eb73c88018f80d58c4bda27280 /linux-user/mmap.c | |
| parent | Implement Arm BKPT instruction. (diff) | |
| download | qemu-kvm-e89f07d38427dc9e3aab17298d1bc0d339ed3004.tar.gz qemu-kvm-e89f07d38427dc9e3aab17298d1bc0d339ed3004.tar.bz2 qemu-kvm-e89f07d38427dc9e3aab17298d1bc0d339ed3004.zip | |
Make target_mmap always return -1 on failure.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1741 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user/mmap.c')
| -rw-r--r-- | linux-user/mmap.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index a404ef3b0..948f2f6b2 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -183,8 +183,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot, } #endif - if (offset & ~TARGET_PAGE_MASK) - return -EINVAL; + if (offset & ~TARGET_PAGE_MASK) { + errno = EINVAL; + return -1; + } len = TARGET_PAGE_ALIGN(len); if (len == 0) @@ -232,8 +234,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot, } } - if (start & ~TARGET_PAGE_MASK) - return -EINVAL; + if (start & ~TARGET_PAGE_MASK) { + errno = EINVAL; + return -1; + } end = start + len; host_end = HOST_PAGE_ALIGN(end); @@ -244,8 +248,10 @@ long target_mmap(unsigned long start, unsigned long len, int prot, /* msync() won't work here, so we return an error if write is possible while it is a shared mapping */ if ((flags & MAP_TYPE) == MAP_SHARED && - (prot & PROT_WRITE)) - return -EINVAL; + (prot & PROT_WRITE)) { + errno = EINVAL; + return -1; + } retaddr = target_mmap(start, len, prot | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); |