Patchwork [v3,4/25] pc: extern i440fx_state and ferr_irq

login
register
mail settings
Submitter 武田 =?ISO-2022-JP?B?IBskQj1TTGkbKEI=?=
Date Oct. 28, 2009, 4:32 p.m.
Message ID <200910281632.AA00141@YOUR-BD18D6DD63.m1.interq.or.jp>
Download mbox | patch
Permalink /patch/37158/
State New
Headers show

Comments


Patch

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