From patchwork Tue Dec 22 17:41:29 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: 41629 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 2F00DB7BBB for ; Wed, 23 Dec 2009 05:11:09 +1100 (EST) Received: from localhost ([127.0.0.1]:54446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NN9AH-0000JZ-Rv for incoming@patchwork.ozlabs.org; Tue, 22 Dec 2009 13:08:57 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NN8nN-0000Fo-Va for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:45:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NN8nJ-0000ET-D9 for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:45:17 -0500 Received: from [199.232.76.173] (port=55240 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NN8nJ-0000EK-0U for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:45:13 -0500 Received: from smtp-vip.mem.interq.net ([210.157.1.50]:22973 helo=smtp01.mem.internal-gmo) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NN8nD-0002Fv-JH for qemu-devel@nongnu.org; Tue, 22 Dec 2009 12:45:12 -0500 Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id nBMHj0Po021955 for qemu-devel@nongnu.org; Wed, 23 Dec 2009 02:45:00 +0900 (JST) Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id nBMHgJ0w021854 for qemu-devel@nongnu.org; Wed, 23 Dec 2009 02:42:19 +0900 (JST) Received: from YOUR-BD18D6DD63.m1.interq.or.jp (ntymns039132.ymns.nt.ftth.ppp.infoweb.ne.jp [121.92.167.132]) by smtp01.mem.internal-gmo with ESMTP id nBMHgGgS021741 for ; (me101664 for with PLAIN) Wed, 23 Dec 2009 02:42:19 +0900 (JST) Message-Id: <200912221741.AA00221@YOUR-BD18D6DD63.m1.interq.or.jp> From: "TAKEDA, toshiya" Date: Wed, 23 Dec 2009 02:41:29 +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 V4 18/18] 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 Signed-off-by: TAKEDA, toshiya --- hw/pc.c | 4 ++-- hw/pc.h | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index db7d58e..ddefb7f 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -67,7 +67,7 @@ static fdctrl_t *floppy_controller; static RTCState *rtc_state; static PITState *pit; -static PCII440FXState *i440fx_state; +PCII440FXState *i440fx_state; typedef struct isa_irq_state { qemu_irq *i8259; @@ -90,7 +90,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/hw/pc.h b/hw/pc.h index 03ffc91..b39d7a1 100644 --- a/hw/pc.h +++ b/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,10 @@ 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); +/* NEC PC-9821 */ +extern PCII440FXState *i440fx_state; +extern qemu_irq ferr_irq; +#include "pc98.h" #endif