@@ -13,10 +13,6 @@ int apic_get_interrupt(CPUState *env);
void apic_reset_irq_delivered(void);
int apic_get_irq_delivered(void);
-/* ioapic.c */
-typedef struct IOAPICState IOAPICState;
-qemu_irq *ioapic_init(void);
-
/* pc.c */
int cpu_is_bsp(CPUState *env);
@@ -22,6 +22,7 @@
#include "hw.h"
#include "pc.h"
+#include "ioapic.h"
#include "apic.h"
#include "qemu-timer.h"
#include "host-utils.h"
new file mode 100644
@@ -0,0 +1,7 @@
+#ifndef IOAPIC_H
+#define IOAPIC_H
+
+typedef struct IOAPICState IOAPICState;
+qemu_irq *ioapic_init(void);
+
+#endif
@@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
-#include "apic.h"
+#include "ioapic.h"
#include "pci.h"
#include "usb-uhci.h"
#include "usb-ohci.h"
Move IOAPIC declarations to a separate file. Signed-off-by: Blue Swirl <blauwirbel@gmail.com> --- hw/apic.h | 4 ---- hw/ioapic.c | 1 + hw/ioapic.h | 7 +++++++ hw/pc_piix.c | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 hw/ioapic.h