From patchwork Thu Aug 8 16:04:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18887 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C87D625E16 for ; Thu, 8 Aug 2013 16:04:22 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e13sf3705822vbg.0 for ; Thu, 08 Aug 2013 09:04:22 -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=kr3L9uTygHLOQZmasZo53CARfSvD9PGiTwTWhucBMiU=; b=jTvoExLJjELl9PR6tFMEdXmW/0Fn3TbkFiZo4zI3OVGnQ5Iq8qiOCGbi5N/5WcbWjs o7rRAx4lyr39kdsF4LgZ7Chsf2yL9mNjcQivFxtbxOVjIL1gSL6qZpoJTlSUUEMiSM6U DRoyauX0sUW9XJSF3LnqNzkOUot8gKBI5A62m69zsjS5EmL4piwRheSomVpiZlhlx9hE 0AVIORygNDlO2djiOCshyu50D9l7B8WhKE/RHzWCYssn93+oqR0D0JX4Q5aTKj5FpiEO LMo2VSg7YNoBjLU/FUGNuGxm6epaFzIp8MWwwZRRjbwNK5nq9JIpJm4k3a+HLbglKBl8 rO4Q== X-Received: by 10.236.163.166 with SMTP id a26mr841717yhl.22.1375977862355; Thu, 08 Aug 2013 09:04:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.102 with SMTP id s6ls1139455qev.17.gmail; Thu, 08 Aug 2013 09:04:22 -0700 (PDT) X-Received: by 10.52.103.35 with SMTP id ft3mr3052084vdb.5.1375977862225; Thu, 08 Aug 2013 09:04:22 -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 ud10si3283175vcb.66.2013.08.08.09.04.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:22 -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 m1so3216459ves.27 for ; Thu, 08 Aug 2013 09:04:22 -0700 (PDT) X-Gm-Message-State: ALoCoQne+F9C5zx5G73LZQzS/Rvs5/f4IWh+F7eTQJ/1itqAstCVNGW6w6QpwvDSRgCMNQtdV+ti X-Received: by 10.52.164.16 with SMTP id ym16mr2950630vdb.32.1375977862140; Thu, 08 Aug 2013 09:04:22 -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 u4csp23537vcz; Thu, 8 Aug 2013 09:04:21 -0700 (PDT) X-Received: by 10.112.33.68 with SMTP id p4mr2711389lbi.13.1375977859346; Thu, 08 Aug 2013 09:04:19 -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 gm9si6660628lbc.91.2013.08.08.09.04.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:19 -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 1V7ShF-0006Wk-9N; Thu, 08 Aug 2013 17:04:17 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 05/14] hw/arm/integratorcp: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:07 +0100 Message-Id: <1375977856-25046-6-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/integratorcp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index d518188..59c3726 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -465,7 +465,6 @@ static void integratorcp_init(QEMUMachineInitArgs *args) MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram_alias = g_new(MemoryRegion, 1); qemu_irq pic[32]; - qemu_irq *cpu_pic; DeviceState *dev; int i; @@ -493,10 +492,10 @@ static void integratorcp_init(QEMUMachineInitArgs *args) qdev_init_nofail(dev); sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000); - cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs(TYPE_INTEGRATOR_PIC, 0x14000000, - cpu_pic[ARM_PIC_CPU_IRQ], - cpu_pic[ARM_PIC_CPU_FIQ], NULL); + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ), + NULL); for (i = 0; i < 32; i++) { pic[i] = qdev_get_gpio_in(dev, i); }