diff mbox

[v2,07/15] pc: extern i440fx_state and ferr_irq

Message ID 200910011155.AA00121@YOUR-BD18D6DD63.m1.interq.or.jp
State Superseded
Headers show

Commit Message

武田 =?ISO-2022-JP?B?IBskQj1TTGkbKEI=?= Oct. 1, 2009, 11:55 a.m. UTC
diff mbox

Patch

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