From patchwork Wed Aug 10 22:28:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 109468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 72860B6F90 for ; Thu, 11 Aug 2011 08:29:46 +1000 (EST) Received: from localhost ([::1]:47904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHR-0004EC-BL for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 18:29:41 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHC-0003y9-A8 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrHHB-0006Me-2m for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:26 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:44730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrHHA-0006Kk-O4 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 18:29:24 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1164337wyf.4 for ; Wed, 10 Aug 2011 15:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=bL8fRkd/sGjQ+xT/s5zEbxmcHgKnH5lKxIEfn+QB8Iw=; b=FOYg/W9osjkXhpRapOxK4KHcKXdGxeF1rXP4AG2zrH6CEQFtX5XkBCZj2UPXwFKr/Q 6RJeTg5gPlozDVr6SBlAy9SGLlg/5cyjm/12K/vLqAjtRwD4ACbVRSE7Th3Yvaxpze3S 45+CZ4mgB3AE02kpgz8rxts+J+dcp3yrAIUtg= Received: by 10.216.132.169 with SMTP id o41mr7067655wei.83.1313015364418; Wed, 10 Aug 2011 15:29:24 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id m38sm880619weq.21.2011.08.10.15.29.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 15:29:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 15:28:13 -0700 Message-Id: <1313015300-23920-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1313015300-23920-1-git-send-email-rth@twiddle.net> References: <1313015300-23920-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: avi@redhat.com Subject: [Qemu-devel] [PATCH 04/11] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices. 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 In particular, the i8259 was being initialized before the ISA bus, leading to a crash. Signed-off-by: Richard Henderson --- hw/pc_piix.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 709a1c3..82718ec 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -123,17 +123,7 @@ static void pc_init1(MemoryRegion *system_memory, pci_memory, &ram_memory); } - if (!xen_enabled()) { - cpu_irq = pc_allocate_cpu_irq(); - i8259 = i8259_init(cpu_irq[0]); - } else { - i8259 = xen_interrupt_controller_init(); - } isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); - isa_irq_state->i8259 = i8259; - if (pci_enabled) { - ioapic_init(isa_irq_state); - } isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); if (pci_enabled) { @@ -153,6 +143,18 @@ static void pc_init1(MemoryRegion *system_memory, } isa_bus_irqs(isa_irq); + if (!xen_enabled()) { + cpu_irq = pc_allocate_cpu_irq(); + i8259 = i8259_init(cpu_irq[0]); + } else { + i8259 = xen_interrupt_controller_init(); + } + + isa_irq_state->i8259 = i8259; + if (pci_enabled) { + ioapic_init(isa_irq_state); + } + pc_register_ferr_irq(isa_get_irq(13)); pc_vga_init(pci_enabled? pci_bus: NULL);