From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjsX1-0003DF-KJ for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjsWv-00008c-7K for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:20:31 -0500 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:60306) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjsWu-00008V-Vf for qemu-devel@nongnu.org; Fri, 22 Nov 2013 10:20:25 -0500 Received: by mail-lb0-f182.google.com with SMTP id u14so1039986lbd.41 for ; Fri, 22 Nov 2013 07:20:24 -0800 (PST) Received: from localhost (h59ec325f.selukar.dyn.perspektivbredband.net. [89.236.50.95]) by mx.google.com with ESMTPSA id 8sm38210103laq.5.2013.11.22.07.20.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Nov 2013 07:20:18 -0800 (PST) From: edgar.iglesias@gmail.com Date: Fri, 22 Nov 2013 16:15:53 +0100 Message-Id: <1385133359-13770-3-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1385133359-13770-1-git-send-email-edgar.iglesias@gmail.com> References: <1385133359-13770-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [RFC PATCH 2/8] exec: Make iotlb_to_region input an AS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- cputlb.c | 2 +- exec.c | 4 ++-- include/exec/exec-all.h | 2 +- include/exec/softmmu_template.h | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cputlb.c b/cputlb.c index fff0afb..0399172 100644 --- a/cputlb.c +++ b/cputlb.c @@ -327,7 +327,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) cpu_ldub_code(env1, addr); } pd = env1->iotlb[mmu_idx][page_index] & ~TARGET_PAGE_MASK; - mr = iotlb_to_region(pd); + mr = iotlb_to_region(&address_space_memory, pd); if (memory_region_is_unassigned(mr)) { CPUState *cpu = ENV_GET_CPU(env1); CPUClass *cc = CPU_GET_CLASS(cpu); diff --git a/exec.c b/exec.c index 189c324..5e17110 100644 --- a/exec.c +++ b/exec.c @@ -1618,9 +1618,9 @@ static uint16_t dummy_section(MemoryRegion *mr) return phys_section_add(§ion); } -MemoryRegion *iotlb_to_region(hwaddr index) +MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index) { - return address_space_memory.dispatch->sections[index & ~TARGET_PAGE_MASK].mr; + return as->dispatch->sections[index & ~TARGET_PAGE_MASK].mr; } static void io_mem_init(void) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index b4dfc07..6129365 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -324,7 +324,7 @@ extern uintptr_t tci_tb_ptr; void phys_mem_set_alloc(void *(*alloc)(size_t)); -struct MemoryRegion *iotlb_to_region(hwaddr index); +struct MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index); bool io_mem_read(struct MemoryRegion *mr, hwaddr addr, uint64_t *pvalue, unsigned size); bool io_mem_write(struct MemoryRegion *mr, hwaddr addr, diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index c6a5440..69d856a 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -22,6 +22,7 @@ * License along with this library; if not, see . */ #include "qemu/timer.h" +#include "exec/address-spaces.h" #include "exec/memory.h" #define DATA_SIZE (1 << SHIFT) @@ -118,7 +119,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, uintptr_t retaddr) { uint64_t val; - MemoryRegion *mr = iotlb_to_region(physaddr); + MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; env->mem_io_pc = retaddr; @@ -324,7 +325,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, target_ulong addr, uintptr_t retaddr) { - MemoryRegion *mr = iotlb_to_region(physaddr); + MemoryRegion *mr = iotlb_to_region(&address_space_memory, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { -- 1.7.10.4