diff options
author | Avi Kivity <avi@redhat.com> | 2009-08-04 16:29:26 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-08-04 16:29:26 +0300 |
commit | 3764fbdc6f1014b001e770e410bd79322af68e47 (patch) | |
tree | baa776ea237b4f4e4a9e84d6300214c61083d57d /exec.c | |
parent | kvm: fix set_ept_identity_addr() in pae (diff) | |
parent | linux-user: make FUTEX_* calls honor timeout parameter (diff) | |
download | qemu-kvm-3764fbdc6f1014b001e770e410bd79322af68e47.tar.gz qemu-kvm-3764fbdc6f1014b001e770e410bd79322af68e47.tar.bz2 qemu-kvm-3764fbdc6f1014b001e770e410bd79322af68e47.zip |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (30 commits)
linux-user: make FUTEX_* calls honor timeout parameter
enable NPTL for ppc-linux-user targets in configure
linux-user: handle POWERPC_EXCP_STCX
target-ppc: add exceptions for conditional stores
target-ppc: retain l{w,d}arx loaded value
target-ppc: add cpu_set_tls
target-ppc: fix cpu_clone_regs
Fix Sparse warning about missing prototype
Fix Sparse warning about "expression using sizeof on a function"
Add missing "static"
More NULL pointer fixes
Fix Sparse warnings: "Using plain integer as NULL pointer"
PPC: convert Uni-north to qdev: also fixes Mac99 machine crash
PPC: convert Grackle to qdev
Option rom makefile fixes
Save/restore ARMv6 MMU state
esp: fix interrupt register read
sparc64 flush pending conditional evaluations before exposing cpu state
Fix SDL zooming with pl110 (cf. d3ffcafe25b5966b351ea6100160c2156688f22f)
e1000.c doesn't properly emulate EERD and ICS registers
...
Conflicts:
target-ppc/cpu.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'exec.c')
-rw-r--r-- | exec.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -325,7 +325,7 @@ static inline PageDesc *page_find_alloc(target_ulong index) #if defined(CONFIG_USER_ONLY) size_t len = sizeof(PageDesc) * L2_SIZE; /* Don't use qemu_malloc because it may recurse. */ - p = mmap(0, len, PROT_READ | PROT_WRITE, + p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); *lp = p; if (h2g_valid(p)) { @@ -350,8 +350,9 @@ static inline PageDesc *page_find(target_ulong index) return NULL; p = *lp; - if (!p) - return 0; + if (!p) { + return NULL; + } return p + (index & (L2_SIZE - 1)); } |