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

Fix compiler warnings, by Stefan Weil.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3507 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-11-02 19:08:57 +00:00
parent 3d97b40b05
commit 80210bcd71
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
linux-user/mmap.c
View File

@ -37,7 +37,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot)
#ifdef DEBUG_MMAP #ifdef DEBUG_MMAP
printf("mprotect: start=0x" TARGET_FMT_lx printf("mprotect: start=0x" TARGET_FMT_lx
"len=0x" TARGET_FMT_lx " prot=%c%c%c\n", start, len, "len=0x" TARGET_FMT_lx " prot=%c%c%c\n", start, len,
prot & PROT_READ ? 'r' : '-', prot & PROT_READ ? 'r' : '-',
prot & PROT_WRITE ? 'w' : '-', prot & PROT_WRITE ? 'w' : '-',
prot & PROT_EXEC ? 'x' : '-'); prot & PROT_EXEC ? 'x' : '-');
@ -100,7 +100,7 @@ static int mmap_frag(abi_ulong real_start,
abi_ulong start, abi_ulong end, abi_ulong start, abi_ulong end,
int prot, int flags, int fd, abi_ulong offset) int prot, int flags, int fd, abi_ulong offset)
{ {
abi_ulong real_end, ret, addr; abi_ulong real_end, addr;
void *host_start; void *host_start;
int prot1, prot_new; int prot1, prot_new;
@ -116,10 +116,10 @@ static int mmap_frag(abi_ulong real_start,
if (prot1 == 0) { if (prot1 == 0) {
/* no page was there, so we allocate one */ /* no page was there, so we allocate one */
ret = (long)mmap(host_start, qemu_host_page_size, prot, void *p = mmap(host_start, qemu_host_page_size, prot,
flags | MAP_ANONYMOUS, -1, 0); flags | MAP_ANONYMOUS, -1, 0);
if (ret == -1) if (p == MAP_FAILED)
return ret; return -1;
prot1 = prot; prot1 = prot;
} }
prot1 &= PAGE_BITS; prot1 &= PAGE_BITS;
@ -168,7 +168,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
#ifdef DEBUG_MMAP #ifdef DEBUG_MMAP
{ {
printf("mmap: start=0x" TARGET_FMT_lx printf("mmap: start=0x" TARGET_FMT_lx
" len=0x" TARGET_FMT_lx " prot=%c%c%c flags=", " len=0x" TARGET_FMT_lx " prot=%c%c%c flags=",
start, len, start, len,
prot & PROT_READ ? 'r' : '-', prot & PROT_READ ? 'r' : '-',
prot & PROT_WRITE ? 'w' : '-', prot & PROT_WRITE ? 'w' : '-',
@ -230,16 +230,16 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
*/ */
abi_ulong host_end; abi_ulong host_end;
unsigned long host_aligned_start; unsigned long host_aligned_start;
void *p;
host_len = HOST_PAGE_ALIGN(host_len + qemu_host_page_size host_len = HOST_PAGE_ALIGN(host_len + qemu_host_page_size
- qemu_real_host_page_size); - qemu_real_host_page_size);
host_start = (unsigned long) mmap(real_start ? p = mmap(real_start ? g2h(real_start) : NULL,
g2h(real_start) : NULL, host_len, prot, flags, fd, host_offset);
host_len, prot, flags, if (p == MAP_FAILED)
fd, host_offset);
if (host_start == -1)
return -1; return -1;
host_start = (unsigned long)p;
host_end = host_start + host_len; host_end = host_start + host_len;
/* Find start and end, aligned to the targets pagesize with-in the /* Find start and end, aligned to the targets pagesize with-in the
@ -260,11 +260,12 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
goto the_end1; goto the_end1;
} else { } else {
/* if not fixed, no need to do anything */ /* if not fixed, no need to do anything */
host_start = (long)mmap(real_start ? g2h(real_start) : NULL, void *p = mmap(real_start ? g2h(real_start) : NULL,
host_len, prot, flags, fd, host_offset); host_len, prot, flags, fd, host_offset);
if (host_start == -1) if (p == MAP_FAILED)
return -1; return -1;
/* update start so that it points to the file position at 'offset' */ /* update start so that it points to the file position at 'offset' */
host_start = (unsigned long)p;
if (!(flags & MAP_ANONYMOUS)) if (!(flags & MAP_ANONYMOUS))
host_start += offset - host_offset; host_start += offset - host_offset;
start = h2g(host_start); start = h2g(host_start);
@ -333,14 +334,15 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
/* map the middle (easier) */ /* map the middle (easier) */
if (real_start < real_end) { if (real_start < real_end) {
void *p;
unsigned long offset1; unsigned long offset1;
if (flags & MAP_ANONYMOUS) if (flags & MAP_ANONYMOUS)
offset1 = 0; offset1 = 0;
else else
offset1 = offset + real_start - start; offset1 = offset + real_start - start;
ret = (long)mmap(g2h(real_start), real_end - real_start, p = mmap(g2h(real_start), real_end - real_start,
prot, flags, fd, offset1); prot, flags, fd, offset1);
if (ret == -1) if (p == MAP_FAILED)
return -1; return -1;
} }
the_end1: the_end1:

1
target-i386/helper2.c
View File

@ -32,6 +32,7 @@
//#define DEBUG_MMU //#define DEBUG_MMU
#ifdef USE_CODE_COPY #ifdef USE_CODE_COPY
#include <unistd.h>
#include <asm/ldt.h> #include <asm/ldt.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include <linux/version.h> #include <linux/version.h>