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/debug/console.c

@@ -8,11 +8,11 @@
 #include <pci.h>
 #include <uart16550.h>
 #include <shell.h>
-#include <timer.h>
+#include <x86/timer.h>
 #include <vuart.h>
 #include <logmsg.h>
 #include <acrn_hv_defs.h>
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <console.h>
 #include <multiboot.h>
 #include <dbg_cmd.h>

hypervisor/debug/dump.c

@@ -5,12 +5,12 @@
  */
 
 #include <types.h>
-#include <per_cpu.h>
-#include <mmu.h>
-#include <vcpu.h>
-#include <vmx.h>
-#include <vm.h>
-#include <init.h>
+#include <x86/per_cpu.h>
+#include <x86/mmu.h>
+#include <x86/guest/vcpu.h>
+#include <x86/vmx.h>
+#include <x86/guest/vm.h>
+#include <x86/init.h>
 #include <logmsg.h>
 #include <dump.h>
 #include <reloc.h>

hypervisor/debug/hypercall.c

@@ -10,7 +10,7 @@
 #include <sbuf.h>
 #include <hypercall.h>
 #include <npk_log.h>
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <logmsg.h>
 
 #ifdef PROFILING_ON

hypervisor/debug/logmsg.c

@@ -5,10 +5,10 @@
  */
 
 #include <types.h>
-#include <atomic.h>
+#include <x86/lib/atomic.h>
 #include <sprintf.h>
-#include <spinlock.h>
-#include <per_cpu.h>
+#include <x86/lib/spinlock.h>
+#include <x86/per_cpu.h>
 #include <npk_log.h>
 #include <logmsg.h>
 

hypervisor/debug/npk_log.c

@@ -4,11 +4,11 @@
  */
 
 #include <types.h>
-#include <atomic.h>
+#include <x86/lib/atomic.h>
 #include <acrn_hv_defs.h>
-#include <io.h>
-#include <per_cpu.h>
-#include <mmu.h>
+#include <x86/io.h>
+#include <x86/per_cpu.h>
+#include <x86/mmu.h>
 #include <logmsg.h>
 #include <npk_log.h>
 

hypervisor/debug/profiling.c

@@ -7,12 +7,12 @@
 
 #include <types.h>
 #include <errno.h>
-#include <arch/x86/irq.h>
-#include <per_cpu.h>
-#include <pgtable.h>
-#include <vmx.h>
-#include <cpuid.h>
-#include <vm.h>
+#include <x86/irq.h>
+#include <x86/per_cpu.h>
+#include <x86/pgtable.h>
+#include <x86/vmx.h>
+#include <x86/cpuid.h>
+#include <x86/guest/vm.h>
 #include <sprintf.h>
 #include <logmsg.h>
 

hypervisor/debug/sbuf.c

@@ -12,8 +12,8 @@
 #include <types.h>
 #include <rtl.h>
 #include <errno.h>
-#include <cpu.h>
-#include <per_cpu.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
 
 uint32_t sbuf_next_ptr(uint32_t pos_arg,
 		uint32_t span, uint32_t scope)

hypervisor/debug/shell.c

@@ -6,22 +6,22 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
+#include <x86/lib/bits.h>
 #include "shell_priv.h"
-#include <arch/x86/irq.h>
+#include <x86/irq.h>
 #include <console.h>
-#include <per_cpu.h>
-#include <vmx.h>
-#include <cpuid.h>
-#include <ioapic.h>
+#include <x86/per_cpu.h>
+#include <x86/vmx.h>
+#include <x86/cpuid.h>
+#include <x86/ioapic.h>
 #include <ptdev.h>
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <sprintf.h>
 #include <logmsg.h>
 #include <version.h>
 #include <shell.h>
-#include <vmcs.h>
-#include <host_pm.h>
+#include <x86/guest/vmcs.h>
+#include <x86/host_pm.h>
 
 #define TEMP_STR_SIZE		60U
 #define MAX_STR_SIZE		256U

hypervisor/debug/shell_priv.h

@@ -7,7 +7,7 @@
 #ifndef SHELL_PRIV_H
 #define SHELL_PRIV_H
 
-#include <spinlock.h>
+#include <x86/lib/spinlock.h>
 
 #define SHELL_CMD_MAX_LEN		100U
 #define SHELL_STRING_MAX_LEN		(PAGE_SIZE << 2U)

hypervisor/debug/trace.c

@@ -5,7 +5,7 @@
  */
 
 #include <types.h>
-#include <per_cpu.h>
+#include <x86/per_cpu.h>
 #include <trace.h>
 
 #define TRACE_CUSTOM			0xFCU

hypervisor/debug/uart16550.c

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include  <types.h>
-#include <spinlock.h>
+#include <types.h>
+#include <x86/lib/spinlock.h>
 #include <pci.h>
-#include <pgtable.h>
+#include <x86/pgtable.h>
 #include <uart16550.h>
-#include <io.h>
-#include <mmu.h>
+#include <x86/io.h>
+#include <x86/mmu.h>
 
 #define MAX_BDF_LEN 8