From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6I2A-00016j-QJ for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:20:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6I21-0003wv-E1 for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:19:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6I21-0003wN-3X for qemu-devel@nongnu.org; Wed, 21 Sep 2011 04:19:49 -0400 From: Avi Kivity Date: Wed, 21 Sep 2011 11:19:21 +0300 Message-Id: <1316593164-25199-11-git-send-email-avi@redhat.com> In-Reply-To: <1316593164-25199-1-git-send-email-avi@redhat.com> References: <1316593164-25199-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 10/13] omap1: convert to memory API (part V) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Tricky aliases. Acked-by: Peter Maydell Signed-off-by: Avi Kivity --- hw/omap1.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/omap1.c b/hw/omap1.c index df5d68b..f48aa8a 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3708,14 +3708,16 @@ static void omap1_mpu_reset(void *opaque) { 0 } }; -static void omap_setup_dsp_mapping(const struct omap_map_s *map) +static void omap_setup_dsp_mapping(MemoryRegion *system_memory, + const struct omap_map_s *map) { - int io; + MemoryRegion *io; for (; map->phys_dsp; map ++) { - io = cpu_get_physical_page_desc(map->phys_mpu); - - cpu_register_physical_memory(map->phys_dsp, map->size, io); + io = g_new(MemoryRegion, 1); + memory_region_init_alias(io, map->name, + system_memory, map->phys_mpu, map->size); + memory_region_add_subregion(system_memory, map->phys_dsp, io); } } @@ -3978,7 +3980,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, * DSP MMU fffed200 - fffed2ff */ - omap_setup_dsp_mapping(omap15xx_dsp_mm); + omap_setup_dsp_mapping(system_memory, omap15xx_dsp_mm); omap_setup_mpui_io(system_memory, s); qemu_register_reset(omap1_mpu_reset, s); -- 1.7.6.3