From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQu-0005N2-0m for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwAQm-0006Ga-Sr for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQl-0006F8-Ln for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:32 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7OABUBx006104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Aug 2011 06:11:30 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p7OABTK7015172 for ; Wed, 24 Aug 2011 06:11:30 -0400 From: Avi Kivity Date: Wed, 24 Aug 2011 13:11:18 +0300 Message-Id: <1314180683-8227-20-git-send-email-avi@redhat.com> In-Reply-To: <1314180683-8227-1-git-send-email-avi@redhat.com> References: <1314180683-8227-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 19/24] lm32_boards: convert to memory API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Avi Kivity --- hw/lm32_boards.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c index 3c6b5af..0a9ad59 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32_boards.c @@ -79,7 +79,7 @@ static void lm32_evr_init(MemoryRegion *address_space_mem, { CPUState *env; DriveInfo *dinfo; - ram_addr_t phys_ram; + MemoryRegion *phys_ram = g_new(MemoryRegion, 1); MemoryRegion *phys_flash = g_new(MemoryRegion, 1); qemu_irq *cpu_irq, irq[32]; ResetInfo *reset_info; @@ -108,8 +108,8 @@ static void lm32_evr_init(MemoryRegion *address_space_mem, reset_info->flash_base = flash_base; - phys_ram = qemu_ram_alloc(NULL, "lm32_evr.sdram", ram_size); - cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM); + memory_region_init_ram(phys_ram, NULL, "lm32_evr.sdram", ram_size); + memory_region_add_subregion(address_space_mem, ram_base, phys_ram); memory_region_init_rom_device(phys_flash, &pflash_cfi02_ops_be, NULL, "lm32_evr.flash", flash_size); @@ -170,7 +170,7 @@ static void lm32_uclinux_init(MemoryRegion *address_space_mem, { CPUState *env; DriveInfo *dinfo; - ram_addr_t phys_ram; + MemoryRegion *phys_ram = g_new(MemoryRegion, 1); MemoryRegion *phys_flash = g_new(MemoryRegion, 1); qemu_irq *cpu_irq, irq[32]; HWSetup *hw; @@ -206,8 +206,8 @@ static void lm32_uclinux_init(MemoryRegion *address_space_mem, reset_info->flash_base = flash_base; - phys_ram = qemu_ram_alloc(NULL, "lm32_uclinux.sdram", ram_size); - cpu_register_physical_memory(ram_base, ram_size, phys_ram | IO_MEM_RAM); + memory_region_init_ram(phys_ram, NULL, "lm32_uclinux.sdram", ram_size); + memory_region_add_subregion(address_space_mem, ram_base, phys_ram); memory_region_init_rom_device(phys_flash, &pflash_cfi01_ops_be, NULL, "lm32_uclinux.flash", flash_size); -- 1.7.5.3