From patchwork Sun Mar 11 07:04:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 145945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C4A54B6F9D for ; Sun, 11 Mar 2012 18:05:13 +1100 (EST) Received: from localhost ([::1]:38254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6cq6-0000Wb-8X for incoming@patchwork.ozlabs.org; Sun, 11 Mar 2012 03:05:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6cpx-0000Uz-P6 for qemu-devel@nongnu.org; Sun, 11 Mar 2012 03:05:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6cpv-0005Ww-OQ for qemu-devel@nongnu.org; Sun, 11 Mar 2012 03:05:01 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:55310) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6cpv-0005WV-4g for qemu-devel@nongnu.org; Sun, 11 Mar 2012 03:04:59 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 11 Mar 2012 12:34:48 +0530 Received: from d28relay05.in.ibm.com (9.184.220.62) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 11 Mar 2012 12:34:44 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2B74hO14374576 for ; Sun, 11 Mar 2012 12:34:44 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2BCZKav002417 for ; Sun, 11 Mar 2012 23:35:20 +1100 Received: from localhost ([9.123.236.97]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q2BCZJBg002413; Sun, 11 Mar 2012 23:35:19 +1100 From: Wanpeng Li To: "Michael S. Tsirkin" , Anthony Liguori , qemu-devel@nongnu.org Date: Sun, 11 Mar 2012 15:04:39 +0800 Message-Id: <1331449479-8197-1-git-send-email-liwp@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 x-cbid: 12031107-4790-0000-0000-000001B98846 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.1 Cc: Wanpeng Li , afaerber@suse.de, Gavin Shan Subject: [Qemu-devel] [PATCH] fix bug of isa_bus 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org ISA bus only use IRQ 0~15, so don't need to give an array qemu_irq 0~23, just array qemu_irq i8259 is ok. Signed-off-by: Wanpeng Li --- hw/pc_piix.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 63dba4e..52f7cf8 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -210,7 +210,6 @@ static void pc_init1(MemoryRegion *system_memory, isa_bus = isa_bus_new(NULL, system_io); no_hpet = 1; } - isa_bus_irqs(isa_bus, gsi); if (kvm_irqchip_in_kernel()) { i8259 = kvm_i8259_init(isa_bus); @@ -221,6 +220,8 @@ static void pc_init1(MemoryRegion *system_memory, i8259 = i8259_init(isa_bus, cpu_irq[0]); } + isa_bus_irqs(isa_bus, i8259); + for (i = 0; i < ISA_NUM_IRQS; i++) { gsi_state->i8259_irq[i] = i8259[i]; }