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/include/arch/x86/apicreg.h

@@ -29,7 +29,7 @@
 #ifndef APICREG_H
 #define APICREG_H
 
-#include <page.h>
+#include <x86/page.h>
 
 /*
  * Local && I/O APIC definitions.

hypervisor/include/arch/x86/board.h

@@ -8,7 +8,7 @@
 
 #include <types.h>
 #include <board_info.h>
-#include <host_pm.h>
+#include <x86/host_pm.h>
 #include <pci.h>
 #include <misc_cfg.h>
 

hypervisor/include/arch/x86/gdt.h

@@ -69,7 +69,7 @@
 #ifndef ASSEMBLER
 
 #include <types.h>
-#include <cpu.h>
+#include <x86/cpu.h>
 
 #define TSS_AVAIL  (9U)
 

hypervisor/include/arch/x86/guest/hyperv.h

@@ -7,7 +7,7 @@
 #ifndef HYPERV_H
 #define HYPERV_H
 
-#include <vcpuid.h>
+#include <x86/guest/vcpuid.h>
 
 /* Hyper-V MSR numbers */
 #define HV_X64_MSR_GUEST_OS_ID		0x40000000U

hypervisor/include/arch/x86/guest/instr_emul.h

@@ -31,8 +31,8 @@
 #define INSTR_EMUL_H
 
 #include <types.h>
-#include <cpu.h>
-#include <guest_memory.h>
+#include <x86/cpu.h>
+#include <x86/guest/guest_memory.h>
 
 struct acrn_vcpu;
 struct instr_emul_vie_op {

hypervisor/include/arch/x86/guest/trusty.h

@@ -7,7 +7,7 @@
 #ifndef TRUSTY_H_
 #define TRUSTY_H_
 #include <acrn_hv_defs.h>
-#include <seed.h>
+#include <x86/seed.h>
 
 #define RPMB_MAX_PARTITION_NUMBER       6U
 #define MMC_PROD_NAME_WITH_PSN_LEN      15U

hypervisor/include/arch/x86/guest/vcpu.h

@@ -17,17 +17,17 @@
 #ifndef ASSEMBLER
 
 #include <acrn_common.h>
-#include <guest_memory.h>
-#include <virtual_cr.h>
-#include <vlapic.h>
-#include <vmtrr.h>
+#include <x86/guest/guest_memory.h>
+#include <x86/guest/virtual_cr.h>
+#include <x86/guest/vlapic.h>
+#include <x86/guest/vmtrr.h>
 #include <schedule.h>
 #include <event.h>
 #include <io_req.h>
-#include <msr.h>
-#include <cpu.h>
-#include <instr_emul.h>
-#include <vmx.h>
+#include <x86/msr.h>
+#include <x86/cpu.h>
+#include <x86/guest/instr_emul.h>
+#include <x86/vmx.h>
 
 /**
  * @brief vcpu

hypervisor/include/arch/x86/guest/vlapic.h

@@ -30,9 +30,9 @@
 #ifndef VLAPIC_H
 #define VLAPIC_H
 
-#include <page.h>
-#include <timer.h>
-#include <apicreg.h>
+#include <x86/page.h>
+#include <x86/timer.h>
+#include <x86/apicreg.h>
 
 /**
  * @file vlapic.h

hypervisor/include/arch/x86/guest/vm.h

@@ -13,22 +13,22 @@
 
 #ifndef ASSEMBLER
 
-#include <bits.h>
-#include <spinlock.h>
-#include <pgtable.h>
-#include <vcpu.h>
+#include <x86/lib/bits.h>
+#include <x86/lib/spinlock.h>
+#include <x86/pgtable.h>
+#include <x86/guest/vcpu.h>
 #include <vioapic.h>
 #include <vpic.h>
-#include <vmx_io.h>
+#include <x86/guest/vmx_io.h>
 #include <vuart.h>
-#include <trusty.h>
-#include <vcpuid.h>
+#include <x86/guest/trusty.h>
+#include <x86/guest/vcpuid.h>
 #include <vpci.h>
-#include <cpu_caps.h>
-#include <e820.h>
-#include <vm_config.h>
+#include <x86/cpu_caps.h>
+#include <x86/e820.h>
+#include <x86/vm_config.h>
 #ifdef CONFIG_HYPERV_ENABLED
-#include <hyperv.h>
+#include <x86/guest/hyperv.h>
 #endif
 
 enum reset_mode {

hypervisor/include/arch/x86/guest/vmcs.h

@@ -12,7 +12,7 @@
 
 #ifndef ASSEMBLER
 #include <types.h>
-#include <vcpu.h>
+#include <x86/guest/vcpu.h>
 
 #define VMX_VMENTRY_FAIL                0x80000000U
 

hypervisor/include/arch/x86/ioapic.h

@@ -7,7 +7,7 @@
 #ifndef ARCH_X86_IOAPIC_H
 #define ARCH_X86_IOAPIC_H
 
-#include <apicreg.h>
+#include <x86/apicreg.h>
 
 #define NR_LEGACY_IRQ		16U
 #define NR_LEGACY_PIN		NR_LEGACY_IRQ

hypervisor/include/arch/x86/lib/bits.h

@@ -29,7 +29,7 @@
 
 #ifndef BITS_H
 #define BITS_H
-#include <atomic.h>
+#include <x86/lib/atomic.h>
 
 /**
  *

hypervisor/include/arch/x86/mmu.h

@@ -44,10 +44,10 @@
 
 #ifndef ASSEMBLER
 
-#include <cpu.h>
-#include <page.h>
-#include <pgtable.h>
-#include <cpu_caps.h>
+#include <x86/cpu.h>
+#include <x86/page.h>
+#include <x86/pgtable.h>
+#include <x86/cpu_caps.h>
 
 /* Define cache line size (in bytes) */
 #define CACHE_LINE_SIZE		64U

hypervisor/include/arch/x86/page.h

@@ -7,7 +7,7 @@
 #ifndef PAGE_H
 #define PAGE_H
 
-#include <spinlock.h>
+#include <x86/lib/spinlock.h>
 
 #define PAGE_SHIFT	12U
 #define PAGE_SIZE	(1U << PAGE_SHIFT)

hypervisor/include/arch/x86/pci_dev.h

@@ -7,7 +7,7 @@
 #ifndef PCI_DEV_H_
 #define PCI_DEV_H_
 
-#include <vm_config.h>
+#include <x86/vm_config.h>
 
 extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM];
 

