From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ml2fD-0003Bd-8O for qemu-devel@nongnu.org; Tue, 08 Sep 2009 11:31:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ml2f8-0003BR-NL for qemu-devel@nongnu.org; Tue, 08 Sep 2009 11:31:22 -0400 Received: from [199.232.76.173] (port=46942 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ml2f8-0003BO-JM for qemu-devel@nongnu.org; Tue, 08 Sep 2009 11:31:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49777) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ml2f7-0008LA-Gr for qemu-devel@nongnu.org; Tue, 08 Sep 2009 11:31:18 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n88FVE9W027646 for ; Tue, 8 Sep 2009 11:31:15 -0400 From: Gerd Hoffmann Date: Tue, 8 Sep 2009 17:31:10 +0200 Message-Id: <1252423870-19798-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] Fix -M isapc irq routing List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Only send irqs to ioapic in case we have one. Fixes qemu segfault. Linux kernel still needs explicit noapic noacpi on the kernel cmd line to boot. Do we need a different bios for isapc? Or a fw_cfg knob to turn off all the modern stuff (apic, acpi, smp, ...)? Signed-off-by: Gerd Hoffmann --- hw/pc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 6292001..9af0cdb 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -100,7 +100,8 @@ static void isa_irq_handler(void *opaque, int n, int level) if (n < 16) { qemu_set_irq(isa->i8259[n], level); } - qemu_set_irq(isa->ioapic[n], level); + if (isa->ioapic) + qemu_set_irq(isa->ioapic[n], level); }; static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) -- 1.6.2.5