From patchwork Wed Jun 3 13:08:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49465 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3DFA920BE7 for ; Wed, 3 Jun 2015 13:47:33 +0000 (UTC) Received: by wgv5 with SMTP id 5sf2831325wgv.0 for ; Wed, 03 Jun 2015 06:47:32 -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=SfzcrzNYu4kLNtgq9D0g9xJT9iuw/9LHOvXV8r5vS2s=; b=k2gckpsq77fULsNhdNCavTJLiXTAIUZp3Zeq4aSFw+yh9A6LlLMiLfALMbCL9T8VEz R7Hgtzh1A4Ou8Ug2VOryz114ODnqt2Dzt7JEqpyUlSbbcStmY/nFiX61UkcoDgluAorL UnogrKIOhpnlTgSvcwFn52JvKW0/yIiUJe96ERKqCFhConVAUjRWiH8ta1OQJuWD/M76 7e35Fhren/qKvCJaKSdcLqNYBdrGc4sBvlZlkStIESxamaYaOlcaU6P1Wry+DYIymQ1N yjWNId7A4Z1yQUUcBvXMo/B+zAxUD2dSJjKkt4lna63uaNS2uCA0brO7oHfhep7Thh4A uhpQ== X-Gm-Message-State: ALoCoQnlKdmBz6FPp7RTkihBRfFiUpKgsC6uYnyB/qR6XzbByxLmFLHhaAV8Y7vAsA/hXvyq7mWm X-Received: by 10.112.203.168 with SMTP id kr8mr30926215lbc.10.1433339252073; Wed, 03 Jun 2015 06:47:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.67 with SMTP id da3ls64339lad.49.gmail; Wed, 03 Jun 2015 06:47:31 -0700 (PDT) X-Received: by 10.112.154.71 with SMTP id vm7mr31349029lbb.96.1433339251919; Wed, 03 Jun 2015 06:47:31 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id o8si18084896lal.67.2015.06.03.06.47.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:47:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbcue7 with SMTP id ue7so7339788lbc.0 for ; Wed, 03 Jun 2015 06:47:31 -0700 (PDT) X-Received: by 10.112.220.7 with SMTP id ps7mr31594021lbc.72.1433339251741; Wed, 03 Jun 2015 06:47:31 -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 hn6csp3881594lbb; Wed, 3 Jun 2015 06:47:30 -0700 (PDT) X-Received: by 10.55.49.73 with SMTP id x70mr15899509qkx.49.1433339249960; Wed, 03 Jun 2015 06:47:29 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k7si630708qcj.38.2015.06.03.06.47.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:47:29 -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]:35653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z090y-0006Bb-Tr for patch@linaro.org; Wed, 03 Jun 2015 09:47:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0909-00057q-SR for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0906-0000qj-Io for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:41669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0906-0000pj-BD; Wed, 03 Jun 2015 09:46:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 54AF0407B6; Wed, 3 Jun 2015 16:46: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 68602A61; Wed, 3 Jun 2015 16:08:54 +0300 (MSK) Received: (nullmailer pid 27449 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:38 +0300 Message-Id: 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 18/30] hw/sparc/sun4m.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.169 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/sparc/sun4m.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index a69bf2d..8a3599c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -897,7 +897,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, espdma_irq, ledma_irq; qemu_irq esp_reset, dma_enable; qemu_irq fdc_tc; - qemu_irq *cpu_halt; unsigned long kernel_size; DriveInfo *fd[MAX_FD]; FWCfgState *fw_cfg; @@ -1024,9 +1023,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, escc_init(hwdef->serial_base, slavio_irq[15], slavio_irq[15], serial_hds[0], serial_hds[1], ESCC_CLOCK, 1); - cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1); if (hwdef->apc_base) { - apc_init(hwdef->apc_base, cpu_halt[0]); + apc_init(hwdef->apc_base, qemu_allocate_irq(cpu_halt_signal, NULL, 0)); } if (hwdef->fd_base) { @@ -1036,7 +1034,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, sun4m_fdctrl_init(slavio_irq[22], hwdef->fd_base, fd, &fdc_tc); } else { - fdc_tc = *qemu_allocate_irqs(dummy_fdc_tc, NULL, 1); + fdc_tc = qemu_allocate_irq(dummy_fdc_tc, NULL, 0); } slavio_misc_init(hwdef->slavio_base, hwdef->aux1_base, hwdef->aux2_base,