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/arch/x86/configs/pci_dev.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm_config.h>
+#include <x86/vm_config.h>
 #include <pci.h>
-#include <pci_dev.h>
+#include <x86/pci_dev.h>
 #include <vpci.h>
 
 /*

hypervisor/arch/x86/configs/vacpi.c

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

hypervisor/arch/x86/configs/vm_config.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm_config.h>
+#include <x86/vm_config.h>
 
 /*
  * @pre vm_id < CONFIG_MAX_VM_NUM

hypervisor/arch/x86/cpu.c

@@ -5,32 +5,32 @@
  */
 
 #include <types.h>
-#include <bits.h>
-#include <page.h>
-#include <e820.h>
-#include <mmu.h>
-#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>
+#include <x86/lib/bits.h>
+#include <x86/page.h>
+#include <x86/e820.h>
+#include <x86/mmu.h>
+#include <x86/guest/ept.h>
+#include <x86/vtd.h>
+#include <x86/lapic.h>
+#include <x86/irq.h>
+#include <x86/per_cpu.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpu_caps.h>
 #include <acpi.h>
-#include <ioapic.h>
-#include <trampoline.h>
-#include <cpuid.h>
+#include <x86/ioapic.h>
+#include <x86/trampoline.h>
+#include <x86/cpuid.h>
 #include <version.h>
-#include <vmx.h>
-#include <msr.h>
+#include <x86/vmx.h>
+#include <x86/msr.h>
 #include <ptdev.h>
 #include <logmsg.h>
-#include <rdt.h>
-#include <sgx.h>
+#include <x86/rdt.h>
+#include <x86/sgx.h>
 #include <uart16550.h>
 #include <vpci.h>
 #include <ivshmem.h>
-#include <rtcm.h>
+#include <x86/rtcm.h>
 
 #define CPU_UP_TIMEOUT		100U /* millisecond */
 #define CPU_DOWN_TIMEOUT	100U /* millisecond */

hypervisor/arch/x86/cpu_caps.c

@@ -5,17 +5,17 @@
  */
 
 #include <types.h>
-#include <msr.h>
-#include <page.h>
-#include <cpufeatures.h>
-#include <cpuid.h>
-#include <cpu.h>
-#include <per_cpu.h>
-#include <vmx.h>
-#include <cpu_caps.h>
+#include <x86/msr.h>
+#include <x86/page.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpuid.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
+#include <x86/vmx.h>
+#include <x86/cpu_caps.h>
 #include <errno.h>
 #include <logmsg.h>
-#include <vmcs.h>
+#include <x86/guest/vmcs.h>
 
 /* TODO: add more capability per requirement */
 /* APICv features */

hypervisor/arch/x86/cpu_state_tbl.c

@@ -7,9 +7,9 @@
 #include <types.h>
 #include <rtl.h>
 #include <acrn_common.h>
