diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-24 14:34:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-29 16:26:21 +0200 |
| commit | 2a8e7499093cd33a607ebd7c1cd591169aa68a3e (patch) | |
| tree | 104c7f6d28eb170b0d0f0a69abf08da429939792 /include/exec | |
| parent | 6a4e17711442849bf2cc731ccddef5a2a2d92d29 (diff) | |
| download | qemu-2a8e7499093cd33a607ebd7c1cd591169aa68a3e.zip | |
exec: eliminate io_mem_ram
It is never used, the IOTLB always goes through io_mem_notdirty.
In fact in softmmu_template.h, if it were, QEMU would crash just
below the tests, as soon as io_mem_read/write dispatches to
error_mem_read/write.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/cpu-common.h | 1 | ||||
| -rw-r--r-- | include/exec/softmmu_template.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index af5258d414..1686b8f546 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -110,7 +110,6 @@ void stq_phys(hwaddr addr, uint64_t val); void cpu_physical_memory_write_rom(hwaddr addr, const uint8_t *buf, int len); -extern struct MemoryRegion io_mem_ram; extern struct MemoryRegion io_mem_rom; extern struct MemoryRegion io_mem_unassigned; extern struct MemoryRegion io_mem_notdirty; diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index b219191abd..4501dacad1 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -68,7 +68,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, physaddr = (physaddr & TARGET_PAGE_MASK) + addr; env->mem_io_pc = retaddr; - if (mr != &io_mem_ram && mr != &io_mem_rom + if (mr != &io_mem_rom && mr != &io_mem_unassigned && mr != &io_mem_notdirty && !can_do_io(env)) { @@ -218,7 +218,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, MemoryRegion *mr = iotlb_to_region(physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; - if (mr != &io_mem_ram && mr != &io_mem_rom + if (mr != &io_mem_rom && mr != &io_mem_unassigned && mr != &io_mem_notdirty && !can_do_io(env)) { |