hypervisor/include/arch/x86/per_cpu.h

@@ -10,15 +10,15 @@
 #include <types.h>
 #include <sbuf.h>
 #include <irq.h>
-#include <notify.h>
-#include <page.h>
-#include <timer.h>
+#include <x86/notify.h>
+#include <x86/page.h>
+#include <x86/timer.h>
 #include <profiling.h>
 #include <logmsg.h>
-#include <gdt.h>
+#include <x86/gdt.h>
 #include <schedule.h>
-#include <security.h>
-#include <vm_config.h>
+#include <x86/security.h>
+#include <x86/vm_config.h>
 
 struct per_cpu_region {
 	/* vmxon_region MUST be 4KB-aligned */

hypervisor/include/arch/x86/pgtable.h

@@ -11,7 +11,7 @@
 #ifndef PGTABLE_H
 #define PGTABLE_H
 
-#include <page.h>
+#include <x86/page.h>
 
 #define PAGE_PRESENT		(1UL << 0U)
 #define PAGE_RW			(1UL << 1U)

hypervisor/include/arch/x86/rtcm.h

@@ -7,7 +7,7 @@
 #ifndef RTCM_H
 #define RTCM_H
 
-#include <rtct.h>
+#include <x86/rtct.h>
 
 #define MSABI __attribute__((ms_abi))
 

hypervisor/include/arch/x86/vm_config.h

@@ -14,7 +14,7 @@
 #include <acrn_common.h>
 #include <vm_uuids.h>
 #include <vm_configurations.h>
-#include <sgx.h>
+#include <x86/sgx.h>
 #include <acrn_hv_defs.h>
 
 #define CONFIG_MAX_VM_NUM	(PRE_VM_NUM + SOS_VM_NUM + MAX_POST_VM_NUM)

hypervisor/include/arch/x86/zeropage.h

@@ -6,7 +6,7 @@
 
 #ifndef ZEROPAGE_H
 #define ZEROPAGE_H
-#include <e820.h>
+#include <x86/e820.h>
 #include <efi.h>
 
 struct zero_page {