From patchwork Wed Jun 3 13:08:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49467 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 77AAA20BE7 for ; Wed, 3 Jun 2015 13:47:39 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf2922914lbb.0 for ; Wed, 03 Jun 2015 06:47:38 -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=A8NlrAA/o9E3FO7XIagG0xFhG4JC9HjLpNDuupsbq7k=; b=g+ZlDvJUZ9jUvMs9ZD6jl7NsYS5TS3y+1LG6vRwCaV/FrBYqeGaNiJUIkSQBj9eNW7 CWRKHJZteVcv0W/CvmSUPHOVyba2xbQTQ0JKXVbIhfFr0b/VGM25fGicd+P90X9M05vM 35zq8HmeCMITt49KIxFrlRjgQe057SXlGHbNMLdrDvc7pQN8Rz5CywWWWsziI8BOKzS+ q0JiBfmOsx6kkg0KF2hxc6RRireAnIYWTPwcDNc9K8ZmGhVbniPa+EechbBPj0VcV0Zs UWbgkUX7+6QZyAxPsdd5IXa1jUJffIaeGN8JT6Lc54oV/wIgat3amkbSo/z9w4olsX89 TWsQ== X-Gm-Message-State: ALoCoQk1Uvw96HP6n1Ojrhb4XCx9hVaXTBA42K9nU7oR66edDPIUp7W0NSRynqZJjzQzdHLlxmRY X-Received: by 10.181.5.7 with SMTP id ci7mr1992234wid.1.1433339258365; Wed, 03 Jun 2015 06:47:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.161 with SMTP id jp1ls53687lab.96.gmail; Wed, 03 Jun 2015 06:47:38 -0700 (PDT) X-Received: by 10.112.190.10 with SMTP id gm10mr31059327lbc.2.1433339258176; Wed, 03 Jun 2015 06:47:38 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id et1si18099461lac.11.2015.06.03.06.47.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 06:47:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by laew7 with SMTP id w7so8548214lae.1 for ; Wed, 03 Jun 2015 06:47:38 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr9648533lak.117.1433339258036; Wed, 03 Jun 2015 06:47:38 -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 hn6csp3881656lbb; Wed, 3 Jun 2015 06:47:36 -0700 (PDT) X-Received: by 10.140.108.195 with SMTP id j61mr35956380qgf.83.1433339256204; Wed, 03 Jun 2015 06:47:36 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l4si614333qge.125.2015.06.03.06.47.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 06:47:36 -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]:35655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0915-0006Sy-84 for patch@linaro.org; Wed, 03 Jun 2015 09:47:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0909-00057r-ST for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0906-0000qU-IQ for qemu-devel@nongnu.org; Wed, 03 Jun 2015 09:46:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:47575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0906-0000pf-Au; 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 476AA407B3; 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 932E3A63; Wed, 3 Jun 2015 16:08:54 +0300 (MSK) Received: (nullmailer pid 27459 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:43 +0300 Message-Id: <5429273615e7b412402a7b22738737c09ab9f488.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 23/30] hw/alpha/typhoon.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.215.53 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/alpha/typhoon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index 7df842d..421162e 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -841,7 +841,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, } } - *p_rtc_irq = *qemu_allocate_irqs(typhoon_set_timer_irq, s, 1); + *p_rtc_irq = qemu_allocate_irq(typhoon_set_timer_irq, s, 0); /* Main memory region, 0x00.0000.0000. Real hardware supports 32GB, but the address space hole reserved at this point is 8TB. */ @@ -918,11 +918,11 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, /* Init the ISA bus. */ /* ??? Technically there should be a cy82c693ub pci-isa bridge. */ { - qemu_irq isa_pci_irq, *isa_irqs; + qemu_irq *isa_irqs; *isa_bus = isa_bus_new(NULL, get_system_memory(), &s->pchip.reg_io); - isa_pci_irq = *qemu_allocate_irqs(typhoon_set_isa_irq, s, 1); - isa_irqs = i8259_init(*isa_bus, isa_pci_irq); + isa_irqs = i8259_init(*isa_bus, + qemu_allocate_irq(typhoon_set_isa_irq, s, 0)); isa_bus_irqs(*isa_bus, isa_irqs); }