diff options
| author | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2013-11-15 14:46:38 +0100 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2014-02-11 22:56:54 +1000 |
| commit | fdfba1a298ae26dd44bcfdb0429314139a0bc55a (patch) | |
| tree | a1d53f014db493c4c699e27022da8077854df374 /include | |
| parent | 33bde2e13f36b9331e35b6e531bc06e8567b4f64 (diff) | |
exec: Make ldl_*_phys input an AddressSpace
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/cpu-common.h | 6 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 8f33122c9f..2b3d8f04aa 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -86,8 +86,8 @@ void qemu_flush_coalesced_mmio_buffer(void); uint32_t ldub_phys(hwaddr addr); uint32_t lduw_le_phys(hwaddr addr); uint32_t lduw_be_phys(hwaddr addr); -uint32_t ldl_le_phys(hwaddr addr); -uint32_t ldl_be_phys(hwaddr addr); +uint32_t ldl_le_phys(AddressSpace *as, hwaddr addr); +uint32_t ldl_be_phys(AddressSpace *as, hwaddr addr); uint64_t ldq_le_phys(hwaddr addr); uint64_t ldq_be_phys(hwaddr addr); void stb_phys(hwaddr addr, uint32_t val); @@ -100,7 +100,7 @@ void stq_be_phys(hwaddr addr, uint64_t val); #ifdef NEED_CPU_H uint32_t lduw_phys(hwaddr addr); -uint32_t ldl_phys(hwaddr addr); +uint32_t ldl_phys(AddressSpace *as, hwaddr addr); uint64_t ldq_phys(hwaddr addr); void stl_phys_notdirty(hwaddr addr, uint32_t val); void stw_phys(hwaddr addr, uint32_t val); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index b2f11e9a2c..6c705f1b18 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -348,7 +348,7 @@ static inline uint64_t ppc64_phys_to_real(uint64_t addr) static inline uint32_t rtas_ld(target_ulong phys, int n) { - return ldl_be_phys(ppc64_phys_to_real(phys + 4*n)); + return ldl_be_phys(&address_space_memory, ppc64_phys_to_real(phys + 4*n)); } static inline void rtas_st(target_ulong phys, int n, uint32_t val) |