-#include <host_pm.h>
-#include <cpu_caps.h>
-#include <board.h>
+#include <x86/host_pm.h>
+#include <x86/cpu_caps.h>
+#include <x86/board.h>
 
 /* The table includes cpu px info of Intel A3960 SoC */
 static const struct cpu_px_data px_a3960[17] = {

hypervisor/arch/x86/e820.c

@@ -6,12 +6,12 @@
 
 #include <types.h>
 #include <acrn_hv_defs.h>
-#include <page.h>
-#include <e820.h>
-#include <mmu.h>
+#include <x86/page.h>
+#include <x86/e820.h>
+#include <x86/mmu.h>
 #include <multiboot.h>
 #include <logmsg.h>
-#include <ept.h>
+#include <x86/guest/ept.h>
 
 /*
  * e820.c contains the related e820 operations; like HV to get memory info for its MMU setup;

hypervisor/arch/x86/gdt.c

@@ -5,8 +5,8 @@
  */
 
 #include <types.h>
-#include <gdt.h>
-#include <per_cpu.h>
+#include <x86/gdt.h>
+#include <x86/per_cpu.h>
 
 static void set_tss_desc(struct tss_64_descriptor *desc,
 		uint64_t tss, size_t tss_limit, uint32_t type)

hypervisor/arch/x86/guest/assign.c

@@ -6,14 +6,14 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <vm.h>
-#include <vtd.h>
+#include <x86/lib/bits.h>
+#include <x86/guest/vm.h>
+#include <x86/vtd.h>
 #include <ptdev.h>
-#include <per_cpu.h>
-#include <ioapic.h>
-#include <pgtable.h>
-#include <arch/x86/irq.h>
+#include <x86/per_cpu.h>
+#include <x86/ioapic.h>
+#include <x86/pgtable.h>
+#include <x86/irq.h>
 
 /*
  * Check if the IRQ is single-destination and return the destination vCPU if so.

hypervisor/arch/x86/guest/ept.c

@@ -6,16 +6,16 @@
 
 #include <types.h>
 #include <errno.h>
-#include <vm.h>
-#include <virq.h>
-#include <pgtable.h>
-#include <mmu.h>
-#include <ept.h>
-#include <vmx.h>
-#include <vtd.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/virq.h>
+#include <x86/pgtable.h>
+#include <x86/mmu.h>
+#include <x86/guest/ept.h>
+#include <x86/vmx.h>
+#include <x86/vtd.h>
 #include <logmsg.h>
 #include <trace.h>
-#include <rtct.h>
+#include <x86/rtct.h>
 
 #define DBG_LEVEL_EPT	6U
 

hypervisor/arch/x86/guest/guest_memory.c

@@ -6,13 +6,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <vmx.h>
-#include <guest_memory.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <vmcs.h>
-#include <mmu.h>
-#include <ept.h>
+#include <x86/vmx.h>
+#include <x86/guest/guest_memory.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/vmcs.h>
+#include <x86/mmu.h>
+#include <x86/guest/ept.h>
 #include <logmsg.h>
 
 struct page_walk_info {

hypervisor/arch/x86/guest/hyperv.c

@@ -8,10 +8,10 @@
  */
 
 #include <types.h>
-#include <vm.h>
+#include <x86/guest/vm.h>
 #include <logmsg.h>
-#include <vmx.h>
-#include <hyperv.h>
+#include <x86/vmx.h>
+#include <x86/guest/hyperv.h>
 
 #define DBG_LEVEL_HYPERV		6U
 

hypervisor/arch/x86/guest/instr_emul.c

@@ -30,13 +30,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <instr_emul.h>
-#include <vmx.h>
-#include <vmcs.h>
-#include <mmu.h>
-#include <per_cpu.h>
+#include <x86/guest/instr_emul.h>
+#include <x86/vmx.h>
+#include <x86/guest/vmcs.h>
+#include <x86/mmu.h>
+#include <x86/per_cpu.h>
 #include <logmsg.h>
-#include <virq.h>
+#include <x86/guest/virq.h>
 
 #define CPU_REG_FIRST			CPU_REG_RAX
 #define CPU_REG_LAST			CPU_REG_GDTR

hypervisor/arch/x86/guest/pm.c

@@ -5,13 +5,13 @@
  */
 
 #include <types.h>
-#include <host_pm.h>
-#include <vm.h>
-#include <io.h>
+#include <x86/host_pm.h>
+#include <x86/guest/vm.h>
+#include <x86/io.h>
 #include <logmsg.h>
 #include <platform_acpi_info.h>
-#include <guest_pm.h>
-#include <per_cpu.h>
+#include <x86/guest/guest_pm.h>
+#include <x86/per_cpu.h>
 
 int32_t validate_pstate(const struct acrn_vm *vm, uint64_t perf_ctl)
 {

hypervisor/arch/x86/guest/splitlock.c

@@ -5,14 +5,14 @@
  */
 
 #include <types.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <virq.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/virq.h>
 #include <event.h>
-#include <cpu_caps.h>
+#include <x86/cpu_caps.h>
 #include <logmsg.h>
 #include <errno.h>
-#include <splitlock.h>
+#include <x86/guest/splitlock.h>
 
 static bool is_guest_ac_enabled(struct acrn_vcpu *vcpu)
 {

hypervisor/arch/x86/guest/trusty.c

@@ -5,18 +5,18 @@
  */
 
 #include <types.h>
-#include <bits.h>
+#include <x86/lib/bits.h>
 #include <crypto_api.h>
-#include <trusty.h>
-#include <page.h>
-#include <pgtable.h>
-#include <mmu.h>
-#include <ept.h>
-#include <vm.h>
-#include <vmx.h>
-#include <security.h>
+#include <x86/guest/trusty.h>
+#include <x86/page.h>
+#include <x86/pgtable.h>
+#include <x86/mmu.h>
+#include <x86/guest/ept.h>
+#include <x86/guest/vm.h>
+#include <x86/vmx.h>
+#include <x86/security.h>
 #include <logmsg.h>
-#include <seed.h>
+#include <x86/seed.h>
 
 #define TRUSTY_VERSION   1U
 #define TRUSTY_VERSION_2 2U

hypervisor/arch/x86/guest/ucode.c

@@ -6,13 +6,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <spinlock.h>
-#include <cpu.h>
-#include <msr.h>
-#include <cpuid.h>
-#include <ucode.h>
-#include <guest_memory.h>
-#include <virq.h>
+#include <x86/lib/spinlock.h>
+#include <x86/cpu.h>
+#include <x86/msr.h>
+#include <x86/cpuid.h>
+#include <x86/guest/ucode.h>
+#include <x86/guest/guest_memory.h>
+#include <x86/guest/virq.h>
 #include <logmsg.h>
 
 #define MICRO_CODE_SIZE_MAX    0x40000U

hypervisor/arch/x86/guest/vcpu.c

@@ -6,21 +6,21 @@
 
 #include <types.h>
 #include <errno.h>
-#include <vcpu.h>
-#include <virq.h>
-#include <bits.h>
-#include <vmx.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/virq.h>
+#include <x86/lib/bits.h>
+#include <x86/vmx.h>
 #include <logmsg.h>
-#include <cpufeatures.h>
-#include <cpu_caps.h>
-#include <per_cpu.h>
-#include <init.h>
-#include <vm.h>
-#include <vmcs.h>
-#include <mmu.h>
-#include <sprintf.h>
-#include <lapic.h>
-#include <arch/x86/irq.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpu_caps.h>
+#include <x86/per_cpu.h>
+#include <x86/init.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/vmcs.h>
+#include <x86/mmu.h>
+#include <lib/sprintf.h>
+#include <x86/lapic.h>
+#include <x86/irq.h>
 
 /* stack_frame is linked with the sequence of stack operation in arch_switch_to() */
 struct stack_frame {

hypervisor/arch/x86/guest/vcpuid.c

@@ -6,13 +6,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <cpuid.h>
-#include <cpufeatures.h>
-#include <vmx.h>
-#include <sgx.h>
+#include <x86/lib/bits.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/cpuid.h>
+#include <x86/cpufeatures.h>
+#include <x86/vmx.h>
+#include <x86/sgx.h>
 #include <logmsg.h>
 
 static inline const struct vcpuid_entry *local_find_vcpuid_entry(const struct acrn_vcpu *vcpu,

hypervisor/arch/x86/guest/ve820.c

@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <e820.h>
-#include <mmu.h>
-#include <vm.h>
+#include <x86/e820.h>
+#include <x86/mmu.h>
+#include <x86/guest/vm.h>
 #include <reloc.h>
 #include <vacpi.h>
 #include <logmsg.h>
-#include <rtcm.h>
+#include <x86/rtcm.h>
 
 #define ENTRY_HPA1_LOW_PART1	2U
 #define ENTRY_HPA1_LOW_PART2	4U

hypervisor/arch/x86/guest/virq.c

@@ -6,18 +6,18 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <virq.h>
-#include <lapic.h>
-#include <mmu.h>
-#include <vmx.h>
-#include <vcpu.h>
-#include <vmcs.h>
-#include <vm.h>
-#include <splitlock.h>
+#include <x86/lib/bits.h>
+#include <x86/guest/virq.h>
+#include <x86/lapic.h>
+#include <x86/mmu.h>
+#include <x86/vmx.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vmcs.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/splitlock.h>
 #include <trace.h>
 #include <logmsg.h>
-#include <arch/x86/irq.h>
+#include <x86/irq.h>
 
 #define EXCEPTION_ERROR_CODE_VALID  8U
 

hypervisor/arch/x86/guest/virtual_cr.c

@@ -8,16 +8,16 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <virq.h>
-#include <mmu.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <vmx.h>
-#include <vtd.h>
-#include <vmexit.h>
-#include <pgtable.h>
-#include <cpufeatures.h>
+#include <x86/lib/bits.h>
+#include <x86/guest/virq.h>
+#include <x86/mmu.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/vmx.h>
+#include <x86/vtd.h>
+#include <x86/guest/vmexit.h>
+#include <x86/pgtable.h>
+#include <x86/cpufeatures.h>
 #include <trace.h>
 #include <logmsg.h>
 

hypervisor/arch/x86/guest/vlapic.c

@@ -31,21 +31,21 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <atomic.h>
-#include <per_cpu.h>
-#include <pgtable.h>
-#include <lapic.h>
-#include <vmcs.h>
-#include <vlapic.h>
-#include <virq.h>
+#include <x86/lib/bits.h>
+#include <x86/lib/atomic.h>
+#include <x86/per_cpu.h>
+#include <x86/pgtable.h>
+#include <x86/lapic.h>
+#include <x86/guest/vmcs.h>
+#include <x86/guest/vlapic.h>
+#include <x86/guest/virq.h>
 #include <ptdev.h>
-#include <vmx.h>
-#include <vm.h>
-#include <ept.h>
+#include <x86/vmx.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/ept.h>
 #include <trace.h>
 #include <logmsg.h>
-#include <arch/x86/irq.h>
+#include <x86/irq.h>
 #include "vlapic_priv.h"
 
 #define VLAPIC_VERBOS 0

hypervisor/arch/x86/guest/vm.c

@@ -7,37 +7,37 @@
 #include <types.h>
 #include <errno.h>
 #include <sprintf.h>
-#include <per_cpu.h>
-#include <lapic.h>
-#include <vm.h>
-#include <vm_reset.h>
-#include <virq.h>
-#include <bits.h>
-#include <e820.h>
+#include <x86/per_cpu.h>
+#include <x86/lapic.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/vm_reset.h>
+#include <x86/guest/virq.h>
+#include <x86/lib/bits.h>
+#include <x86/e820.h>
 #include <multiboot.h>
-#include <vtd.h>
+#include <x86/vtd.h>
 #include <reloc.h>
-#include <ept.h>
-#include <guest_pm.h>
+#include <x86/guest/ept.h>
+#include <x86/guest/guest_pm.h>
 #include <console.h>
 #include <ptdev.h>
-#include <vmcs.h>
-#include <pgtable.h>
-#include <mmu.h>
+#include <x86/guest/vmcs.h>
+#include <x86/pgtable.h>
+#include <x86/mmu.h>
 #include <logmsg.h>
 #include <vboot_info.h>
-#include <board.h>
-#include <sgx.h>
+#include <x86/board.h>
+#include <x86/sgx.h>
 #include <sbuf.h>
-#include <pci_dev.h>
+#include <x86/pci_dev.h>
 #include <vacpi.h>
-#include <platform_caps.h>
+#include <x86/platform_caps.h>
 #include <mmio_dev.h>
-#include <trampoline.h>
-#include <assign.h>
+#include <x86/trampoline.h>
+#include <x86/guest/assign.h>
 #include <vgpio.h>
-#include <rtcm.h>
-#include <arch/x86/irq.h>
+#include <x86/rtcm.h>
+#include <x86/irq.h>
 
 /* Local variables */
 

hypervisor/arch/x86/guest/vm_reset.c

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vm.h>
-#include <io.h>
-#include <host_pm.h>
+#include <x86/guest/vm.h>
+#include <x86/io.h>
+#include <x86/host_pm.h>
 #include <logmsg.h>
-#include <per_cpu.h>
-#include <vm_reset.h>
+#include <x86/per_cpu.h>
+#include <x86/guest/vm_reset.h>
 
 /**
  * @pre vm != NULL

hypervisor/arch/x86/guest/vmcall.c

@@ -6,10 +6,10 @@
 
 #include <types.h>
 #include <errno.h>
-#include <spinlock.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <virq.h>
+#include <x86/lib/spinlock.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/virq.h>
 #include <acrn_hv_defs.h>
 #include <hypercall.h>
 #include <trace.h>

hypervisor/arch/x86/guest/vmcs.c

@@ -7,16 +7,16 @@
  */
 
 #include <types.h>
-#include <vmcs.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <vmx.h>
-#include <gdt.h>
-#include <pgtable.h>
-#include <per_cpu.h>
-#include <cpu_caps.h>
-#include <cpufeatures.h>
-#include <vmexit.h>
+#include <x86/guest/vmcs.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/vmx.h>
+#include <x86/gdt.h>
+#include <x86/pgtable.h>
+#include <x86/per_cpu.h>
+#include <x86/cpu_caps.h>
+#include <x86/cpufeatures.h>
+#include <x86/guest/vmexit.h>
 #include <logmsg.h>
 
 /* rip, rsp, ia32_efer and rflags are written to VMCS in start_vcpu */

hypervisor/arch/x86/guest/vmexit.c

@@ -6,21 +6,21 @@
 
 #include <types.h>
 #include <errno.h>
-#include <vmx.h>
-#include <virq.h>
-#include <mmu.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <vmexit.h>
-#include <vm_reset.h>
-#include <vmx_io.h>
-#include <splitlock.h>
-#include <ept.h>
-#include <vtd.h>
-#include <cpuid.h>
-#include <vcpuid.h>
+#include <x86/vmx.h>
+#include <x86/guest/virq.h>
+#include <x86/mmu.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/vmexit.h>
+#include <x86/guest/vm_reset.h>
+#include <x86/guest/vmx_io.h>
+#include <x86/guest/splitlock.h>
+#include <x86/guest/ept.h>
+#include <x86/vtd.h>
+#include <x86/cpuid.h>
+#include <x86/guest/vcpuid.h>
 #include <trace.h>
-#include <rtcm.h>
+#include <x86/rtcm.h>
 
 /*
  * According to "SDM APPENDIX C VMX BASIC EXIT REASONS",

hypervisor/arch/x86/guest/vmsr.c

@@ -6,17 +6,17 @@
 
 #include <types.h>
 #include <errno.h>
-#include <pgtable.h>
-#include <msr.h>
-#include <cpuid.h>
-#include <vcpu.h>
-#include <virq.h>
-#include <vm.h>
-#include <vmx.h>
-#include <sgx.h>
-#include <guest_pm.h>
-#include <ucode.h>
-#include <rdt.h>
+#include <x86/pgtable.h>
+#include <x86/msr.h>
+#include <x86/cpuid.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/virq.h>
+#include <x86/guest/vm.h>
+#include <x86/vmx.h>
+#include <x86/sgx.h>
+#include <x86/guest/guest_pm.h>
+#include <x86/guest/ucode.h>
+#include <x86/rdt.h>
 #include <trace.h>
 #include <logmsg.h>
 

hypervisor/arch/x86/guest/vmtrr.c

@@ -4,12 +4,12 @@
  */
 
 #include <types.h>
-#include <vmtrr.h>
-#include <msr.h>
-#include <pgtable.h>
-#include <ept.h>
-#include <vcpu.h>
-#include <vm.h>
+#include <x86/guest/vmtrr.h>
+#include <x86/msr.h>
+#include <x86/pgtable.h>
+#include <x86/guest/ept.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
 #include <logmsg.h>
 
 #define MTRR_FIXED_RANGE_ALL_WB (MTRR_MEM_TYPE_WB \

hypervisor/arch/x86/guest/vmx_asm.S

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <vmcs.h>
-#include <vm.h>
-#include <security.h>
+#include <x86/guest/vmcs.h>
+#include <x86/guest/vm.h>
+#include <x86/security.h>
 
 /* NOTE:
  *

hypervisor/arch/x86/guest/vmx_io.c

@@ -6,15 +6,15 @@
 
 #include <types.h>
 #include <errno.h>
-#include <atomic.h>
+#include <x86/lib/atomic.h>
 #include <io_req.h>
-#include <vcpu.h>
-#include <vm.h>
-#include <instr_emul.h>
-#include <vmexit.h>
-#include <vmx.h>
-#include <ept.h>
-#include <pgtable.h>
+#include <x86/guest/vcpu.h>
+#include <x86/guest/vm.h>
+#include <x86/guest/instr_emul.h>
+#include <x86/guest/vmexit.h>
+#include <x86/vmx.h>
+#include <x86/guest/ept.h>
+#include <x86/pgtable.h>
 #include <trace.h>
 #include <logmsg.h>
 

hypervisor/arch/x86/idt.S

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <idt.h>
+#include <x86/idt.h>
 
 .altmacro
 

hypervisor/arch/x86/init.c

@@ -5,15 +5,15 @@
  */
 
 #include <types.h>
-#include <init.h>
+#include <x86/init.h>
 #include <console.h>
-#include <per_cpu.h>
+#include <x86/per_cpu.h>
 #include <shell.h>
-#include <vmx.h>
-#include <vm.h>
+#include <x86/vmx.h>
+#include <x86/guest/vm.h>
 #include <logmsg.h>
-#include <seed.h>
-#include <ld_sym.h>
+#include <x86/seed.h>
+#include <x86/boot/ld_sym.h>
 #include <multiboot.h>
 
 /* boot_regs store the multiboot info magic and address, defined in

hypervisor/arch/x86/ioapic.c

@@ -6,13 +6,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <spinlock.h>
-#include <ioapic.h>
 #include <irq.h>
-#include <arch/x86/irq.h>
-#include <pgtable.h>
-#include <io.h>
-#include <mmu.h>
+#include <x86/lib/spinlock.h>
+#include <x86/ioapic.h>
+#include <x86/irq.h>
+#include <x86/pgtable.h>
+#include <x86/io.h>
+#include <x86/mmu.h>
 #include <acpi.h>
 #include <logmsg.h>
 

hypervisor/arch/x86/irq.c

@@ -5,18 +5,17 @@
  */
 
 #include <types.h>
-#include <errno.h>
-#include <bits.h>
-#include <spinlock.h>
-#include <per_cpu.h>
-#include <io.h>
-#include <arch/x86/irq.h>
-#include <arch/x86/idt.h>
-#include <arch/x86/ioapic.h>
-#include <arch/x86/lapic.h>
+#include <x86/lib/bits.h>
+#include <x86/lib/spinlock.h>
+#include <x86/per_cpu.h>
+#include <x86/io.h>
+#include <x86/irq.h>
+#include <x86/idt.h>
+#include <x86/ioapic.h>
+#include <x86/lapic.h>
 #include <dump.h>
 #include <logmsg.h>
-#include <vmx.h>
+#include <x86/vmx.h>
 
 static spinlock_t x86_irq_spinlock = { .head = 0U, .tail = 0U, };
 

hypervisor/arch/x86/lapic.c

@@ -5,13 +5,13 @@
  */
 
 #include <types.h>
-#include <bits.h>
-#include <msr.h>
-#include <cpu.h>
-#include <per_cpu.h>
-#include <cpu_caps.h>
-#include <lapic.h>
-#include <apicreg.h>
+#include <x86/lib/bits.h>
+#include <x86/msr.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
+#include <x86/cpu_caps.h>
+#include <x86/lapic.h>
+#include <x86/apicreg.h>
 
 /* intr_lapic_icr_delivery_mode */
 #define INTR_LAPIC_ICR_FIXED           0x0U

hypervisor/arch/x86/mmu.c

@@ -28,14 +28,14 @@
  */
 
 #include <types.h>
-#include <atomic.h>
-#include <pgtable.h>
-#include <cpu_caps.h>
-#include <mmu.h>
-#include <vmx.h>
+#include <x86/lib/atomic.h>
+#include <x86/pgtable.h>
+#include <x86/cpu_caps.h>
+#include <x86/mmu.h>
+#include <x86/vmx.h>
 #include <reloc.h>
-#include <vm.h>
-#include <ld_sym.h>
+#include <x86/guest/vm.h>
+#include <x86/boot/ld_sym.h>
 #include <logmsg.h>
 #include <misc_cfg.h>
 

hypervisor/arch/x86/notify.c

@@ -6,13 +6,13 @@
 
 #include <types.h>
 #include <errno.h>
-#include <bits.h>
-#include <atomic.h>
-#include <arch/x86/irq.h>
-#include <cpu.h>
-#include <per_cpu.h>
-#include <lapic.h>
-#include <vm.h>
+#include <x86/lib/bits.h>
+#include <x86/lib/atomic.h>
+#include <x86/irq.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
+#include <x86/lapic.h>
+#include <x86/guest/vm.h>
 
 static uint32_t notification_irq = IRQ_INVALID;
 

hypervisor/arch/x86/page.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <types.h>
-#include <bits.h>
-#include <page.h>
+#include <x86/lib/bits.h>
+#include <x86/page.h>
 #include <logmsg.h>
 
 

hypervisor/arch/x86/pagetable.c

@@ -7,8 +7,8 @@
 #include <types.h>
 #include <util.h>
 #include <acrn_hv_defs.h>
-#include <page.h>
-#include <mmu.h>
+#include <x86/page.h>
+#include <x86/mmu.h>
 #include <logmsg.h>
 
 #define DBG_LEVEL_MMU	6U

hypervisor/arch/x86/platform_caps.c

@@ -5,6 +5,6 @@
  */
 
 #include <types.h>
-#include <platform_caps.h>
+#include <x86/platform_caps.h>
 
 struct platform_caps_x86 platform_caps = {.pi = true};

hypervisor/arch/x86/pm.c

@@ -4,19 +4,19 @@
  */
 
 #include <acrn_common.h>
-#include <default_acpi_info.h>
+#include <x86/default_acpi_info.h>
 #include <platform_acpi_info.h>
-#include <per_cpu.h>
-#include <io.h>
-#include <msr.h>
-#include <pgtable.h>
-#include <host_pm.h>
-#include <trampoline.h>
-#include <vmx.h>
+#include <x86/per_cpu.h>
+#include <x86/io.h>
+#include <x86/msr.h>
+#include <x86/pgtable.h>
+#include <x86/host_pm.h>
+#include <x86/trampoline.h>
+#include <x86/vmx.h>
 #include <console.h>
-#include <ioapic.h>
-#include <vtd.h>
-#include <lapic.h>
+#include <x86/ioapic.h>
+#include <x86/vtd.h>
+#include <x86/lapic.h>
 
 struct cpu_context cpu_ctx;
 

hypervisor/arch/x86/rdt.c

@@ -5,17 +5,17 @@
  */
 
 #include <types.h>
-#include <cpu.h>
-#include <cpu_caps.h>
-#include <cpufeatures.h>
-#include <cpuid.h>
+#include <x86/cpu.h>
+#include <x86/cpu_caps.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpuid.h>
 #include <errno.h>
 #include <logmsg.h>
-#include <rdt.h>
-#include <bits.h>
-#include <board.h>
-#include <vm_config.h>
-#include <msr.h>
+#include <x86/rdt.h>
+#include <x86/lib/bits.h>
+#include <x86/board.h>
+#include <x86/vm_config.h>
+#include <x86/msr.h>
 
 const uint16_t hv_clos = 0U;
 /* RDT features can support different numbers of CLOS. Set the lowers numerical

hypervisor/arch/x86/rtcm.c

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <types.h>
-#include <bits.h>
+#include <x86/lib/bits.h>
 #include <rtl.h>
 #include <logmsg.h>
 #include <misc_cfg.h>
-#include <mmu.h>
-#include <rtcm.h>
+#include <x86/mmu.h>
+#include <x86/rtcm.h>
 
 
 static uint64_t software_sram_bottom_hpa;

hypervisor/arch/x86/security.c

@@ -5,12 +5,12 @@
  */
 
 #include <types.h>
-#include <msr.h>
-#include <cpufeatures.h>
-#include <cpu.h>
-#include <per_cpu.h>
-#include <cpu_caps.h>
-#include <security.h>
+#include <x86/msr.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpu.h>
+#include <x86/per_cpu.h>
+#include <x86/cpu_caps.h>
+#include <x86/security.h>
 #include <logmsg.h>
 
 static bool skip_l1dfl_vmentry;

hypervisor/arch/x86/seed/seed.c

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <types.h>
-#include <cpu.h>
-#include <pgtable.h>
+#include <x86/cpu.h>
+#include <x86/pgtable.h>
 #include <rtl.h>
-#include <mmu.h>
+#include <x86/mmu.h>
 #include <sprintf.h>
-#include <ept.h>
+#include <x86/guest/ept.h>
 #include <logmsg.h>
 #include <multiboot.h>
 #include <crypto_api.h>
-#include <seed.h>
+#include <x86/seed.h>
 #include "seed_abl.h"
 #include "seed_sbl.h"
 

hypervisor/arch/x86/seed/seed_abl.c

@@ -5,10 +5,10 @@
  */
 
 #include <types.h>
-#include <cpu.h>
-#include <pgtable.h>
+#include <x86/cpu.h>
+#include <x86/pgtable.h>
 #include <rtl.h>
-#include <seed.h>
+#include <x86/seed.h>
 #include "seed_abl.h"
 
 #define ABL_SEED_LEN 32U

hypervisor/arch/x86/seed/seed_sbl.c

@@ -5,11 +5,11 @@
  */
 
 #include <types.h>
-#include <cpu.h>
-#include <pgtable.h>
+#include <x86/cpu.h>
+#include <x86/pgtable.h>
 #include <rtl.h>
 #include <logmsg.h>
-#include <seed.h>
+#include <x86/seed.h>
 #include "seed_sbl.h"
 
 #define SEED_ENTRY_TYPE_SVNSEED         0x1U

hypervisor/arch/x86/sgx.c

@@ -6,11 +6,11 @@
 
 #include <types.h>
 #include <errno.h>
-#include <cpufeatures.h>
-#include <cpu_caps.h>
-#include <sgx.h>
-#include <cpuid.h>
-#include <vm.h>
+#include <x86/cpufeatures.h>
+#include <x86/cpu_caps.h>
+#include <x86/sgx.h>
+#include <x86/cpuid.h>
+#include <x86/guest/vm.h>
 #include <logmsg.h>
 
 #define SGX_OPTED_IN (MSR_IA32_FEATURE_CONTROL_SGX_GE | MSR_IA32_FEATURE_CONTROL_LOCK)

hypervisor/arch/x86/timer.c

@@ -6,14 +6,14 @@
 
 #include <types.h>
 #include <errno.h>
-#include <io.h>
-#include <msr.h>
-#include <apicreg.h>
-#include <cpuid.h>
-#include <cpu_caps.h>
+#include <x86/io.h>
+#include <x86/msr.h>
+#include <x86/apicreg.h>
+#include <x86/cpuid.h>
+#include <x86/cpu_caps.h>
 #include <softirq.h>
 #include <trace.h>
-#include <arch/x86/irq.h>
+#include <x86/irq.h>
 
 #define MAX_TIMER_ACTIONS	32U
 #define CAL_MS			10U

hypervisor/arch/x86/trampoline.c

@@ -5,12 +5,12 @@
  */
 
 #include <types.h>
-#include <mmu.h>
-#include <per_cpu.h>
-#include <trampoline.h>
+#include <x86/mmu.h>
+#include <x86/per_cpu.h>
+#include <x86/trampoline.h>
 #include <reloc.h>
-#include <ld_sym.h>
-#include <e820.h>
+#include <x86/boot/ld_sym.h>
+#include <x86/e820.h>
 
 static uint64_t trampoline_start16_paddr;
 

hypervisor/arch/x86/vmx.c

@@ -7,10 +7,10 @@
  */
 
 #include <types.h>
-#include <msr.h>
-#include <per_cpu.h>
-#include <pgtable.h>
-#include <vmx.h>
+#include <x86/msr.h>
+#include <x86/per_cpu.h>
+#include <x86/pgtable.h>
+#include <x86/vmx.h>
 
 /**
  * @pre addr != NULL && addr is 4KB-aligned

hypervisor/arch/x86/vtd.c

@@ -7,23 +7,23 @@
 #define pr_prefix		"iommu: "
 
 #include <types.h>
-#include <bits.h>
 #include <errno.h>
-#include <spinlock.h>
-#include <page.h>
-#include <pgtable.h>
+#include <x86/lib/bits.h>
+#include <x86/lib/spinlock.h>
+#include <x86/page.h>
+#include <x86/pgtable.h>
 #include <irq.h>
-#include <arch/x86/irq.h>
-#include <io.h>
-#include <mmu.h>
-#include <lapic.h>
-#include <vtd.h>
-#include <timer.h>
+#include <x86/irq.h>
+#include <x86/io.h>
+#include <x86/mmu.h>
+#include <x86/lapic.h>
+#include <x86/vtd.h>
+#include <x86/timer.h>
 #include <logmsg.h>
-#include <board.h>
-#include <vm_config.h>
+#include <x86/board.h>
+#include <x86/vm_config.h>
 #include <pci.h>
-#include <platform_caps.h>
+#include <x86/platform_caps.h>
 
 #define DBG_IOMMU 0