From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQs-0005J8-2G for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwAQk-0006EZ-Mj for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwAQj-0006Dd-Ss for qemu-devel@nongnu.org; Wed, 24 Aug 2011 06:11:30 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7OABT5e023463 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Aug 2011 06:11:29 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7OABSq8015196 for ; Wed, 24 Aug 2011 06:11:28 -0400 From: Avi Kivity Date: Wed, 24 Aug 2011 13:11:11 +0300 Message-Id: <1314180683-8227-13-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 12/24] leon3: 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/leon3.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/leon3.c b/hw/leon3.c index efe6c7c..5c3780d 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -21,6 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +#include + #include "hw.h" #include "qemu-timer.h" #include "qemu-char.h" @@ -102,7 +105,8 @@ static void leon3_generic_hw_init(MemoryRegion *address_space_mem, const char *cpu_model) { CPUState *env; - ram_addr_t ram_offset, prom_offset; + MemoryRegion *ram = g_new(MemoryRegion, 1); + MemoryRegion *prom = g_new(MemoryRegion, 1); int ret; char *filename; qemu_irq *cpu_irqs = NULL; @@ -141,14 +145,14 @@ static void leon3_generic_hw_init(MemoryRegion *address_space_mem, exit(1); } - ram_offset = qemu_ram_alloc(NULL, "leon3.ram", ram_size); - cpu_register_physical_memory(0x40000000, ram_size, ram_offset | IO_MEM_RAM); + memory_region_init_ram(ram, NULL, "leon3.ram", ram_size); + memory_region_add_subregion(address_space_mem, 0x40000000, ram); /* Allocate BIOS */ prom_size = 8 * 1024 * 1024; /* 8Mb */ - prom_offset = qemu_ram_alloc(NULL, "Leon3.bios", prom_size); - cpu_register_physical_memory(0x00000000, prom_size, - prom_offset | IO_MEM_ROM); + memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size); + memory_region_set_readonly(prom, true); + memory_region_add_subregion(address_space_mem, 0x00000000, prom); /* Load boot prom */ if (bios_name == NULL) { -- 1.7.5.3