From patchwork Thu Aug 8 16:04:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18885 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D7AC25D87 for ; Thu, 8 Aug 2013 16:04:22 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q8sf1756011yen.4 for ; Thu, 08 Aug 2013 09:04:21 -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=DJubNgD/eDjE+yODUAMr4yV9X3nlhRorKMUMiBqAq2k=; b=djFQYq0mSTDao9x3xsxOyNkg49hWNCsm/o4O/4qeFpRWIJmE0S7bP4zssjBuivIzKZ EEK6P+sREALeXwsW27908QQrC7p7wJxGs/I5aISYucQWH+NEJ3SbtX0veVt/WJB+1++G 4g/VtNToWdQ1pkYG+Nr8NLD6pF+qnypxjqGdPsdWfYT3DCsylpwhQXgPLtXpnvqDJBmA /sMOwJQVV/9vHO28ywMR7qNoEdQKdSai2FveMOe3VnFJWasZO+Dm/4LJLruyP7pQNUsn kNNFJSTcEqZA+TsMdgoLbzSp634DhPnGJDG+p74xYEehUte1oUbxo/sMQIGbG1QsS+2Z DJSA== X-Received: by 10.236.148.33 with SMTP id u21mr3410237yhj.37.1375977861545; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.132 with SMTP id c4ls1192561qeg.86.gmail; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) X-Received: by 10.220.50.10 with SMTP id x10mr2515476vcf.86.1375977860219; Thu, 08 Aug 2013 09:04:20 -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 na3si3283891vcb.57.2013.08.08.09.04.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:20 -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 db10so3224263veb.28 for ; Thu, 08 Aug 2013 09:04:20 -0700 (PDT) X-Gm-Message-State: ALoCoQleKNhwcunHOyY6zayO3cVrErr+Y8f35kBl7D+ni1K5Ny/WARxd/sPjNaAxF4SErpWgjIbH X-Received: by 10.52.243.201 with SMTP id xa9mr2829261vdc.106.1375977860095; Thu, 08 Aug 2013 09:04:20 -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 u4csp23534vcz; Thu, 8 Aug 2013 09:04:19 -0700 (PDT) X-Received: by 10.204.227.11 with SMTP id iy11mr1560077bkb.158.1375977859033; 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 qr2si2320389bkb.246.2013.08.08.09.04.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:18 -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-0006Wg-53; 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 04/14] hw/arm/highbank: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:06 +0100 Message-Id: <1375977856-25046-5-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/highbank.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 35d5511..f733a6c 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -209,7 +209,6 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine) const char *initrd_filename = args->initrd_filename; DeviceState *dev = NULL; SysBusDevice *busdev; - qemu_irq *irqp; qemu_irq pic[128]; int n; qemu_irq cpu_irq[4]; @@ -239,8 +238,7 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine) /* This will become a QOM property eventually */ cpu->reset_cbar = GIC_BASE_ADDR; - 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); } sysmem = get_system_memory();