From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH 16/23] memory: temporarily add memory_region_get_ram_addr() Date: Mon, 19 Dec 2011 16:13:37 +0200 Message-ID: <1324304024-11220-17-git-send-email-avi@redhat.com> References: <1324304024-11220-1-git-send-email-avi@redhat.com> Cc: xen-devel@lists.xensource.com, kvm@vger.kernel.org To: Stefano Stabellini , qemu-devel@nongnu.org, "Michael S. Tsirkin" Return-path: Received: from mx1.redhat.com ([209.132.183.28]:32614 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752746Ab1LSOOI (ORCPT ); Mon, 19 Dec 2011 09:14:08 -0500 In-Reply-To: <1324304024-11220-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This is a layering violation, but needed while the code contains naked calls to qemu_get_ram_ptr() and the like. Signed-off-by: Avi Kivity --- memory.c | 6 ++++++ memory.h | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/memory.c b/memory.c index 2dcbf80..41a106a 100644 --- a/memory.c +++ b/memory.c @@ -1376,6 +1376,12 @@ void memory_region_del_subregion(MemoryRegion *mr, memory_region_update_topology(); } +ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr) +{ + assert(mr->backend_registered); + return mr->ram_addr; +} + static int cmp_flatrange_addr(const void *_addr, const void *_fr) { const AddrRange *addr = _addr; diff --git a/memory.h b/memory.h index b7d39ed..1e44d86 100644 --- a/memory.h +++ b/memory.h @@ -557,6 +557,16 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr, target_phys_addr_t offset, MemoryRegion *subregion, unsigned priority); + +/** + * memory_region_get_ram_addr: Get the ram address associated with a memory + * region + * + * DO NOT USE THIS FUCNTION. This is a temporary workaround while the Xen + * code is being reworked. + */ +ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr); + /** * memory_region_del_subregion: Remove a subregion. * -- 1.7.7.1