From patchwork Thu Aug 8 16:04:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18886 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4D952246A4 for ; Thu, 8 Aug 2013 16:04:22 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id l109sf3815675yhq.5 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=/Heg9XwNAGl9sn4bCrtgUVlJKnrwcElAgltwlq8PXwM=; b=Y5A0QUuKvgB+FlKCx6lbJnxrk4kH70yvyg8SOCgaIE4BkH6VmJst76nfoONzgZotVN K8+8kXgvmdekNLJuSx5CHgxDPEculb6kJmLQLIhBuYEBykwNa+N5vJXg2DTZifU9N134 4/gpNJ/xePtukr9tT5FVp1PSSoqcvexHF7LQpDDt16emnCenThtQL+LN0Kdyg2pluzRi /asnP1nsSCAMzvoUvv6wNY+SK96Tl3++7V5Em9quY2GVzDEe/2c5/AzYWLUounpym7h7 JMRSfbvmQJahr/pI3nXxUT2jpfrhlfj7kKB12fXsImmEI/y89VgiRqjJiCEFggybZd+R 5pdQ== X-Received: by 10.236.149.170 with SMTP id x30mr3617879yhj.20.1375977861376; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.26.6 with SMTP id h6ls1161935qeg.99.gmail; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) X-Received: by 10.58.216.97 with SMTP id op1mr3558089vec.60.1375977861267; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id l8si3287000vez.10.2013.08.08.09.04.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id oy10so3143227veb.6 for ; Thu, 08 Aug 2013 09:04:21 -0700 (PDT) X-Gm-Message-State: ALoCoQkWXqAIl9ORzicx6KREO0p8s88/F6PcrB8dNetVTpwi6nqx4qtFjeSYLtWFnQlI34tfHsTQ X-Received: by 10.52.109.69 with SMTP id hq5mr2958348vdb.85.1375977861134; Thu, 08 Aug 2013 09:04:21 -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 u4csp23535vcz; Thu, 8 Aug 2013 09:04:20 -0700 (PDT) X-Received: by 10.204.225.209 with SMTP id it17mr1536542bkb.151.1375977859164; 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 qp3si2321399bkb.226.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-0006Ws-JP; 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 07/14] hw/arm/musicpal: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:09 +0100 Message-Id: <1375977856-25046-8-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.175 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/musicpal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index d715143..4404b8d 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1586,7 +1586,6 @@ static void musicpal_init(QEMUMachineInitArgs *args) const char *kernel_cmdline = args->kernel_cmdline; const char *initrd_filename = args->initrd_filename; ARMCPU *cpu; - qemu_irq *cpu_pic; qemu_irq pic[32]; DeviceState *dev; DeviceState *i2c_dev; @@ -1610,7 +1609,6 @@ static void musicpal_init(QEMUMachineInitArgs *args) fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } - cpu_pic = arm_pic_init_cpu(cpu); /* For now we use a fixed - the original - RAM size */ memory_region_init_ram(ram, NULL, "musicpal.ram", MP_RAM_DEFAULT_SIZE); @@ -1622,7 +1620,7 @@ static void musicpal_init(QEMUMachineInitArgs *args) memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram); dev = sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE, - cpu_pic[ARM_PIC_CPU_IRQ]); + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); for (i = 0; i < 32; i++) { pic[i] = qdev_get_gpio_in(dev, i); }