From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <4E75ED81.9050902@web.de> Date: Sun, 18 Sep 2011 15:09:21 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4E75EA08.4090809@web.de> In-Reply-To: <4E75EA08.4090809@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] memory: Eliminate region offset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Blue Swirl , qemu-devel , Richard Henderson 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). -- 1.7.3.4