From patchwork Thu Aug 8 16:04:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18894 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B36E225E72 for ; Thu, 8 Aug 2013 16:04:30 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id bv4sf407890qab.4 for ; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=vGjfTbzoNFbzWNRhwQ3iJ4l8WrvWjab6E+ITwLsXgJU=; b=gDqBLS0/6vEJmARc0tqiB6q9MdoI9dacFm6A1uRijpxiVU7zVgUABWGEKbABPbBF5i GRL5J3wnOmtINI2g0JHY7XEBkSBTqHlHYGFNFQIBA7FUO7MslsP3AQp6hL5ng9xg2vLq lhgSLoS7F4m0iQTAYeZBSeJdw/xlzgihjfIW+JAA3dZpO1OWT9Nlivdd6fQJLwx+uds1 oNygY5JsaqJj7CZZoWfwCBTaoQ54/K47GP2u5XhNrk1Vpnuq0mgyK9BcgWGHYqfx5uLq fDttigRk7Lkr/p1IWf8hiJctr8c5xGGbZ5aTIqHridEF4jvqOAkOS9ntN05M4bGJXV9a b2cQ== X-Received: by 10.236.54.135 with SMTP id i7mr3880432yhc.33.1375977870496; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.3 with SMTP id 3ls1177191qeq.83.gmail; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) X-Received: by 10.58.217.167 with SMTP id oz7mr3530393vec.15.1375977870360; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id gr9si3285242vec.35.2013.08.08.09.04.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:30 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id m1so3163146ves.41 for ; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) X-Gm-Message-State: ALoCoQm05Y0xedSziPDjT2nQTNPfKLJxAAO1DwAuVKQPu8l7v7fEqLf9Ed4okQYa1yqn9CwYNOcq X-Received: by 10.52.164.16 with SMTP id ym16mr2950997vdb.32.1375977870280; Thu, 08 Aug 2013 09:04:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp23546vcz; Thu, 8 Aug 2013 09:04:29 -0700 (PDT) X-Received: by 10.152.44.164 with SMTP id f4mr2396212lam.38.1375977867979; Thu, 08 Aug 2013 09:04:27 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id i10si6057101laf.14.2013.08.08.09.04.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:27 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V7ShG-0006Xg-NR; Thu, 08 Aug 2013 17:04:18 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 12/14] hw/arm/vexpress: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:14 +0100 Message-Id: <1375977856-25046-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> References: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Drop the now-deprecated arm_pic_init_cpu() in favour of directly getting the IRQ line from the ARMCPU object. Signed-off-by: Peter Maydell --- hw/arm/vexpress.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 9586e38..fbd71a7 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -183,7 +183,6 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard, MemoryRegion *lowram = g_new(MemoryRegion, 1); DeviceState *dev; SysBusDevice *busdev; - qemu_irq *irqp; int n; qemu_irq cpu_irq[4]; ram_addr_t low_ram_size; @@ -198,8 +197,7 @@ static void a9_daughterboard_init(const VEDBoardInfo *daughterboard, fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp = arm_pic_init_cpu(cpu); - cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; + cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ); } if (ram_size > 0x40000000) { @@ -312,15 +310,13 @@ static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, for (n = 0; n < smp_cpus; n++) { ARMCPU *cpu; - qemu_irq *irqp; cpu = cpu_arm_init(cpu_model); if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp = arm_pic_init_cpu(cpu); - cpu_irq[n] = irqp[ARM_PIC_CPU_IRQ]; + cpu_irq[n] = qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ); } {