From patchwork Wed Jan 6 02:39:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4CA46B6EEE for ; Wed, 6 Jan 2010 14:23:05 +1100 (EST) Received: from localhost ([127.0.0.1]:44217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSMU9-0003rZ-Nc for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 22:23:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSLoh-0004QJ-4T for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSLoT-0004HH-3d for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:40:02 -0500 Received: from [199.232.76.173] (port=54789 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSLoS-0004Gf-2R for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:56 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:60930) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSLoR-0003kv-69 for qemu-devel@nongnu.org; Tue, 05 Jan 2010 21:39:55 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 19F531829E; Wed, 6 Jan 2010 11:39:45 +0900 (JST) Received: (nullmailer pid 28738 invoked by uid 1000); Wed, 06 Jan 2010 02:39:51 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com, aurelien@aurel32.net Date: Wed, 6 Jan 2010 11:39:30 +0900 Message-Id: <1262745591-28697-7-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> References: <1262745591-28697-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V12 06/27] pc: initialize ioapic before use. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The changeset of 2c8d9340203c7f19265fd4cb2341f568217a3af6 prevents isa_irq_handler() from NULL refering of IsaIrqState::ioapic. However it would be better to initialize the member before reference. Signed-off-by: Isaku Yamahata Acked-by: Gerd Hoffmann --- hw/pc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 83f8dd0..fbacc1e 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1112,6 +1112,9 @@ static void pc_init1(ram_addr_t ram_size, i8259 = i8259_init(cpu_irq[0]); isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state)); isa_irq_state->i8259 = i8259; + if (pci_enabled) { + isa_irq_state->ioapic = ioapic_init(); + } isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); if (pci_enabled) { @@ -1155,9 +1158,6 @@ static void pc_init1(ram_addr_t ram_size, register_ioport_read(0x92, 1, 1, ioport92_read, NULL); register_ioport_write(0x92, 1, 1, ioport92_write, NULL); - if (pci_enabled) { - isa_irq_state->ioapic = ioapic_init(); - } pit = pit_init(0x40, isa_reserve_irq(0)); pcspk_init(pit); if (!no_hpet) {