From patchwork Sun Sep 18 13:09:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 115239 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E93ADB6FA0 for ; Sun, 18 Sep 2011 23:09:36 +1000 (EST) Received: from localhost ([::1]:49831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5H7h-0004yl-Nm for incoming@patchwork.ozlabs.org; Sun, 18 Sep 2011 09:09:29 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5H7d-0004yb-5C for qemu-devel@nongnu.org; Sun, 18 Sep 2011 09:09:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5H7b-0002dc-PE for qemu-devel@nongnu.org; Sun, 18 Sep 2011 09:09:25 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:59072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5H7b-0002dX-DO for qemu-devel@nongnu.org; Sun, 18 Sep 2011 09:09:23 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate03.web.de (Postfix) with ESMTP id 77642199FBF28; Sun, 18 Sep 2011 15:09:22 +0200 (CEST) Received: from [88.65.36.224] (helo=mchn199C.mchp.siemens.de) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1R5H7a-0004dR-00; Sun, 18 Sep 2011 15:09:22 +0200 Message-ID: <4E75ED81.9050902@web.de> Date: Sun, 18 Sep 2011 15:09:21 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity References: <4E75EA08.4090809@web.de> In-Reply-To: <4E75EA08.4090809@web.de> X-Enigmail-Version: 1.3.1 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX199geycpYFQ33968MC1221mZFrS7pIRudt2STz8 50GQExbR7TCdUEa6uxvbu0Swl0StlzqfV54X32RFqwQrq8KZ4p pHXqEMB54= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.234 Cc: Blue Swirl , qemu-devel , Richard Henderson Subject: [Qemu-devel] [PATCH] memory: Eliminate region offset 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: Jan Kiszka Before anything makes use of this legacy mechanism again, remove it. This will enforce proper conversion of device models while they are ported over the memory API. Signed-off-by: Jan Kiszka --- memory.c | 14 ++++---------- memory.h | 9 --------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/memory.c b/memory.c index 51f0297..4dd63cc 100644 --- a/memory.c +++ b/memory.c @@ -405,7 +405,7 @@ static void memory_region_iorange_read(IORange *iorange, return; } *data = 0; - access_with_adjusted_size(offset + mr->offset, data, width, + access_with_adjusted_size(offset, data, width, mr->ops->impl.min_access_size, mr->ops->impl.max_access_size, memory_region_read_accessor, mr); @@ -431,7 +431,7 @@ static void memory_region_iorange_write(IORange *iorange, } return; } - access_with_adjusted_size(offset + mr->offset, &data, width, + access_with_adjusted_size(offset, &data, width, mr->ops->impl.min_access_size, mr->ops->impl.max_access_size, memory_region_write_accessor, mr); @@ -778,7 +778,6 @@ void memory_region_init(MemoryRegion *mr, mr->parent = NULL; mr->size = size; mr->addr = 0; - mr->offset = 0; mr->terminates = false; mr->readable = true; mr->destructor = memory_region_destructor_none; @@ -830,7 +829,7 @@ static uint32_t memory_region_read_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - access_with_adjusted_size(addr + mr->offset, &data, size, + access_with_adjusted_size(addr, &data, size, mr->ops->impl.min_access_size, mr->ops->impl.max_access_size, memory_region_read_accessor, mr); @@ -855,7 +854,7 @@ static void memory_region_write_thunk_n(void *_mr, } /* FIXME: support unaligned access */ - access_with_adjusted_size(addr + mr->offset, &data, size, + access_with_adjusted_size(addr, &data, size, mr->ops->impl.min_access_size, mr->ops->impl.max_access_size, memory_region_write_accessor, mr); @@ -1004,11 +1003,6 @@ uint64_t memory_region_size(MemoryRegion *mr) return mr->size; } -void memory_region_set_offset(MemoryRegion *mr, target_phys_addr_t offset) -{ - mr->offset = offset; -} - void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client) { uint8_t mask = 1 << client; diff --git a/memory.h b/memory.h index 06b83ae..b07cd55 100644 --- a/memory.h +++ b/memory.h @@ -107,7 +107,6 @@ struct MemoryRegion { MemoryRegion *parent; uint64_t size; target_phys_addr_t addr; - target_phys_addr_t offset; bool backend_registered; void (*destructor)(MemoryRegion *mr); ram_addr_t ram_addr; @@ -268,14 +267,6 @@ uint64_t memory_region_size(MemoryRegion *mr); void *memory_region_get_ram_ptr(MemoryRegion *mr); /** - * memory_region_set_offset: Sets an offset to be added to MemoryRegionOps - * callbacks. - * - * This function is deprecated and should not be used in new code. - */ -void memory_region_set_offset(MemoryRegion *mr, target_phys_addr_t offset); - -/** * memory_region_set_log: Turn dirty logging on or off for a region. * * Turns dirty logging on or off for a specified client (display, migration).