diff options
author | David 'Digit' Turner <digit@android.com> | 2011-02-23 13:32:37 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@android.com> | 2011-02-23 17:05:34 +0100 |
commit | 462564f31bbdc9939bf1d2376e2782defa7ef655 (patch) | |
tree | 261958f81739fbfcf4228c05fdbcc6f854008286 /target-arm | |
parent | fa59e01ddace99351b212b8d82700156776e27e6 (diff) | |
download | external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.zip external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.tar.gz external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.tar.bz2 |
Minor cleanups for core/ui Makefile separation.
This patch contains minor cleanups that will be needed by
a few future patches that will improve the way core and ui
sources are separated and built.
- remove a few compiler warnings
- formatting
- remove the memcheck CONFIG_MEMCHECK checks (they later get in the way)
- refine hw/hw.h inclusion's of cpu.h (this comes from upstream)
- add missing definitions for PRUd64 and PRUx64 (used later)
- remove CONFIG_SHAPER test, replace with CONFIG_ANDROID instead.
- add missing strdup() calls.
Change-Id: Ic7d6681a51af718c298f0ee4bd884b1d8750f28e
Diffstat (limited to 'target-arm')
-rw-r--r-- | target-arm/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index 258e2cb..f595b2c 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1214,7 +1214,7 @@ static inline int get_phys_addr(CPUState *env, uint32_t address, int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, int access_type, int mmu_idx, int is_softmmu) { - uint32_t phys_addr; + uint32_t phys_addr = 0; int prot; int ret, is_user; @@ -1244,7 +1244,7 @@ int cpu_arm_handle_mmu_fault (CPUState *env, target_ulong address, target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) { - uint32_t phys_addr; + uint32_t phys_addr = 0; int prot; int ret; |