From patchwork Fri May 14 07:29:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [11/26] pc: make pc_init1() not refer ferr_irq directly. From: Isaku Yamahata X-Patchwork-Id: 52570 Message-Id: To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, kraxel@redhat.com Date: Fri, 14 May 2010 16:29:09 +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 Acked-by: Gerd Hoffmann --- 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 fa11477..18c025b 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -102,6 +102,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) { @@ -950,7 +956,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 77239a0..abf02de 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -77,6 +77,8 @@ void rtc_set_date(RTCState *s, const struct tm *tm); /* 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);