diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-12 17:15:43 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:33:49 +0100 |
| commit | 852c27e2ba99939e13a8e87f0d1a43aaec805f56 (patch) | |
| tree | 9d55fd3c7eff15b99b3497447b1b8de1f0a39ca8 /include/hw | |
| parent | b54f33c4e07758f05ead2c27a2dcd1c1b87a34e7 (diff) | |
| download | qemu-852c27e2ba99939e13a8e87f0d1a43aaec805f56.zip qemu-852c27e2ba99939e13a8e87f0d1a43aaec805f56.tar.gz qemu-852c27e2ba99939e13a8e87f0d1a43aaec805f56.tar.bz2 | |
hw: replace hw/i386/pc.h with a header just for the i8259
Remove the need to include i386/pc.h to get to the i8259 functions.
This is enough to remove the inclusion of hw/i386/pc.h from all non-x86
files.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/i386/pc.h | 8 | ||||
| -rw-r--r-- | include/hw/intc/i8259.h | 12 | ||||
| -rw-r--r-- | include/hw/isa/i8259_internal.h | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 61a998d..e2cd453 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -134,14 +134,6 @@ typedef struct PCMachineClass { #define PC_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE) -/* i8259.c */ - -extern DeviceState *isa_pic; -qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq); -qemu_irq *kvm_i8259_init(ISABus *bus); -int pic_read_irq(DeviceState *d); -int pic_get_output(DeviceState *d); - /* ioapic.c */ /* Global System Interrupts */ diff --git a/include/hw/intc/i8259.h b/include/hw/intc/i8259.h new file mode 100644 index 0000000..e2b1e8c --- /dev/null +++ b/include/hw/intc/i8259.h @@ -0,0 +1,12 @@ +#ifndef HW_I8259_H +#define HW_I8259_H + +/* i8259.c */ + +extern DeviceState *isa_pic; +qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq); +qemu_irq *kvm_i8259_init(ISABus *bus); +int pic_get_output(DeviceState *d); +int pic_read_irq(DeviceState *d); + +#endif diff --git a/include/hw/isa/i8259_internal.h b/include/hw/isa/i8259_internal.h index ee189e4..861d70d 100644 --- a/include/hw/isa/i8259_internal.h +++ b/include/hw/isa/i8259_internal.h @@ -25,9 +25,9 @@ #ifndef QEMU_I8259_INTERNAL_H #define QEMU_I8259_INTERNAL_H -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "hw/intc/intc.h" +#include "hw/intc/i8259.h" typedef struct PICCommonState PICCommonState; |