hv/mod_irq: do not include x86/irq.h in common/irq.h

Each .c file includes the arch specific irq header file (with full
path) by itself if required.

Tracked-On: #5825
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>

hypervisor/arch/x86/cpu.c

@@ -12,6 +12,7 @@
 #include <ept.h>
 #include <vtd.h>
 #include <lapic.h>
+#include <arch/x86/irq.h>
 #include <per_cpu.h>
 #include <cpufeatures.h>
 #include <cpu_caps.h>

hypervisor/arch/x86/guest/assign.c

@@ -13,6 +13,7 @@
 #include <per_cpu.h>
 #include <ioapic.h>
 #include <pgtable.h>
+#include <arch/x86/irq.h>
 
 /*
  * Check if the IRQ is single-destination and return the destination vCPU if so.

hypervisor/arch/x86/guest/vcpu.c

@@ -20,6 +20,7 @@
 #include <mmu.h>
 #include <sprintf.h>
 #include <lapic.h>
+#include <arch/x86/irq.h>
 
 /* stack_frame is linked with the sequence of stack operation in arch_switch_to() */
 struct stack_frame {

hypervisor/arch/x86/guest/virq.c

@@ -17,6 +17,7 @@
 #include <splitlock.h>
 #include <trace.h>
 #include <logmsg.h>
+#include <arch/x86/irq.h>
 
 #define EXCEPTION_ERROR_CODE_VALID  8U
 

hypervisor/arch/x86/guest/vlapic.c

@@ -45,6 +45,7 @@
 #include <ept.h>
 #include <trace.h>
 #include <logmsg.h>
+#include <arch/x86/irq.h>
 #include "vlapic_priv.h"
 
 #define VLAPIC_VERBOS 0

hypervisor/arch/x86/guest/vm.c

@@ -37,6 +37,7 @@
 #include <assign.h>
 #include <vgpio.h>
 #include <rtcm.h>
+#include <arch/x86/irq.h>
 
 /* Local variables */
 

hypervisor/arch/x86/ioapic.c

@@ -9,6 +9,7 @@
 #include <spinlock.h>
 #include <ioapic.h>
 #include <irq.h>
+#include <arch/x86/irq.h>
 #include <pgtable.h>
 #include <io.h>
 #include <mmu.h>

hypervisor/arch/x86/irq.c

@@ -10,11 +10,10 @@
 #include <spinlock.h>
 #include <per_cpu.h>
 #include <io.h>
-#include <irq.h>
-#include <idt.h>
-#include <ioapic.h>
-#include <lapic.h>
-#include <softirq.h>
+#include <arch/x86/irq.h>
+#include <arch/x86/idt.h>
+#include <arch/x86/ioapic.h>
+#include <arch/x86/lapic.h>
 #include <dump.h>
 #include <logmsg.h>
 #include <vmx.h>

hypervisor/arch/x86/notify.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <bits.h>
 #include <atomic.h>
-#include <irq.h>
+#include <arch/x86/irq.h>
 #include <cpu.h>
 #include <per_cpu.h>
 #include <lapic.h>

hypervisor/arch/x86/timer.c

@@ -13,6 +13,7 @@
 #include <cpu_caps.h>
 #include <softirq.h>
 #include <trace.h>
+#include <arch/x86/irq.h>
 
 #define MAX_TIMER_ACTIONS	32U
 #define CAL_MS			10U

hypervisor/arch/x86/vtd.c

@@ -13,6 +13,7 @@
 #include <page.h>
 #include <pgtable.h>
 #include <irq.h>
+#include <arch/x86/irq.h>
 #include <io.h>
 #include <mmu.h>
 #include <lapic.h>

hypervisor/common/hypercall.c

@@ -23,6 +23,7 @@
 #include <ivshmem.h>
 #include <vmcs9900.h>
 #include <rtcm.h>
+#include <arch/x86/irq.h>
 
 #define DBG_LEVEL_HYCALL	6U
 

hypervisor/common/irq.c

@@ -8,6 +8,7 @@
 #include <bits.h>
 #include <irq.h>
 #include <common/softirq.h>
+#include <arch/x86/irq.h>
 #include <arch/x86/per_cpu.h>
 
 static spinlock_t irq_alloc_spinlock = { .head = 0U, .tail = 0U, };

hypervisor/common/schedule.c

@@ -12,6 +12,7 @@
 #include <lapic.h>
 #include <schedule.h>
 #include <sprintf.h>
+#include <arch/x86/irq.h>
 
 bool is_idle_thread(const struct thread_object *obj)
 {

hypervisor/debug/profiling.c

@@ -7,7 +7,7 @@
 
 #include <types.h>
 #include <errno.h>
-#include <irq.h>
+#include <arch/x86/irq.h>
 #include <per_cpu.h>
 #include <pgtable.h>
 #include <vmx.h>

hypervisor/debug/shell.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <bits.h>
 #include "shell_priv.h"
-#include <irq.h>
+#include <arch/x86/irq.h>
 #include <console.h>
 #include <per_cpu.h>
 #include <vmx.h>

hypervisor/dm/io_req.c

@@ -4,7 +4,7 @@
  */
 
 #include <vm.h>
-#include <irq.h>
+#include <arch/x86/irq.h>
 #include <errno.h>
 #include <logmsg.h>
 

hypervisor/dm/vioapic.c

@@ -32,7 +32,7 @@
 
 #include <vm.h>
 #include <errno.h>
-#include <irq.h>
+#include <arch/x86/irq.h>
 #include <ept.h>
 #include <assign.h>
 #include <logmsg.h>

hypervisor/dm/vpic.c

@@ -34,6 +34,7 @@
 #include <spinlock.h>
 #include <logmsg.h>
 #include <ioapic.h>
+#include <arch/x86/irq.h>
 
 #define DBG_LEVEL_PIC	6U
 

hypervisor/include/arch/x86/irq.h

@@ -7,9 +7,7 @@
 #ifndef ARCH_X86_IRQ_H
 #define ARCH_X86_IRQ_H
 
-#include <acrn_common.h>
-#include <util.h>
-#include <spinlock.h>
+#include <types.h>
 
 /**
  * @file arch/x86/irq.h

hypervisor/include/common/irq.h

@@ -7,11 +7,9 @@
 #ifndef COMMON_IRQ_H
 #define COMMON_IRQ_H
 
-#include <types.h>
+#include <lib/util.h>
 #include <spinlock.h>
 
-#include <arch/x86/irq.h>
-
 /**
  * @file common/irq.h
  *