From patchwork Wed Jun 3 13:08:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49464 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 50A1020BE7 for ; Wed, 3 Jun 2015 13:27:31 +0000 (UTC) Received: by lbcue7 with SMTP id ue7sf2748556lbc.3 for ; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=urrccDPnhuztJ2xPW3Sl0UBHYF2cNWp+eiNukktXotM=; b=LFx5P5TmtweuZknG2feQgMhXye92MsiArIeQzPoYLQUx/H+7u+SdkyLHQE6L/075N+ +hcg2Ci9ujr83EhOOzLwuvu22WduKa3yRVInCLfJS3GEDrmIhpaH5KgpgZPC2LDA3xeY ulJqf6yAhlUolVVWbida1lB/4juIrrFUYjFKyuqbmiVIrv7YTvx7fOIawFAfzD72Riay k6vdni9YCBxihJTrHmLcoAiIWJ56/K/7rNa/u1PtVOxk6ySAn3+knaRvC3PIvDG3MBNN 0CQNR2qIeHYwDb9OTVIWKKEyC/Y5JGmCnP3o1ZKQG3ePZMJDE8Y2Jyfl6Q4ZgYOJQ//M 2poQ== X-Gm-Message-State: ALoCoQn5ICep/fcSwq3fAc307lzmgB0eZERs2+F/HX7X612kCHiR1srKFSQRIxofvdbA3PtgYUmX X-Received: by 10.152.88.37 with SMTP id bd5mr7590979lab.0.1433338049743; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.74 with SMTP id y10ls59333lay.41.gmail; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) X-Received: by 10.112.72.104 with SMTP id c8mr30186263lbv.77.1433338049470; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id o2si18022026lao.112.2015.06.03.06.27.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbcmx3 with SMTP id mx3so6914007lbc.1 for ; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) X-Received: by 10.112.155.197 with SMTP id vy5mr31588822lbb.29.1433338049328; Wed, 03 Jun 2015 06:27:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3868591lbb; Wed, 3 Jun 2015 06:27:28 -0700 (PDT) X-Received: by 10.55.21.211 with SMTP id 80mr57412681qkv.11.1433338047626; Wed, 03 Jun 2015 06:27:27 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k109si582678qgf.32.2015.06.03.06.27.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:27:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08ha-0000PF-I1 for patch@linaro.org; Wed, 03 Jun 2015 09:27:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08gp-00081A-6b for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z08gl-0005sG-5C for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:26:39 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z08gk-0005rT-Ub; Wed, 03 Jun 2015 09:26:35 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E0896407A9; Wed, 3 Jun 2015 16:26:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 0F7A5A69; Wed, 3 Jun 2015 16:08:55 +0300 (MSK) Received: (nullmailer pid 27457 invoked by uid 1000); Wed, 03 Jun 2015 13:08:52 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 16:08:42 +0300 Message-Id: <2c85fad022a5c23b835d7c78b653763ae1e3f6eb.1433336870.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Shannon Zhao , Shannon Zhao Subject: [Qemu-devel] [PULL 22/30] hw/unicore32/puv3.c: Fix misusing qemu_allocate_irqs for single irq X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mjt@tls.msk.ru X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- hw/unicore32/puv3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index cc9a21a..703e29d 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -40,15 +40,15 @@ static void puv3_intc_cpu_handler(void *opaque, int irq, int level) static void puv3_soc_init(CPUUniCore32State *env) { - qemu_irq *cpu_intc, irqs[PUV3_IRQS_NR]; + qemu_irq cpu_intc, irqs[PUV3_IRQS_NR]; DeviceState *dev; MemoryRegion *i8042 = g_new(MemoryRegion, 1); int i; /* Initialize interrupt controller */ - cpu_intc = qemu_allocate_irqs(puv3_intc_cpu_handler, - uc32_env_get_cpu(env), 1); - dev = sysbus_create_simple("puv3_intc", PUV3_INTC_BASE, *cpu_intc); + cpu_intc = qemu_allocate_irq(puv3_intc_cpu_handler, + uc32_env_get_cpu(env), 0); + dev = sysbus_create_simple("puv3_intc", PUV3_INTC_BASE, cpu_intc); for (i = 0; i < PUV3_IRQS_NR; i++) { irqs[i] = qdev_get_gpio_in(dev, i); }