From patchwork Thu Aug 8 16:04:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18888 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f197.google.com (mail-gh0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 85EE025E70 for ; Thu, 8 Aug 2013 16:04:23 +0000 (UTC) Received: by mail-gh0-f197.google.com with SMTP id r20sf2654702ghr.4 for ; Thu, 08 Aug 2013 09:04:23 -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=iD66cySh/wt9u971oMMO01OpfADmlNn0JbpoXGT4Ue0=; b=FJ8xY1N2IyvpPnjmpAGEeYYxYTv5l47/TpPA8gXOzv1MH4dg9rd2GRRn8zrdVfapuw bYqv+tsPVk2bnE/dl+HF/pNDMW1xIe6bUkCiH5aiXyymQUhhcl6neSlRlcMviv7PnC6n RC5n3mITbPoc40yhjUJWZtoDXIj4n/cu5v5EdX/mFget9Q1/U9t9OTGNclyTCQ7zOGMI WNTifBFY5GPLFkrOL/H8pbvYNfn+4wlWqb08M7ZsYcg7YIWK+hcFfYI78TmvKrHVjPRo mrqmcL2VSj0gBsv5swmG63KiKqzJMHTvMi5vv1BPbPCanmZD/xBEE/VGuezCHAfYLqRx YrXA== X-Received: by 10.236.109.199 with SMTP id s47mr3875718yhg.2.1375977863255; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.79 with SMTP id w15ls1105213qeb.96.gmail; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) X-Received: by 10.220.109.197 with SMTP id k5mr4398734vcp.54.1375977863082; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id y4si3281412vej.75.2013.08.08.09.04.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 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.180; Received: by mail-ve0-f180.google.com with SMTP id pb11so3186475veb.39 for ; Thu, 08 Aug 2013 09:04:23 -0700 (PDT) X-Gm-Message-State: ALoCoQnYUQOg1d0pobN75vYAtCfN6s+Abe/3zCfYAlbaYvLWym/LNCZps3Yl4CyjrZD8JDRxaIGW X-Received: by 10.58.134.84 with SMTP id pi20mr1831854veb.55.1375977862986; 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 u4csp23538vcz; Thu, 8 Aug 2013 09:04:22 -0700 (PDT) X-Received: by 10.14.2.200 with SMTP id 48mr3437111eef.58.1375977859058; 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 u9si11508366eeg.51.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 1V7ShE-0006WY-S5; Thu, 08 Aug 2013 17:04:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 02/14] hw/arm/armv7m: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:04 +0100 Message-Id: <1375977856-25046-3-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.180 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/armv7m.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 82d36fb..89a9015 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -173,7 +173,6 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, DeviceState *nvic; /* FIXME: make this local state. */ static qemu_irq pic[64]; - qemu_irq *cpu_pic; int image_size; uint64_t entry; uint64_t lowaddr; @@ -221,8 +220,8 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, nvic = qdev_create(NULL, "armv7m_nvic"); env->nvic = nvic; qdev_init_nofail(nvic); - cpu_pic = arm_pic_init_cpu(cpu); - sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]); + sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0, + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); for (i = 0; i < 64; i++) { pic[i] = qdev_get_gpio_in(nvic, i); }