mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw: Move ioapic*.h to intc/

Browse Source 
The ioapic sources reside in hw/intc already. Move the headers there
as well.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230213173033.98762-11-shentey@gmail.com>
[PMD: Keep ioapic_internal.h in hw/intc/, not under include/]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2023-02-13 18:30:31 +01:00 committed by Philippe Mathieu-Daudé
parent e3e3a8ad12
commit 7f54640b4b
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -1712,6 +1712,7 @@ F: include/hw/char/parallel.h
F: include/hw/dma/i8257.h F: include/hw/dma/i8257.h
F: include/hw/i2c/pm_smbus.h F: include/hw/i2c/pm_smbus.h
F: include/hw/input/i8042.h F: include/hw/input/i8042.h
F: include/hw/intc/ioapic*
F: include/hw/isa/i8259_internal.h F: include/hw/isa/i8259_internal.h
F: include/hw/isa/superio.h F: include/hw/isa/superio.h
F: include/hw/timer/hpet.h F: include/hw/timer/hpet.h

3
hw/i386/kvm/ioapic.c
View File

@ -12,9 +12,8 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/i386/x86.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/i386/ioapic_internal.h" #include "hw/intc/ioapic_internal.h"
#include "hw/intc/kvm_irqcount.h" #include "hw/intc/kvm_irqcount.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

2
hw/i386/pc.c
View File

@ -28,7 +28,6 @@
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/char/parallel.h" #include "hw/char/parallel.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/topology.h" #include "hw/i386/topology.h"
#include "hw/i386/fw_cfg.h" #include "hw/i386/fw_cfg.h"
#include "hw/i386/vmport.h" #include "hw/i386/vmport.h"
@ -47,6 +46,7 @@
#include "multiboot.h" #include "multiboot.h"
#include "hw/rtc/mc146818rtc.h" #include "hw/rtc/mc146818rtc.h"
#include "hw/intc/i8259.h" #include "hw/intc/i8259.h"
#include "hw/intc/ioapic.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/input/i8042.h" #include "hw/input/i8042.h"
#include "hw/irq.h" #include "hw/irq.h"

2
hw/i386/pc_q35.c
View File

@ -43,11 +43,11 @@
#include "hw/i386/ich9.h" #include "hw/i386/ich9.h"
#include "hw/i386/amd_iommu.h" #include "hw/i386/amd_iommu.h"
#include "hw/i386/intel_iommu.h" #include "hw/i386/intel_iommu.h"
#include "hw/i386/ioapic.h"
#include "hw/display/ramfb.h" #include "hw/display/ramfb.h"
#include "hw/firmware/smbios.h" #include "hw/firmware/smbios.h"
#include "hw/ide/pci.h" #include "hw/ide/pci.h"
#include "hw/ide/ahci.h" #include "hw/ide/ahci.h"
#include "hw/intc/ioapic.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/usb/hcd-uhci.h" #include "hw/usb/hcd-uhci.h"
#include "qapi/error.h" #include "qapi/error.h"

2
hw/intc/apic.c
View File

@ -20,7 +20,7 @@
#include "qemu/thread.h" #include "qemu/thread.h"
#include "hw/i386/apic_internal.h" #include "hw/i386/apic_internal.h"
#include "hw/i386/apic.h" #include "hw/i386/apic.h"
#include "hw/i386/ioapic.h" #include "hw/intc/ioapic.h"
#include "hw/intc/i8259.h" #include "hw/intc/i8259.h"
#include "hw/intc/kvm_irqcount.h" #include "hw/intc/kvm_irqcount.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"

4
hw/intc/ioapic.c
View File

@ -24,10 +24,10 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/i386/apic.h" #include "hw/i386/apic.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h"
#include "hw/i386/x86.h" #include "hw/i386/x86.h"
#include "hw/intc/i8259.h" #include "hw/intc/i8259.h"
#include "hw/intc/ioapic.h"
#include "hw/intc/ioapic_internal.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

4
hw/intc/ioapic_common.c
View File

@ -24,9 +24,9 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "hw/i386/ioapic.h"
#include "hw/i386/ioapic_internal.h"
#include "hw/intc/intc.h" #include "hw/intc/intc.h"
#include "hw/intc/ioapic.h"
#include "hw/intc/ioapic_internal.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
/* ioapic_no count start from 0 to MAX_IOAPICS, /* ioapic_no count start from 0 to MAX_IOAPICS,

8
include/hw/i386/ioapic_internal.h → hw/intc/ioapic_internal.h
View File

@ -19,11 +19,11 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef QEMU_IOAPIC_INTERNAL_H #ifndef HW_INTC_IOAPIC_INTERNAL_H
#define QEMU_IOAPIC_INTERNAL_H #define HW_INTC_IOAPIC_INTERNAL_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/i386/ioapic.h" #include "hw/intc/ioapic.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "qemu/notify.h" #include "qemu/notify.h"
#include "qom/object.h" #include "qom/object.h"
@ -115,4 +115,4 @@ void ioapic_reset_common(DeviceState *dev);
void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level); void ioapic_stat_update_irq(IOAPICCommonState *s, int irq, int level);
#endif /* QEMU_IOAPIC_INTERNAL_H */ #endif /* HW_INTC_IOAPIC_INTERNAL_H */

2
include/hw/i386/x86.h
View File

@ -22,8 +22,8 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/nmi.h" #include "hw/nmi.h"
#include "hw/intc/ioapic.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/i386/ioapic.h"
#include "qom/object.h" #include "qom/object.h"
struct X86MachineClass { struct X86MachineClass {

6
include/hw/i386/ioapic.h → include/hw/intc/ioapic.h
View File

@ -17,8 +17,8 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef HW_IOAPIC_H #ifndef HW_INTC_IOAPIC_H
#define HW_IOAPIC_H #define HW_INTC_IOAPIC_H
#define IOAPIC_NUM_PINS 24 #define IOAPIC_NUM_PINS 24
#define IO_APIC_DEFAULT_ADDRESS 0xfec00000 #define IO_APIC_DEFAULT_ADDRESS 0xfec00000
@ -30,4 +30,4 @@
void ioapic_eoi_broadcast(int vector); void ioapic_eoi_broadcast(int vector);
#endif /* HW_IOAPIC_H */ #endif /* HW_INTC_IOAPIC_H */

2
target/i386/whpx/whpx-all.c
View File

@ -19,7 +19,7 @@
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/i386/ioapic.h" #include "hw/intc/ioapic.h"
#include "hw/i386/apic_internal.h" #include "hw/i386/apic_internal.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"