From patchwork Sat Apr 4 12:24:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Dirk_M=C3=BCller?= X-Patchwork-Id: 458167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 54DA514012C for ; Sun, 5 Apr 2015 01:03:19 +1100 (AEDT) Received: from localhost ([::1]:33104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeOfN-0002mM-8d for incoming@patchwork.ozlabs.org; Sat, 04 Apr 2015 10:03:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeOf6-000178-37 for qemu-devel@nongnu.org; Sat, 04 Apr 2015 10:03:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeOf1-0001sw-JF for qemu-devel@nongnu.org; Sat, 04 Apr 2015 10:03:00 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:34400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeOf1-0001ss-BW for qemu-devel@nongnu.org; Sat, 04 Apr 2015 10:02:55 -0400 Received: by wgbdm7 with SMTP id dm7so130493370wgb.1 for ; Sat, 04 Apr 2015 07:02:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc :content-type; bh=QmtIfhpxgeFFPqSqOKWLmsHB+MdgZeUqEEVR1DswpY8=; b=cyYVLULN7jZmWNXIqH6cZcMMvOFQkMg1ZuChy62TRU0xfMa/UDeSC5ib8iITXP5x2t Pz5N8JEuH4tsZQfiNdmbBHlOjMcOx/0p0kB2W+vRQmYNtCn4gelUfFD26xhIeugTnhyc oLUjVt0BxNyw+dr2j93+2Gqy6sB9+ZM0XZ0MYi8kEadae8/6CVfvh2H8ViA4bkXoNWf+ CFUI1sr7ZXXAtmCBZB9HiW1lTvmA12k1cxwYfvUmT/Vo32okcrs3distjkuk02T3Ye4n x+sdbCeJyHvYZRzFktdrwYz+GfUrYaifgAXI17doPClumOQHzmZtrTUAvxs25sQSbDBF zDSw== X-Gm-Message-State: ALoCoQlk9/CqXsJaLt2AqXejGMxf5vx09wXjM4yUERL5J2q/cJ5bM1p6FUFZ77K+dXQD8AXWI+BA MIME-Version: 1.0 X-Received: by 10.194.187.16 with SMTP id fo16mr10070312wjc.86.1428150278124; Sat, 04 Apr 2015 05:24:38 -0700 (PDT) Received: by 10.27.175.35 with HTTP; Sat, 4 Apr 2015 05:24:38 -0700 (PDT) Date: Sat, 4 Apr 2015 14:24:38 +0200 Message-ID: From: =?UTF-8?B?RGlyayBNw7xsbGVy?= To: QEMU Developers X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.43 Cc: Peter Maydell Subject: [Qemu-devel] [PATCH v2 for-2.3] arm: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 0b183fc871:"memory: move mem_path handling to memory_region_allocate_system_memory" split memory_region_init_ram and memory_region_init_ram_from_file. Also it moved mem-path handling a step up from memory_region_init_ram to memory_region_allocate_system_memory. Therefore for any board that uses memory_region_init_ram directly, -mem-path is not supported. Fix this by replacing memory_region_init_ram with memory_region_allocate_system_memory. Signed-off-by: Dirk Mueller --- hw/arm/cubieboard.c | 5 ++--- hw/arm/digic_boards.c | 3 +-- hw/arm/highbank.c | 2 +- hw/arm/integratorcp.c | 4 ++-- hw/arm/kzm.c | 3 +-- hw/arm/musicpal.c | 5 ++--- hw/arm/omap1.c | 7 ++++--- hw/arm/omap2.c | 6 +++--- hw/arm/strongarm.c | 7 ++++--- hw/arm/versatilepb.c | 5 ++--- hw/arm/vexpress.c | 10 ++++------ hw/arm/virt.c | 5 ++--- hw/arm/xilinx_zynq.c | 5 ++--- 13 files changed, 30 insertions(+), 37 deletions(-) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index d1e53be..1582250 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -63,9 +63,8 @@ static void cubieboard_init(MachineState *machine) exit(1); } - memory_region_init_ram(&s->sdram, NULL, "cubieboard.ram", - machine->ram_size, &error_abort); - vmstate_register_ram_global(&s->sdram); + memory_region_allocate_system_memory(&s->sdram, NULL, "cubieboard.ram", + machine->ram_size); memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE, &s->sdram); diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index e576646..f8ba9e5 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -51,9 +51,8 @@ typedef struct DigicBoard { static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) { - memory_region_init_ram(&s->ram, NULL, "ram", ram_size, &error_abort); + memory_region_allocate_system_memory(&s->ram, NULL, "ram", ram_size); memory_region_add_subregion(get_system_memory(), 0, &s->ram); - vmstate_register_ram_global(&s->ram); } static void digic4_board_init(DigicBoard *board) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 07cb4e0..dd2a67b 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -267,7 +267,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) sysmem = get_system_memory(); dram = g_new(MemoryRegion, 1); - memory_region_init_ram(dram, NULL, "highbank.dram", ram_size, &error_abort); + memory_region_allocate_system_memory(dram, NULL, "highbank.dram", ram_size); /* SDRAM at address zero. */ memory_region_add_subregion(sysmem, 0, dram); diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index cb609cd..0fbbf99 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -567,8 +567,8 @@ static void integratorcp_init(MachineState *machine) cpu = ARM_CPU(cpuobj); - memory_region_init_ram(ram, NULL, "integrator.ram", ram_size, &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "integrator.ram", + ram_size); /* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero*/ diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 94ceab6..5be0369 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -97,8 +97,7 @@ static void kzm_init(MachineState *machine) /* On a real system, the first 16k is a `secure boot rom' */ - memory_region_init_ram(ram, NULL, "kzm.ram", ram_size, &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "kzm.ram", ram_size); memory_region_add_subregion(address_space_mem, KZM_RAMADDRESS, ram); memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size); diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 3712de6..a3b1314 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1600,9 +1600,8 @@ static void musicpal_init(MachineState *machine) } /* For now we use a fixed - the original - RAM size */ - memory_region_init_ram(ram, NULL, "musicpal.ram", MP_RAM_DEFAULT_SIZE, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "musicpal.ram", + MP_RAM_DEFAULT_SIZE); memory_region_add_subregion(address_space_mem, 0, ram); memory_region_init_ram(sram, NULL, "musicpal.sram", MP_SRAM_SIZE, diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 0615044..91ffb58 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -16,6 +16,8 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, see . */ + +#include "hw/boards.h" #include "hw/hw.h" #include "hw/arm/arm.h" #include "hw/arm/omap.h" @@ -3878,9 +3880,8 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory, omap_clk_init(s); /* Memory-mapped stuff */ - memory_region_init_ram(&s->emiff_ram, NULL, "omap1.dram", s->sdram_size, - &error_abort); - vmstate_register_ram_global(&s->emiff_ram); + memory_region_allocate_system_memory(&s->emiff_ram, NULL, "omap1.dram", + s->sdram_size); memory_region_add_subregion(system_memory, OMAP_EMIFF_BASE, &s->emiff_ram); memory_region_init_ram(&s->imif_ram, NULL, "omap1.sram", s->sram_size, &error_abort); diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 3239014..e39b317 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -20,6 +20,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "hw/boards.h" #include "hw/hw.h" #include "hw/arm/arm.h" #include "hw/arm/omap.h" @@ -2271,9 +2272,8 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem, omap_clk_init(s); /* Memory-mapped stuff */ - memory_region_init_ram(&s->sdram, NULL, "omap2.dram", s->sdram_size, - &error_abort); - vmstate_register_ram_global(&s->sdram); + memory_region_allocate_system_memory(&s->sdram, NULL, "omap2.dram", + s->sdram_size); memory_region_add_subregion(sysmem, OMAP2_Q2_BASE, &s->sdram); memory_region_init_ram(&s->sram, NULL, "omap2.sram", s->sram_size, &error_abort); diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 3206345..1ddea6d 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -26,6 +26,8 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ + +#include "hw/boards.h" #include "hw/sysbus.h" #include "strongarm.h" #include "qemu/error-report.h" @@ -1604,9 +1606,8 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, exit(1); } - memory_region_init_ram(&s->sdram, NULL, "strongarm.sdram", sdram_size, - &error_abort); - vmstate_register_ram_global(&s->sdram); + memory_region_allocate_system_memory(&s->sdram, NULL, "strongarm.sdram", + sdram_size); memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index 624fdb0..6c69f4e 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -226,9 +226,8 @@ static void versatile_init(MachineState *machine, int board_id) cpu = ARM_CPU(cpuobj); - memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "versatile.ram", + machine->ram_size); /* ??? RAM should repeat to fill physical memory space. */ /* SDRAM at address zero. */ memory_region_add_subregion(sysmem, 0, ram); diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 54dd967..3989bc5 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -276,9 +276,8 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, exit(1); } - memory_region_init_ram(ram, NULL, "vexpress.highmem", ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", + ram_size); low_ram_size = ram_size; if (low_ram_size > 0x4000000) { low_ram_size = 0x4000000; @@ -371,9 +370,8 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, } } - memory_region_init_ram(ram, NULL, "vexpress.highmem", ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", + ram_size); /* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ memory_region_add_subregion(sysmem, 0x80000000, ram); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index febff22..565f573 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -805,9 +805,8 @@ static void machvirt_init(MachineState *machine) fdt_add_cpu_nodes(vbi); fdt_add_psci_node(vbi); - memory_region_init_ram(ram, NULL, "mach-virt.ram", machine->ram_size, - &error_abort); - vmstate_register_ram_global(ram); + memory_region_allocate_system_memory(ram, NULL, "mach-virt.ram", + machine->ram_size); memory_region_add_subregion(sysmem, vbi->memmap[VIRT_MEM].base, ram); create_flash(vbi); diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 5c37521..a4e7b5c 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -161,9 +161,8 @@ static void zynq_init(MachineState *machine) } /* DDR remapped to address zero. */ - memory_region_init_ram(ext_ram, NULL, "zynq.ext_ram", ram_size, - &error_abort); - vmstate_register_ram_global(ext_ram); + memory_region_allocate_system_memory(ext_ram, NULL, "zynq.ext_ram", + ram_size); memory_region_add_subregion(address_space_mem, 0, ext_ram); /* 256K of on-chip memory */