From patchwork Tue Jul 23 09:33:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mian M. Hamayun" X-Patchwork-Id: 261007 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 769332C00AD for ; Tue, 23 Jul 2013 19:34:33 +1000 (EST) Received: from localhost ([::1]:36400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1YzG-00089P-QG for incoming@patchwork.ozlabs.org; Tue, 23 Jul 2013 05:34:30 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Pw8Q3mQXjLket5o6ySGGhRB5EPSKCAYyrvdNn+2qpZU=; b=nbo6RHDIEXXx+LQq0GT/Eb/hxdUIDfARDi9PT8zrdeMMN7C4M6FqeJmqmsheLERNA6 yVvsNSnHe+/A4YsRHZUQXcC2y9qTPenoJ7qDfIRTQ89ZaQh/kDPRDxYZ1amhvEw7yE+h 2adGn0kDyuCeupFLo9yKONurI6YP5xxUdKGH4rZTq+d4CeGN38LwwP46b1VjSNLhFD4x pSyFRHGST65Zn7b1PunuQwEe91y7t9dTPw8PvFW9qbm/m14tWXMAEnkpwQPDZ2m7Zlzt qhluVs+qjUPODBFqlfDmETn61DkXTLYQNDGFJWAqAyV66WN64odQUlS6v+D+4Ei4U91/ ZSlQ== X-Received: by 10.194.219.198 with SMTP id pq6mr22480080wjc.58.1374572017644; Tue, 23 Jul 2013 02:33:37 -0700 (PDT) Received: from localhost.localdomain (68.107.73.86.rev.sfr.net. [86.73.107.68]) by mx.google.com with ESMTPSA id f8sm2158705wiv.0.2013.07.23.02.33.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Jul 2013 02:33:36 -0700 (PDT) From: "Mian M. Hamayun" To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2013 11:33:11 +0200 Message-Id: <1374571996-9228-3-git-send-email-m.hamayun@virtualopensystems.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374571996-9228-1-git-send-email-m.hamayun@virtualopensystems.com> References: <1374571996-9228-1-git-send-email-m.hamayun@virtualopensystems.com> X-Gm-Message-State: ALoCoQnIb4sfsn/UW8Su/J6NAfwC5bJ1aSxlumGEVurjIsI0GzmnuJEEnBmaJR52HFc3FX/+UH+o X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.176 Cc: peter.maydell@linaro.org, tech@virtualopensystems.com, kvmarm@lists.cs.columbia.edu Subject: [Qemu-devel] [PATCH v2 2/7] Add the additional parent parameter to memory region init calls 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 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,