From patchwork Thu Dec 11 23:29:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 42169 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0DC1F26666 for ; Thu, 11 Dec 2014 23:36:38 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gq15sf4210647lab.3 for ; Thu, 11 Dec 2014 15:36:37 -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=O4cNq4+IqD1yWDLZS/3acCc41UHrDWI9BCqcwbwZhWo=; b=MvoDcQI8jaJiNptvg1IM5WKqSBoMQ5Y3bPAruoNDtoe9beJTNZAytQ/sya2ePueiS7 Uu3EIVUsSzARoNk0RMwU/Rb3F5sLGgej/7C/KUobzPrlX4iE9q9A6iAuiejIGkMp+m2P xhHus7OKhEe1tKZqZ33hFagAerH2/k+GNVw7nwqqNKyZ6/E0MvtvYh+iPgoyXHmMHSjt ufAQTfHo3BOAFSUALibvkzD6dQ2iIyxJDBLImBdxiDL1039Y3lNPt7k+JKUkatvnNBBP NJ5ZNUUZv+chTM2+S/nLYxO2gNS4EWqEnJlFWICSkVw/InmrQmYTFY1StpHYXyuwc5R0 IDeA== X-Gm-Message-State: ALoCoQnvQeo4xISGNvTT66T94ZbpT+AZkyboxIDnSqR2jZ+OheNW6bTuFIDdd1qZptT2sX9Spssf X-Received: by 10.112.169.101 with SMTP id ad5mr2083601lbc.1.1418340997060; Thu, 11 Dec 2014 15:36:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.167 with SMTP id g7ls169362lae.62.gmail; Thu, 11 Dec 2014 15:36:36 -0800 (PST) X-Received: by 10.112.138.137 with SMTP id qq9mr12423849lbb.80.1418340996828; Thu, 11 Dec 2014 15:36:36 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id ay17si2683214lab.132.2014.12.11.15.36.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:36:36 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id gd6so5253911lab.29 for ; Thu, 11 Dec 2014 15:36:36 -0800 (PST) X-Received: by 10.112.162.106 with SMTP id xz10mr12508648lbb.91.1418340996705; Thu, 11 Dec 2014 15:36:36 -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.142.69 with SMTP id ru5csp687162lbb; Thu, 11 Dec 2014 15:36:36 -0800 (PST) X-Received: by 10.140.46.52 with SMTP id j49mr23958550qga.30.1418340995446; Thu, 11 Dec 2014 15:36:35 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n16si3255784qar.14.2014.12.11.15.36.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:36:35 -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]:54690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDHe-0006Jh-Lc for patch@linaro.org; Thu, 11 Dec 2014 18:36:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDBD-0003tb-KG for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzDB5-0000iZ-H5 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:55 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:35626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzDB5-0000iS-Bq for qemu-devel@nongnu.org; Thu, 11 Dec 2014 18:29:47 -0500 Received: by mail-pd0-f172.google.com with SMTP id y13so5915225pdi.31 for ; Thu, 11 Dec 2014 15:29:46 -0800 (PST) X-Received: by 10.66.182.130 with SMTP id ee2mr21733577pac.22.1418340585793; Thu, 11 Dec 2014 15:29:45 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id ip1sm2362908pbc.0.2014.12.11.15.29.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 15:29:45 -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: Thu, 11 Dec 2014 17:29:17 -0600 Message-Id: <1418340569-30519-4-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1418340569-30519-1-git-send-email-greg.bellows@linaro.org> References: <1418340569-30519-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.192.172 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v2 03/15] target-arm: Switch to common vexpress machine init 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.42 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 Switched the Vexpress machine initialization to use the common function with the machine pointer to board info. Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- hw/arm/vexpress.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 8f22696..a03cb52 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -532,9 +532,10 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name, return OBJECT_CHECK(pflash_t, (dev), "cfi.pflash01"); } -static void vexpress_common_init(VEDBoardInfo *daughterboard, - MachineState *machine) +static void vexpress_common_init(MachineState *machine) { + VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine); + VEDBoardInfo *daughterboard = vmc->daughterboard;; DeviceState *dev, *sysctl, *pl041; qemu_irq pic[64]; uint32_t sys_id; @@ -700,30 +701,13 @@ static void vexpress_common_init(VEDBoardInfo *daughterboard, arm_load_kernel(ARM_CPU(first_cpu), &daughterboard->bootinfo); } -static void vexpress_init(MachineState *machine) -{ - VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine); - - vexpress_common_init(vmc->daughterboard, machine); -} - -static void vexpress_a9_init(MachineState *machine) -{ - vexpress_common_init(&a9_daughterboard, machine); -} - -static void vexpress_a15_init(MachineState *machine) -{ - vexpress_common_init(&a15_daughterboard, machine); -} - static void vexpress_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); mc->name = TYPE_VEXPRESS_MACHINE; mc->desc = "ARM Versatile Express"; - mc->init = vexpress_init; + mc->init = vexpress_common_init; mc->block_default_type = IF_SCSI; mc->max_cpus = 4; } @@ -735,7 +719,6 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data) mc->name = TYPE_VEXPRESS_A9_MACHINE; mc->desc = "ARM Versatile Express for Cortex-A9"; - mc->init = vexpress_a9_init; vmc->daughterboard = &a9_daughterboard;; } @@ -747,7 +730,6 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) mc->name = TYPE_VEXPRESS_A15_MACHINE; mc->desc = "ARM Versatile Express for Cortex-A15"; - mc->init = vexpress_a15_init; vmc->daughterboard = &a15_daughterboard; }