From patchwork Thu Aug 8 16:04:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18892 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 00A5425E16 for ; Thu, 8 Aug 2013 16:04:28 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id m1sf3641517ves.6 for ; Thu, 08 Aug 2013 09:04:28 -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=zmfrGs9XbHxRzcf6FyK1lLdUps5XB8Blxcw55fUXJL0=; b=GahtF46sKkAt8Tlng3ga3fZc/Qgi1C2y5MufY5sDj1JC2DoYinNVtTYEf2ELpCtBeP /6k61VjXbHY9Ki+MNRAJJ0a8RkodGc3Orrh/eBEFx3fHDar8OqM1iKuQdowJ5mkNxizG E0UnVlF0W2SeKcWCA2/0EaKt6fOAM5s23IAH2G6+bCjhqKoXUlHq29SG2fKpptnsB/T/ Fp+ioDGBs2/GR4uX81Zw4IpkcibYQMVayQo9Z820ZmikXOyZbpBt7NAqM5uDDlsaGxv5 UJFbPHtC9SRR/IEOtV2TNJ/rhADsAM/1SHdwHRBWcggfMIMbBgIlwP3h4QxbTnngkMRM O1nA== X-Received: by 10.236.139.3 with SMTP id b3mr3679655yhj.3.1375977868569; Thu, 08 Aug 2013 09:04:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.84.170 with SMTP id a10ls1195633qez.20.gmail; Thu, 08 Aug 2013 09:04:28 -0700 (PDT) X-Received: by 10.220.199.5 with SMTP id eq5mr4456377vcb.16.1375977868461; Thu, 08 Aug 2013 09:04:28 -0700 (PDT) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id h2si3287383vcy.17.2013.08.08.09.04.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id w16so3278166vbb.8 for ; Thu, 08 Aug 2013 09:04:28 -0700 (PDT) X-Gm-Message-State: ALoCoQnVDS5cW5PxrG3uOLvYLmtw0DpL2OLNltu8KzEkv+pq6QLSr+H6UkvRARZYFLPdx7QKWQ+G X-Received: by 10.52.243.201 with SMTP id xa9mr2829623vdc.106.1375977868366; Thu, 08 Aug 2013 09:04:28 -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 u4csp23544vcz; Thu, 8 Aug 2013 09:04:27 -0700 (PDT) X-Received: by 10.14.102.72 with SMTP id c48mr9034439eeg.52.1375977867347; 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 l42si11457788eef.238.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-0006Xp-Uj; Thu, 08 Aug 2013 17:04:19 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 13/14] hw/arm/xilinx_zynq: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:15 +0100 Message-Id: <1375977856-25046-14-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.212.49 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/xilinx_zynq.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 3444823..0f18c85 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -108,11 +108,9 @@ static void zynq_init(QEMUMachineInitArgs *args) MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); DeviceState *dev; SysBusDevice *busdev; - qemu_irq *irqp; qemu_irq pic[64]; NICInfo *nd; int n; - qemu_irq cpu_irq; if (!cpu_model) { cpu_model = "cortex-a9"; @@ -123,8 +121,6 @@ static void zynq_init(QEMUMachineInitArgs *args) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - irqp = arm_pic_init_cpu(cpu); - cpu_irq = irqp[ARM_PIC_CPU_IRQ]; /* max 2GB ram */ if (ram_size > 0x80000000) { @@ -159,7 +155,8 @@ static void zynq_init(QEMUMachineInitArgs *args) qdev_init_nofail(dev); busdev = SYS_BUS_DEVICE(dev); sysbus_mmio_map(busdev, 0, 0xF8F00000); - sysbus_connect_irq(busdev, 0, cpu_irq); + sysbus_connect_irq(busdev, 0, + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); for (n = 0; n < 64; n++) { pic[n] = qdev_get_gpio_in(dev, n);