From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1YyZ-0007yk-Qw for qemu-devel@nongnu.org; Tue, 23 Jul 2013 05:33:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1YyQ-0000jF-Gk for qemu-devel@nongnu.org; Tue, 23 Jul 2013 05:33:47 -0400 Received: from mail-we0-f176.google.com ([74.125.82.176]:32925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1YyQ-0000iy-9y for qemu-devel@nongnu.org; Tue, 23 Jul 2013 05:33:38 -0400 Received: by mail-we0-f176.google.com with SMTP id q56so681034wes.21 for ; Tue, 23 Jul 2013 02:33:37 -0700 (PDT) From: "Mian M. Hamayun" Date: Tue, 23 Jul 2013 11:33:11 +0200 Message-Id: <1374571996-9228-3-git-send-email-m.hamayun@virtualopensystems.com> In-Reply-To: <1374571996-9228-1-git-send-email-m.hamayun@virtualopensystems.com> References: <1374571996-9228-1-git-send-email-m.hamayun@virtualopensystems.com> Subject: [Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, tech@virtualopensystems.com, kvmarm@lists.cs.columbia.edu From: "Mian M. Hamayun" The memory region init calls require an additional parent parameter, so introduce a null parent parameter to make it happy. Signed-off-by: Mian M. Hamayun --- hw/arm/virt.c | 2 +- hw/cpu/a57mpcore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 97712d7..8a2bdc7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -407,7 +407,7 @@ static void machvirt_init(QEMUMachineInitArgs *args) } fdt_add_cpu_nodes(virt_fdt, mi, smp_cpus); - memory_region_init_ram(ram, "mach-virt.ram", ram_size); + memory_region_init_ram(ram, NULL, "mach-virt.ram", ram_size); vmstate_register_ram_global(ram); memory_region_add_subregion(sysmem, mi->mem_base, ram); diff --git a/hw/cpu/a57mpcore.c b/hw/cpu/a57mpcore.c index 2923a2a..1ab6dc0 100644 --- a/hw/cpu/a57mpcore.c +++ b/hw/cpu/a57mpcore.c @@ -70,7 +70,7 @@ static int a57mp_priv_init(SysBusDevice *dev) * 0x5000-0x5fff -- GIC virtual interface control (not modelled) * 0x6000-0x7fff -- GIC virtual CPU interface (not modelled) */ - memory_region_init(&s->container, "a57mp-priv-container", 0x8000); + memory_region_init(&s->container, NULL, "a57mp-priv-container", 0x8000); memory_region_add_subregion(&s->container, 0x1000, sysbus_mmio_get_region(busdev, 0)); memory_region_add_subregion(&s->container, 0x2000, -- 1.7.9.5