From patchwork Thu Aug 8 16:04:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18893 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AA9B725E70 for ; Thu, 8 Aug 2013 16:04:29 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id bq6sf998049qab.10 for ; Thu, 08 Aug 2013 09:04:29 -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=Mbgp/dVzvPCqqTnEG4hGQLCx+tF4+wmN/XSnxge3wa0=; b=K4K7Xp8jXUckjtp4Yu6nPBCRcu/9zRd7PoiSgHbFZi7He0inJ2dUuQznhYjYKbEsKH NLDlyqxd2EDO3UhnpbQtXwLBBnqpzWByYxrHSdbnt17omI8XJdkmwYb7CVvK+G0PaGPh eBqaWBZKGoo0oC90rZOtCUJywbpIi0zEPZuTJaXAuNRmtEZbTux3WGSlv9F/5NBcSZNd 2QhBsPtqKQuy87/BpDD7I/oqINlc6xkOxfDX5RTsZ7l8DXiXuO9HAyQFven3/0mJPSIM TksATsLNhJh66F93Kw6FGrqFgEpDp1ASbHIjaH8yAtrWLxMlP301QDdVCpWWFY4nz3rW LEfw== X-Received: by 10.236.112.33 with SMTP id x21mr3552012yhg.57.1375977869449; Thu, 08 Aug 2013 09:04:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.72 with SMTP id da8ls1135354qeb.49.gmail; Thu, 08 Aug 2013 09:04:29 -0700 (PDT) X-Received: by 10.220.164.138 with SMTP id e10mr4435499vcy.27.1375977869347; Thu, 08 Aug 2013 09:04:29 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id ur15si3278194veb.108.2013.08.08.09.04.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:29 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 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.169; Received: by mail-ve0-f169.google.com with SMTP id db10so3192305veb.14 for ; Thu, 08 Aug 2013 09:04:29 -0700 (PDT) X-Gm-Message-State: ALoCoQndvaaSBNWuoGqU+3aivdnp7gs0IOOI6UxhUkoCDhMMMijzKAQXkHRygyCp9Pser926pswh X-Received: by 10.52.109.69 with SMTP id hq5mr2958710vdb.85.1375977869202; Thu, 08 Aug 2013 09:04:29 -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 u4csp23545vcz; Thu, 8 Aug 2013 09:04:28 -0700 (PDT) X-Received: by 10.204.63.12 with SMTP id z12mr1578156bkh.44.1375977867706; 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 do5si2319168bkc.271.2013.08.08.09.04.27 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-0006XX-FI; 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 11/14] hw/arm/versatilepb: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:13 +0100 Message-Id: <1375977856-25046-12-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.169 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/versatilepb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c index b48d84c..4a6fcee 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c @@ -178,7 +178,6 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) ARMCPU *cpu; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); - qemu_irq *cpu_pic; qemu_irq pic[32]; qemu_irq sic[32]; DeviceState *dev, *sysctl; @@ -211,10 +210,10 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) qdev_init_nofail(sysctl); sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, 0x10000000); - cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs("pl190", 0x10140000, - 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 (n = 0; n < 32; n++) { pic[n] = qdev_get_gpio_in(dev, n); }