hv/mod-irq: use arch specific header files

Requires explicit arch path name in the include directive.

The config scripts was also updated to reflect this change.

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

hypervisor/common/event.c

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <cpu.h>
+#include <x86/cpu.h>
 #include <schedule.h>
 #include <event.h>
 #include <logmsg.h>

hypervisor/common/hv_main.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
-#include <vm_reset.h>
-#include <vmcs.h>
-#include <vmexit.h>
-#include <virq.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/vm_reset.h>
+#include <x86/guest/vmcs.h>
+#include <x86/guest/vmexit.h>
+#include <x86/guest/virq.h>
 #include <schedule.h>
 #include <profiling.h>
 #include <sprintf.h>

hypervisor/common/hypercall.c

@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
-#include <vmx.h>
+#include <x86/guest/vm.h>
+#include <x86/vmx.h>
 #include <schedule.h>
 #include <version.h>
 #include <reloc.h>
-#include <vtd.h>
-#include <per_cpu.h>
-#include <lapic.h>
-#include <assign.h>
-#include <ept.h>
-#include <mmu.h>
+#include <x86/vtd.h>
+#include <x86/per_cpu.h>
+#include <x86/lapic.h>
+#include <x86/guest/assign.h>
+#include <x86/guest/ept.h>
+#include <x86/mmu.h>
 #include <hypercall.h>
 #include <errno.h>
 #include <logmsg.h>
-#include <ioapic.h>
+#include <x86/ioapic.h>
 #include <mmio_dev.h>
 #include <ivshmem.h>
 #include <vmcs9900.h>
-#include <rtcm.h>
-#include <arch/x86/irq.h>
+#include <x86/rtcm.h>
+#include <x86/irq.h>
 
 #define DBG_LEVEL_HYCALL	6U
 

hypervisor/common/irq.c

@@ -5,11 +5,11 @@
  */
 
 #include <errno.h>
-#include <bits.h>
+#include <x86/lib/bits.h>
 #include <irq.h>
 #include <common/softirq.h>
-#include <arch/x86/irq.h>
-#include <arch/x86/per_cpu.h>
+#include <x86/irq.h>
+#include <x86/per_cpu.h>
 
 static spinlock_t irq_alloc_spinlock = { .head = 0U, .tail = 0U, };
 

hypervisor/common/ptdev.c

@@ -5,13 +5,13 @@
  */
 
 #include <hash.h>
-#include <per_cpu.h>
-#include <vm.h>
+#include <x86/per_cpu.h>
+#include <x86/guest/vm.h>
 #include <softirq.h>
 #include <ptdev.h>
 #include <irq.h>
 #include <logmsg.h>
-#include <vtd.h>
+#include <x86/vtd.h>
 
 #define PTIRQ_ENTRY_HASHBITS	9U
 #define PTIRQ_ENTRY_HASHSIZE	(1U << PTIRQ_ENTRY_HASHBITS)

hypervisor/common/sched_bvt.c

@@ -5,7 +5,7 @@
  */
 
 #include <list.h>
-#include <per_cpu.h>
+#include <x86/per_cpu.h>
 #include <schedule.h>
 
 #define BVT_MCU_MS	1U

hypervisor/common/schedule.c

@@ -6,13 +6,13 @@
 
 #include <rtl.h>
 #include <list.h>
-#include <bits.h>
-#include <cpu.h>
-#include <per_cpu.h>
-#include <lapic.h>
+#include <x86/lib/bits.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
+#include <x86/lapic.h>
 #include <schedule.h>
 #include <sprintf.h>
-#include <arch/x86/irq.h>
+#include <x86/irq.h>
 
 bool is_idle_thread(const struct thread_object *obj)
 {

hypervisor/common/softirq.c

@@ -5,9 +5,9 @@
  */
 
 #include <types.h>
-#include <bits.h>
-#include <cpu.h>
-#include <per_cpu.h>
+#include <x86/lib/bits.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
 #include <softirq.h>
 
 static softirq_handler softirq_handlers[NR_SOFTIRQS];

hypervisor/common/trusty_hypercall.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <hypercall.h>
 #include <errno.h>
 #include <logmsg.h>

hypervisor/common/vm_load.c

@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
-#include <e820.h>
-#include <zeropage.h>
-#include <ept.h>
-#include <mmu.h>
+#include <x86/guest/vm.h>
+#include <x86/e820.h>
+#include <x86/zeropage.h>
+#include <x86/guest/ept.h>
+#include <x86/mmu.h>
 #include <multiboot.h>
 #include <errno.h>
 #include <sprintf.h>