From patchwork Wed Oct 28 16:32:55 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: 37158 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 24688B7B93 for ; Thu, 29 Oct 2009 08:55:42 +1100 (EST) Received: from localhost ([127.0.0.1]:52971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3CV2-0000R3-Q7 for incoming@patchwork.ozlabs.org; Wed, 28 Oct 2009 13:39:56 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N3Bn6-0007b9-SL for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N3Bmx-0007P4-MK for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:28 -0400 Received: from [199.232.76.173] (port=45984 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N3Bmx-0007Oc-DH for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:23 -0400 Received: from smtp-vip.mem.interq.net ([210.157.1.50]:36326 helo=smtp01.mem.internal-gmo) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N3Bmw-0002l0-HG for qemu-devel@nongnu.org; Wed, 28 Oct 2009 12:54:23 -0400 Received: (from root@localhost) by smtp01.mem.internal-gmo (8.13.8/8.12.6) id n9SGs6dc018675 for qemu-devel@nongnu.org; Thu, 29 Oct 2009 01:54:06 +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 n9SGs5ZQ018647 for ; (me101664 for with PLAIN) Thu, 29 Oct 2009 01:54:06 +0900 (JST) Message-Id: <200910281632.AA00141@YOUR-BD18D6DD63.m1.interq.or.jp> From: "TAKEDA, toshiya" Date: Thu, 29 Oct 2009 01:32:55 +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 v3 4/25] 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 4cd8ec6..25eb6dc 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 isa_irq_state { qemu_irq *i8259; @@ -87,7 +87,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 15fff8d..c4c5829 100644 --- a/qemu/hw/pc.h +++ b/qemu/hw/pc.h @@ -92,6 +92,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; @@ -121,6 +122,9 @@ typedef struct PCII440FXState PCII440FXState; PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic); void i440fx_set_smm(PCII440FXState *d, int val); void i440fx_init_memory_mappings(PCII440FXState *d); +void i440fx_update_isa_page_descs(PCII440FXState *d, + target_phys_addr_t start_addr, + ram_addr_t size); /* piix4.c */ extern PCIDevice *piix4_dev; @@ -145,8 +149,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