From patchwork Mon Dec 16 08:05:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 301498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2ACA12C0085 for ; Mon, 16 Dec 2013 19:08:54 +1100 (EST) Received: from localhost ([::1]:54347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsTEQ-0002ja-V4 for incoming@patchwork.ozlabs.org; Mon, 16 Dec 2013 03:08:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsTDe-000272-5m for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:08:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsTDZ-00031k-8r for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:08:02 -0500 Received: from mail-pb0-x236.google.com ([2607:f8b0:400e:c01::236]:62406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsTDZ-00031e-0a for qemu-devel@nongnu.org; Mon, 16 Dec 2013 03:07:57 -0500 Received: by mail-pb0-f54.google.com with SMTP id un15so5171574pbc.13 for ; Mon, 16 Dec 2013 00:07:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BGj2SIq6p5zoexnIcn24rLmdB6un3WvIel/FNIYWulI=; b=cENTEt4JyaFgJnbg+LLUImnN6/nk/21s5epj3/Qt3fUrPPHIzM87D6ECuwPzr5GbdC +6PGENP+Ta4P9kqrueAsEx7XLtAghGdFrR2qJI0VNLOjqrKCKZDuK9eWu/vX9isIGPF8 60kJMlmtWUca5O63ot9UoyhYMlny90WK1HNGGuqqQbFARzQDVu8qrGMZxoflIw3LrDap /r+DL3HJBBetl0kj7tbckfc4HDDmDE7gI74kQmZzpGRWvFxNNWoWZxpsSbAy6mIJ9IaE lyn1HXgmhPRDF6YMYnH9RHFXfZsMdQrGyJxAwxu8vAKxScTAF3tK17lagu5T2e8Lldp4 kGZQ== X-Received: by 10.68.209.133 with SMTP id mm5mr18413370pbc.157.1387181276197; Mon, 16 Dec 2013 00:07:56 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id ef10sm33299089pac.1.2013.12.16.00.07.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 00:07:55 -0800 (PST) From: edgar.iglesias@gmail.com To: qemu-devel@nongnu.org Date: Mon, 16 Dec 2013 18:05:50 +1000 Message-Id: <1387181170-23267-3-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1387181170-23267-1-git-send-email-edgar.iglesias@gmail.com> References: <1387181170-23267-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::236 Cc: peter.maydell@linaro.org, blauwirbel@gmail.com, aliguori@amazon.com, pcrost@xilinx.com, pbonzini@redhat.com, afaerber@suse.de, aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v1 02/22] exec: Make iotlb_to_region input an AS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- cputlb.c | 2 +- exec.c | 5 ++--- include/exec/exec-all.h | 2 +- include/exec/softmmu_template.h | 5 +++-- 4 files changed, 7 insertions(+), 7 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 7ed34e2..c34f642 100644 --- a/exec.c +++ b/exec.c @@ -1726,10 +1726,9 @@ static uint16_t dummy_section(PhysPageMap *map, MemoryRegion *mr) return phys_section_add(map, §ion); } -MemoryRegion *iotlb_to_region(hwaddr index) +MemoryRegion *iotlb_to_region(AddressSpace *as, hwaddr index) { - return address_space_memory.dispatch->map.sections[ - index & ~TARGET_PAGE_MASK].mr; + return as->dispatch->map.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)) {