[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V9 12/20] pc: make pc_init1() not refer ferr_irq dir
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V9 12/20] pc: make pc_init1() not refer ferr_irq directly. |
Date: |
Tue, 8 Dec 2009 17:33:31 +0900 |
By introducing a registering function, make pc_init1() not refer to
ferr_irq directly in order to make ferr_irq piix independent.
Later pc_init1() will be split out into another file keeping ferr_irq
static.
Signed-off-by: Isaku Yamahata <address@hidden>
---
hw/pc.c | 8 +++++++-
hw/pc.h | 2 ++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index 5852d0e..d0ef06b 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -86,6 +86,12 @@ static void ioport80_write(void *opaque, uint32_t addr,
uint32_t data)
/* MSDOS compatibility mode FPU exception support */
static qemu_irq ferr_irq;
+
+void pc_register_ferr_irq(qemu_irq irq)
+{
+ ferr_irq = irq;
+}
+
/* XXX: add IGNNE support */
void cpu_set_ferr(CPUX86State *s)
{
@@ -1130,7 +1136,7 @@ static void pc_init1(ram_addr_t ram_size,
}
isa_bus_irqs(isa_irq);
- ferr_irq = isa_reserve_irq(13);
+ pc_register_ferr_irq(isa_reserve_irq(13));
/* init basic PC hardware */
register_ioport_write(0x80, 1, 1, ioport80_write, NULL);
diff --git a/hw/pc.h b/hw/pc.h
index c937243..5a2eb5c 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -92,6 +92,8 @@ void cmos_set_s3_resume(void);
/* pc.c */
extern int fd_bootchk;
+void pc_register_ferr_irq(qemu_irq irq);
+
void ioport_set_a20(int enable);
int ioport_get_a20(void);
--
1.6.5.4
- [Qemu-devel] [PATCH V9 00/20] split out piix specific part from pc emulator, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 17/20] pc: split out pci device init from pc_init1() into pc_pci_device_init(), Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 12/20] pc: make pc_init1() not refer ferr_irq directly.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V9 03/20] acpi: add acpi constants from linux header files and use them., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 15/20] pc: split out vga initialization from pc_init1() into pc_vga_init()., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 10/20] pc: Remove reference to a global variable, RTCState *rtc_state., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 07/20] pc, i440fx: Make smm enable/disable function i440fx independent., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 19/20] pc: move rtc declarations from pc.h into a dedicated header file., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 02/20] acpi: split out apm register emulation from acpi.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 08/20] pc: make an unnecessary global variable, pit, local., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 18/20] pc: split out piix specific part from pc.c into pc_piix.c, Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 09/20] pc: remove a global variable, floppy_controller., Isaku Yamahata, 2009/12/08
- [Qemu-devel] [PATCH V9 11/20] pc: introduce a function to allocate cpu irq., Isaku Yamahata, 2009/12/08