From patchwork Thu Oct 1 11:55:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5q2m55SwID0/SVNPLTIwMjItSlA/Qj9JQnNrUWoxVFRHa2JLRUk9Pz0=?= X-Patchwork-Id: 34686 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 A3B14B7BAA for ; Thu, 1 Oct 2009 22:28:00 +1000 (EST) Received: from localhost ([127.0.0.1]:60860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtKlI-00012P-G3 for incoming@patchwork.ozlabs.org; Thu, 01 Oct 2009 08:27:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MtKJb-0001wp-L6 for qemu-devel@nongnu.org; Thu, 01 Oct 2009 07:59:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MtKJT-0001lN-6r for qemu-devel@nongnu.org; Thu, 01 Oct 2009 07:59:15 -0400 Received: from [199.232.76.173] (port=36506 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MtKJR-0001jo-L7 for qemu-devel@nongnu.org; Thu, 01 Oct 2009 07:59:09 -0400 Received: from smtp-vip.mem.interq.net ([210.157.1.50]:56915 helo=smtp01.mem.internal-gmo) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MtKJQ-0004Dl-Aa for qemu-devel@nongnu.org; Thu, 01 Oct 2009 07:59:08 -0400 Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n91BwpaP003638 for qemu-devel@nongnu.org; Thu, 1 Oct 2009 20:58:51 +0900 (JST) Received: from YOUR-BD18D6DD63.m1.interq.or.jp (ntymns034018.ymns.nt.ftth.ppp.infoweb.ne.jp [211.2.27.18]) by smtp01.mem.internal-gmo with ESMTP id n91BwoL3003592 for ; (me101664 for with PLAIN) Thu, 1 Oct 2009 20:58:51 +0900 (JST) Message-Id: <200910011155.AA00121@YOUR-BD18D6DD63.m1.interq.or.jp> From: "TAKEDA, toshiya" Date: Thu, 01 Oct 2009 20:55:32 +0900 To: qemu-devel MIME-Version: 1.0 X-Mailer: AL-Mail32 Version 1.13 X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Subject: [Qemu-devel] [PATCH v2 07/15] pc: extern i440fx_state and ferr_irq 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 diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index bc2875e..5787f4f 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -64,7 +64,7 @@ static fdctrl_t *floppy_controller; static RTCState *rtc_state; static PITState *pit; -static PCII440FXState *i440fx_state; +PCII440FXState *i440fx_state; typedef struct rom_reset_data { uint8_t *data; @@ -111,7 +111,7 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) } /* MSDOS compatibility mode FPU exception support */ -static qemu_irq ferr_irq; +qemu_irq ferr_irq; /* XXX: add IGNNE support */ void cpu_set_ferr(CPUX86State *s) { diff --git a/qemu/hw/pc.h b/qemu/hw/pc.h index c9cdd4a..6bc8f6d 100644 --- a/qemu/hw/pc.h +++ b/qemu/hw/pc.h @@ -93,6 +93,7 @@ extern int fd_bootchk; void ioport_set_a20(int enable); int ioport_get_a20(void); +int cpu_is_bsp(CPUState *env); /* acpi.c */ extern int acpi_enabled; @@ -146,8 +147,12 @@ void pci_cirrus_vga_init(PCIBus *bus); void isa_cirrus_vga_init(void); /* ne2000.c */ - void isa_ne2000_init(int base, int irq, NICInfo *nd); -int cpu_is_bsp(CPUState *env); +extern PCII440FXState *i440fx_state; +extern qemu_irq ferr_irq; + +/* NEC PC-98x1 */ +#include "pc98.h" + #endif