diff options
| author | Andreas Färber | 2013-08-26 05:15:23 +0200 |
|---|---|---|
| committer | Andreas Färber | 2014-03-13 19:20:46 +0100 |
| commit | 99df7dce8ae81e4a42dac98094ccca3a32dcf8f8 (patch) | |
| tree | 5dab3291d05db83495f2ce14575ed6604a72762f /include/exec/softmmu_template.h | |
| parent | cpu: Move mem_io_{pc,vaddr} fields from CPU_COMMON to CPUState (diff) | |
| download | qemu-99df7dce8ae81e4a42dac98094ccca3a32dcf8f8.tar.gz qemu-99df7dce8ae81e4a42dac98094ccca3a32dcf8f8.tar.xz qemu-99df7dce8ae81e4a42dac98094ccca3a32dcf8f8.zip | |
cpu: Move can_do_io field from CPU_COMMON to CPUState
Rename can_do_io() to cpu_can_do_io() and change argument to CPUState.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/exec/softmmu_template.h')
| -rw-r--r-- | include/exec/softmmu_template.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index c7cd93774d..ac825d251c 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -127,7 +127,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, physaddr = (physaddr & TARGET_PAGE_MASK) + addr; cpu->mem_io_pc = retaddr; - if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { + if (mr != &io_mem_rom && mr != &io_mem_notdirty && !cpu_can_do_io(cpu)) { cpu_io_recompile(env, retaddr); } @@ -333,7 +333,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, MemoryRegion *mr = iotlb_to_region(cpu->as, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; - if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { + if (mr != &io_mem_rom && mr != &io_mem_notdirty && !cpu_can_do_io(cpu)) { cpu_io_recompile(env, retaddr); } |