From patchwork Wed Dec 3 20:05:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 41865 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E3F7025E88 for ; Wed, 3 Dec 2014 20:07:44 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf10015237wgg.3 for ; Wed, 03 Dec 2014 12:07:44 -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=+XwuTPexOB3YEoPbIBY338MqEglyk0y6q5Tup88PNls=; b=kMZP7sHhQMdPSJ4TaiC7LPQK/BzL+JmN0D6YxHhwieTPHBX8FeDejYLhoXJcza+BUz gqh1+ylYb6KxqCawFhtaBFHSPuJuX4+6AWHGLmi6CorUbR3KgoUlM4KHTf6kZMSMlfU9 +XbNGfpj9TaCWn096AjaKJCvfmvxOHytQpRzr1o6JFa29TjDr0EVC2MZDzqFFTvolT7S 8jFioTTYNYVF7Qpo63o1zlNSrvWJ/ZpMTuNpWenvRyTHImR6j6wE5wE89gN0GvZvfwMu Yyg05SO7BaPOV0jHxKOFQcx+esI2iLO/iQ9jm0YwnmMgjnmFU12QBwP0kflc0n+bMrq8 npgA== X-Gm-Message-State: ALoCoQkCPxFEtCelCeePXnS2fMHSBImgTgZbFhKyE1JpvuWILlDvpdSQ4tX+/uhy8yEl9vjYQCRJ X-Received: by 10.112.166.102 with SMTP id zf6mr778533lbb.12.1417637264164; Wed, 03 Dec 2014 12:07:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.33 with SMTP id j1ls220591lam.59.gmail; Wed, 03 Dec 2014 12:07:44 -0800 (PST) X-Received: by 10.112.93.231 with SMTP id cx7mr5689437lbb.89.1417637264000; Wed, 03 Dec 2014 12:07:44 -0800 (PST) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id h10si4176782lbs.121.2014.12.03.12.07.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:07:43 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id p9so13033227lbv.28 for ; Wed, 03 Dec 2014 12:07:43 -0800 (PST) X-Received: by 10.153.7.170 with SMTP id dd10mr5898626lad.44.1417637263832; Wed, 03 Dec 2014 12:07:43 -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 ew9csp730692lbc; Wed, 3 Dec 2014 12:07:43 -0800 (PST) X-Received: by 10.180.91.36 with SMTP id cb4mr93200998wib.30.1417637263148; Wed, 03 Dec 2014 12:07:43 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id an2si15744128wjc.170.2014.12.03.12.07.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:07:43 -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]:43144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGD7-0007mc-PE for patch@linaro.org; Wed, 03 Dec 2014 15:07:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBt-0006lc-8X for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwGBn-0003UM-7j for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:25 -0500 Received: from mail-ob0-f178.google.com ([209.85.214.178]:33405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwGBn-0003UG-2x for qemu-devel@nongnu.org; Wed, 03 Dec 2014 15:06:19 -0500 Received: by mail-ob0-f178.google.com with SMTP id gq1so1663700obb.23 for ; Wed, 03 Dec 2014 12:06:18 -0800 (PST) X-Received: by 10.60.124.69 with SMTP id mg5mr4374353oeb.73.1417637178737; Wed, 03 Dec 2014 12:06:18 -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.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Dec 2014 12:06:18 -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:05:57 -0600 Message-Id: <1417637167-20640-4-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.178 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH 03/13] 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.217.169 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 --- 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 0433300..4a38a82 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; }