From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6cRR-0006gW-Rx for qemu-devel@nongnu.org; Sun, 11 Mar 2012 01:39:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6cRQ-0001b0-7A for qemu-devel@nongnu.org; Sun, 11 Mar 2012 01:39:41 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:48465) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6cRP-0001aY-JU for qemu-devel@nongnu.org; Sun, 11 Mar 2012 01:39:40 -0500 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:09:28 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2B6dOND2383956 for ; Sun, 11 Mar 2012 12:09:25 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2BC9Dxr013849 for ; Sun, 11 Mar 2012 23:09:13 +1100 From: Wanpeng Li Date: Sun, 11 Mar 2012 14:39:15 +0800 Message-Id: <1331447955-3679-1-git-send-email-liwp@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] fix bug of isa_bus irq List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , Anthony Liguori , qemu-devel@nongnu.org Cc: Wanpeng Li , afaerber@suse.de, Gavin Shan ISA bus only use IRQ 0~15, so don't need to give an array qemu_irq 0~24, 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]; } -- 1.7.5.4