From patchwork Wed Dec 3 20:06:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 41871 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 06A1D25E88 for ; Wed, 3 Dec 2014 20:11:40 +0000 (UTC) Received: by mail-lb0-f200.google.com with SMTP id f15sf10177584lbj.11 for ; Wed, 03 Dec 2014 12:11:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=Op2lpXRIZYUy7XRPAybsfXAEvIJwxa0I0DgB/rvmXTU=; b=AgznZ9daoWea4Jv4UVueDmfvZ2+iE6VpAIcG8aBcrFih79Wxma58GujVRPPIC8XaQw G8NT0Ubiq/nu18CUXrnRSWeuEiGz6V4wWHVzZlau/td9iN6fY4qylIfIkDvV4S0v+lcv 94XhrMbB8XhUq3WwbX5xiW14XoKcH0X6NyRuU3h0skn/HTKg4vnmQI3tZj2dqOkOlpPs 4W4nWVpj0fE4QiqSHuIShSVWWSkRtkGs6Pgbx+s5GXW1iX6xyrwRz3jkNHcSuQ0+pOyO 87KMXMKgipcki26bksFYOGlRO9kAo/Qgmu0OoA1YzpkZ2fTMMUv3psAW/i1O6Q4iL1qW SgMg== X-Gm-Message-State: ALoCoQnO1Rd1Stf3y1FH0+UjL5K7kmObfFn9+NO1iOm8Y+jCJRvGdhUkIV4gAaygRP024yjcIwml X-Received: by 10.181.13.147 with SMTP id ey19mr16744121wid.2.1417637498941; Wed, 03 Dec 2014 12:11:38 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.71 with SMTP id k7ls189934laf.104.gmail; Wed, 03 Dec 2014 12:11:38 -0800 (PST) X-Received: by 10.112.202.71 with SMTP id kg7mr5930119lbc.16.1417637498643; Wed, 03 Dec 2014 12:11:38 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id s8si5330602laa.59.2014.12.03.12.11.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:11:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id ge10so8452775lab.2 for ; Wed, 03 Dec 2014 12:11:38 -0800 (PST) X-Received: by 10.112.38.4 with SMTP id c4mr6007891lbk.46.1417637498569; Wed, 03 Dec 2014 12:11:38 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp731284lbc; Wed, 3 Dec 2014 12:11:38 -0800 (PST) X-Received: by 10.180.82.170 with SMTP id j10mr105205553wiy.35.1417637497893; Wed, 03 Dec 2014 12:11:37 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id vj4si41584655wjc.21.2014.12.03.12.11.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:11:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:43180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGGu-0005p9-MW for patch@linaro.org; Wed, 03 Dec 2014 15:11:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBw-0006md-NC for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGBq-0003Vq-Mm for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:28 -0500 Received: from mail-ob0-f173.google.com ([209.85.214.173]:45627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBq-0003V5-IE for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:22 -0500 Received: by mail-ob0-f173.google.com with SMTP id uy5so12111912obc.18 for ; Wed, 03 Dec 2014 12:06:22 -0800 (PST) X-Received: by 10.182.60.162 with SMTP id i2mr4430015obr.20.1417637182236; Wed, 03 Dec 2014 12:06:22 -0800 (PST) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id mq4sm11787321obb.22.2014.12.03.12.06.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:06:21 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, serge.fdrv@gmail.com, edgar.iglesias@gmail.com, aggelerf@ethz.ch, peter.maydell@linaro.org Date: Wed, 3 Dec 2014 14:06:00 -0600 Message-Id: <1417637167-20640-7-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1417637167-20640-1-git-send-email-greg.bellows@linaro.org> References: <1417637167-20640-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.214.173 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH 06/13] target-arm: Change vexpress daughterboard init arg 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Change the Vexpress daughterboard initialization method to take a vexpress machine state pointer instead of the daughterboard struct pointer. The machine state now contains the daughterboard pointer. Signed-off-by: Greg Bellows --- hw/arm/vexpress.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 6dc5d3b..4a345d8 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -177,7 +177,7 @@ typedef struct { #define VEXPRESS_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(VexpressMachineClass, klass, TYPE_VEXPRESS_MACHINE) -typedef void DBoardInitFn(const VEDBoardInfo *daughterboard, +typedef void DBoardInitFn(const VexpressMachineState *machine, ram_addr_t ram_size, const char *cpu_model, qemu_irq *pic); @@ -252,7 +252,7 @@ static void init_cpus(const char *cpu_model, const char *privdev, } } -static void a9_daughterboard_init(const VEDBoardInfo *daughterboard, +static void a9_daughterboard_init(const VexpressMachineState *vms, ram_addr_t ram_size, const char *cpu_model, qemu_irq *pic) @@ -342,7 +342,7 @@ static VEDBoardInfo a9_daughterboard = { .init = a9_daughterboard_init, }; -static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, +static void a15_daughterboard_init(const VexpressMachineState *vms, ram_addr_t ram_size, const char *cpu_model, qemu_irq *pic) @@ -535,6 +535,7 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name, static void vexpress_common_init(MachineState *machine) { + VexpressMachineState *vms = VEXPRESS_MACHINE(machine); VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine); VEDBoardInfo *daughterboard = vmc->daughterboard;; DeviceState *dev, *sysctl, *pl041; @@ -551,8 +552,7 @@ static void vexpress_common_init(MachineState *machine) const hwaddr *map = daughterboard->motherboard_map; int i; - daughterboard->init(daughterboard, machine->ram_size, machine->cpu_model, - pic); + daughterboard->init(vms, machine->ram_size, machine->cpu_model, pic); /* * If a bios file was provided, attempt to map it into memory