From 688a41c29041d67f5ceda8c3754a50111a95b8d6 Mon Sep 17 00:00:00 2001 From: Liang Yi Date: Fri, 23 Apr 2021 15:50:57 +0800 Subject: [PATCH] hv: mod: do not use explicit arch name when including headers Instead of "#include ", use "#include ". In other words, we are adopting the same practice in Linux kernel. Tracked-On: #5920 Signed-off-by: Liang Yi Reviewed-by: Jason Chen CJ --- doc/acrn.doxyfile | 38 ++++++++--------- hypervisor/Makefile | 6 ++- hypervisor/acpi_parser/acpi_ext.c | 8 ++-- hypervisor/acpi_parser/dmar_parse.c | 8 ++-- hypervisor/arch/x86/configs/pci_dev.c | 4 +- hypervisor/arch/x86/configs/vacpi.c | 2 +- hypervisor/arch/x86/configs/vm_config.c | 2 +- hypervisor/arch/x86/cpu.c | 38 ++++++++--------- hypervisor/arch/x86/cpu_caps.c | 18 ++++---- hypervisor/arch/x86/cpu_state_tbl.c | 6 +-- hypervisor/arch/x86/e820.c | 8 ++-- hypervisor/arch/x86/exception.c | 4 +- hypervisor/arch/x86/gdt.c | 4 +- hypervisor/arch/x86/guest/assign.c | 14 +++---- hypervisor/arch/x86/guest/ept.c | 16 +++---- hypervisor/arch/x86/guest/guest_memory.c | 14 +++---- hypervisor/arch/x86/guest/hyperv.c | 6 +-- hypervisor/arch/x86/guest/instr_emul.c | 12 +++--- hypervisor/arch/x86/guest/pm.c | 10 ++--- hypervisor/arch/x86/guest/splitlock.c | 10 ++--- hypervisor/arch/x86/guest/trusty.c | 20 ++++----- hypervisor/arch/x86/guest/ucode.c | 14 +++---- hypervisor/arch/x86/guest/vcpu.c | 26 ++++++------ hypervisor/arch/x86/guest/vcpuid.c | 14 +++---- hypervisor/arch/x86/guest/ve820.c | 8 ++-- hypervisor/arch/x86/guest/virq.c | 20 ++++----- hypervisor/arch/x86/guest/virtual_cr.c | 20 ++++----- hypervisor/arch/x86/guest/vlapic.c | 24 +++++------ hypervisor/arch/x86/guest/vm.c | 42 +++++++++---------- hypervisor/arch/x86/guest/vm_reset.c | 10 ++--- hypervisor/arch/x86/guest/vmcall.c | 8 ++-- hypervisor/arch/x86/guest/vmcs.c | 20 ++++----- hypervisor/arch/x86/guest/vmexit.c | 28 ++++++------- hypervisor/arch/x86/guest/vmsr.c | 22 +++++----- hypervisor/arch/x86/guest/vmtrr.c | 12 +++--- hypervisor/arch/x86/guest/vmx_asm.S | 6 +-- hypervisor/arch/x86/guest/vmx_io.c | 16 +++---- hypervisor/arch/x86/idt.S | 2 +- hypervisor/arch/x86/init.c | 12 +++--- hypervisor/arch/x86/ioapic.c | 12 +++--- hypervisor/arch/x86/irq.c | 18 ++++---- hypervisor/arch/x86/lapic.c | 14 +++---- hypervisor/arch/x86/mmu.c | 14 +++---- hypervisor/arch/x86/nmi.c | 4 +- hypervisor/arch/x86/notify.c | 14 +++---- hypervisor/arch/x86/page.c | 4 +- hypervisor/arch/x86/pagetable.c | 4 +- hypervisor/arch/x86/platform_caps.c | 2 +- hypervisor/arch/x86/pm.c | 22 +++++----- hypervisor/arch/x86/rdt.c | 18 ++++---- hypervisor/arch/x86/rtcm.c | 6 +-- hypervisor/arch/x86/security.c | 12 +++--- hypervisor/arch/x86/seed/seed.c | 10 ++--- hypervisor/arch/x86/seed/seed_abl.c | 6 +-- hypervisor/arch/x86/seed/seed_sbl.c | 6 +-- hypervisor/arch/x86/sgx.c | 10 ++--- hypervisor/arch/x86/timer.c | 12 +++--- hypervisor/arch/x86/trampoline.c | 10 ++--- hypervisor/arch/x86/vmx.c | 8 ++-- hypervisor/arch/x86/vtd.c | 26 ++++++------ hypervisor/boot/acpi_base.c | 6 +-- hypervisor/boot/guest/vboot_info.c | 14 +++---- hypervisor/boot/multiboot/multiboot.c | 2 +- hypervisor/boot/multiboot/multiboot2.c | 2 +- hypervisor/boot/reloc.c | 2 +- hypervisor/common/event.c | 2 +- hypervisor/common/hv_main.c | 10 ++--- hypervisor/common/hypercall.c | 22 +++++----- hypervisor/common/irq.c | 6 +-- hypervisor/common/ptdev.c | 6 +-- hypervisor/common/sched_bvt.c | 2 +- hypervisor/common/sched_iorr.c | 2 +- hypervisor/common/sched_noop.c | 2 +- hypervisor/common/schedule.c | 10 ++--- hypervisor/common/softirq.c | 6 +-- hypervisor/common/trusty_hypercall.c | 2 +- hypervisor/common/vm_load.c | 10 ++--- hypervisor/debug/console.c | 4 +- hypervisor/debug/dump.c | 12 +++--- hypervisor/debug/hypercall.c | 2 +- hypervisor/debug/logmsg.c | 6 +-- hypervisor/debug/npk_log.c | 8 ++-- hypervisor/debug/profiling.c | 12 +++--- hypervisor/debug/sbuf.c | 4 +- hypervisor/debug/shell.c | 18 ++++---- hypervisor/debug/shell_priv.h | 2 +- hypervisor/debug/trace.c | 2 +- hypervisor/debug/uart16550.c | 8 ++-- hypervisor/dm/io_req.c | 4 +- hypervisor/dm/mmio_dev.c | 6 +-- hypervisor/dm/vgpio.c | 10 ++--- hypervisor/dm/vioapic.c | 10 ++--- hypervisor/dm/vpci/ivshmem.c | 6 +-- hypervisor/dm/vpci/pci_pt.c | 12 +++--- hypervisor/dm/vpci/vdev.c | 4 +- hypervisor/dm/vpci/vhostbridge.c | 2 +- hypervisor/dm/vpci/vmcs9900.c | 4 +- hypervisor/dm/vpci/vmsi.c | 6 +-- hypervisor/dm/vpci/vmsix.c | 6 +-- hypervisor/dm/vpci/vmsix_on_msi.c | 8 ++-- hypervisor/dm/vpci/vpci.c | 10 ++--- hypervisor/dm/vpci/vpci_bridge.c | 2 +- hypervisor/dm/vpci/vsriov.c | 4 +- hypervisor/dm/vpic.c | 12 +++--- hypervisor/dm/vrtc.c | 4 +- hypervisor/dm/vuart.c | 2 +- hypervisor/hw/pci.c | 16 +++---- .../include/arch/x86/{ => asm}/apicreg.h | 2 +- hypervisor/include/arch/x86/{ => asm}/board.h | 2 +- .../include/arch/x86/{ => asm}/boot/ld_sym.h | 0 hypervisor/include/arch/x86/{ => asm}/cpu.h | 0 .../include/arch/x86/{ => asm}/cpu_caps.h | 0 .../include/arch/x86/{ => asm}/cpufeatures.h | 0 hypervisor/include/arch/x86/{ => asm}/cpuid.h | 0 .../arch/x86/{ => asm}/default_acpi_info.h | 0 hypervisor/include/arch/x86/{ => asm}/e820.h | 0 hypervisor/include/arch/x86/{ => asm}/gdt.h | 2 +- .../include/arch/x86/{ => asm}/guest/assign.h | 0 .../include/arch/x86/{ => asm}/guest/ept.h | 0 .../arch/x86/{ => asm}/guest/guest_memory.h | 0 .../arch/x86/{ => asm}/guest/guest_pm.h | 0 .../include/arch/x86/{ => asm}/guest/hyperv.h | 2 +- .../arch/x86/{ => asm}/guest/instr_emul.h | 4 +- .../arch/x86/{ => asm}/guest/splitlock.h | 0 .../include/arch/x86/{ => asm}/guest/trusty.h | 2 +- .../include/arch/x86/{ => asm}/guest/ucode.h | 0 .../include/arch/x86/{ => asm}/guest/vcpu.h | 16 +++---- .../include/arch/x86/{ => asm}/guest/vcpuid.h | 0 .../include/arch/x86/{ => asm}/guest/virq.h | 0 .../arch/x86/{ => asm}/guest/virtual_cr.h | 0 .../include/arch/x86/{ => asm}/guest/vlapic.h | 6 +-- .../include/arch/x86/{ => asm}/guest/vm.h | 22 +++++----- .../arch/x86/{ => asm}/guest/vm_reset.h | 0 .../include/arch/x86/{ => asm}/guest/vmcs.h | 2 +- .../include/arch/x86/{ => asm}/guest/vmexit.h | 0 .../include/arch/x86/{ => asm}/guest/vmtrr.h | 0 .../include/arch/x86/{ => asm}/guest/vmx_io.h | 0 .../include/arch/x86/{ => asm}/host_pm.h | 0 hypervisor/include/arch/x86/{ => asm}/idt.h | 0 hypervisor/include/arch/x86/{ => asm}/init.h | 0 hypervisor/include/arch/x86/{ => asm}/io.h | 0 .../include/arch/x86/{ => asm}/ioapic.h | 2 +- hypervisor/include/arch/x86/{ => asm}/irq.h | 2 +- hypervisor/include/arch/x86/{ => asm}/lapic.h | 0 .../include/arch/x86/{ => asm}/lib/atomic.h | 0 .../include/arch/x86/{ => asm}/lib/bits.h | 2 +- .../include/arch/x86/{ => asm}/lib/spinlock.h | 0 hypervisor/include/arch/x86/{ => asm}/mmu.h | 8 ++-- hypervisor/include/arch/x86/{ => asm}/msr.h | 0 .../include/arch/x86/{ => asm}/notify.h | 0 hypervisor/include/arch/x86/{ => asm}/page.h | 2 +- .../include/arch/x86/{ => asm}/pci_dev.h | 2 +- .../include/arch/x86/{ => asm}/per_cpu.h | 12 +++--- .../include/arch/x86/{ => asm}/pgtable.h | 2 +- .../arch/x86/{ => asm}/platform_caps.h | 0 hypervisor/include/arch/x86/{ => asm}/rdt.h | 0 hypervisor/include/arch/x86/{ => asm}/rtcm.h | 2 +- hypervisor/include/arch/x86/{ => asm}/rtct.h | 0 .../include/arch/x86/{ => asm}/security.h | 0 hypervisor/include/arch/x86/{ => asm}/seed.h | 0 hypervisor/include/arch/x86/{ => asm}/sgx.h | 0 hypervisor/include/arch/x86/{ => asm}/timer.h | 0 .../include/arch/x86/{ => asm}/trampoline.h | 0 .../include/arch/x86/{ => asm}/vm_config.h | 2 +- hypervisor/include/arch/x86/{ => asm}/vmx.h | 0 hypervisor/include/arch/x86/{ => asm}/vtd.h | 0 .../include/arch/x86/{ => asm}/zeropage.h | 2 +- hypervisor/include/common/event.h | 2 +- hypervisor/include/common/irq.h | 2 +- hypervisor/include/common/ptdev.h | 4 +- hypervisor/include/common/schedule.h | 4 +- hypervisor/include/debug/logmsg.h | 2 +- hypervisor/include/debug/profiling.h | 2 + hypervisor/include/debug/profiling_internal.h | 4 +- hypervisor/include/debug/trace.h | 2 +- hypervisor/include/dm/vioapic.h | 4 +- hypervisor/include/dm/vpci.h | 2 +- hypervisor/include/dm/vuart.h | 4 +- hypervisor/release/dump.c | 2 +- hypervisor/release/hypercall.c | 2 +- hypervisor/release/profiling.c | 2 +- misc/config_tools/board_config/board_c.py | 6 +-- .../board_config/board_cfg_gen.py | 2 +- .../generic_code/hybrid/pci_dev.c | 6 +-- .../generic_code/hybrid/pt_intx.c | 2 +- .../generic_code/hybrid/vm_configurations.c | 4 +- .../generic_code/hybrid_rt/ivshmem_cfg.h | 2 +- .../generic_code/hybrid_rt/pci_dev.c | 6 +-- .../generic_code/hybrid_rt/pt_intx.c | 2 +- .../hybrid_rt/vm_configurations.c | 4 +- .../generic_code/industry/pci_dev.c | 6 +-- .../generic_code/industry/pt_intx.c | 2 +- .../generic_code/industry/vm_configurations.c | 4 +- .../generic_code/logical_partition/pci_dev.c | 6 +-- .../generic_code/logical_partition/pt_intx.c | 2 +- .../logical_partition/vm_configurations.c | 4 +- .../scenario_config/ivshmem_cfg_h.py | 2 +- .../config_tools/scenario_config/pci_dev_c.py | 6 +-- .../config_tools/scenario_config/pt_intx_c.py | 2 +- .../scenario_config/vm_configurations_c.py | 4 +- misc/config_tools/xforms/ivshmem_cfg.h.xsl | 2 +- misc/config_tools/xforms/pt_intx.c.xsl | 2 +- .../xforms/vm_configurations.c.xsl | 4 +- misc/hv_prebuild/static_checks.c | 6 +-- misc/hv_prebuild/vm_cfg_checks.c | 8 ++-- 205 files changed, 666 insertions(+), 660 deletions(-) rename hypervisor/include/arch/x86/{ => asm}/apicreg.h (99%) rename hypervisor/include/arch/x86/{ => asm}/board.h (97%) rename hypervisor/include/arch/x86/{ => asm}/boot/ld_sym.h (100%) rename hypervisor/include/arch/x86/{ => asm}/cpu.h (100%) rename hypervisor/include/arch/x86/{ => asm}/cpu_caps.h (100%) rename hypervisor/include/arch/x86/{ => asm}/cpufeatures.h (100%) rename hypervisor/include/arch/x86/{ => asm}/cpuid.h (100%) rename hypervisor/include/arch/x86/{ => asm}/default_acpi_info.h (100%) rename hypervisor/include/arch/x86/{ => asm}/e820.h (100%) rename hypervisor/include/arch/x86/{ => asm}/gdt.h (99%) rename hypervisor/include/arch/x86/{ => asm}/guest/assign.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/ept.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/guest_memory.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/guest_pm.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/hyperv.h (97%) rename hypervisor/include/arch/x86/{ => asm}/guest/instr_emul.h (98%) rename hypervisor/include/arch/x86/{ => asm}/guest/splitlock.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/trusty.h (99%) rename hypervisor/include/arch/x86/{ => asm}/guest/ucode.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/vcpu.h (98%) rename hypervisor/include/arch/x86/{ => asm}/guest/vcpuid.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/virq.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/virtual_cr.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/vlapic.h (98%) rename hypervisor/include/arch/x86/{ => asm}/guest/vm.h (96%) rename hypervisor/include/arch/x86/{ => asm}/guest/vm_reset.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/vmcs.h (98%) rename hypervisor/include/arch/x86/{ => asm}/guest/vmexit.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/vmtrr.h (100%) rename hypervisor/include/arch/x86/{ => asm}/guest/vmx_io.h (100%) rename hypervisor/include/arch/x86/{ => asm}/host_pm.h (100%) rename hypervisor/include/arch/x86/{ => asm}/idt.h (100%) rename hypervisor/include/arch/x86/{ => asm}/init.h (100%) rename hypervisor/include/arch/x86/{ => asm}/io.h (100%) rename hypervisor/include/arch/x86/{ => asm}/ioapic.h (98%) rename hypervisor/include/arch/x86/{ => asm}/irq.h (99%) rename hypervisor/include/arch/x86/{ => asm}/lapic.h (100%) rename hypervisor/include/arch/x86/{ => asm}/lib/atomic.h (100%) rename hypervisor/include/arch/x86/{ => asm}/lib/bits.h (99%) rename hypervisor/include/arch/x86/{ => asm}/lib/spinlock.h (100%) rename hypervisor/include/arch/x86/{ => asm}/mmu.h (97%) rename hypervisor/include/arch/x86/{ => asm}/msr.h (100%) rename hypervisor/include/arch/x86/{ => asm}/notify.h (100%) rename hypervisor/include/arch/x86/{ => asm}/page.h (97%) rename hypervisor/include/arch/x86/{ => asm}/pci_dev.h (92%) rename hypervisor/include/arch/x86/{ => asm}/per_cpu.h (94%) rename hypervisor/include/arch/x86/{ => asm}/pgtable.h (99%) rename hypervisor/include/arch/x86/{ => asm}/platform_caps.h (100%) rename hypervisor/include/arch/x86/{ => asm}/rdt.h (100%) rename hypervisor/include/arch/x86/{ => asm}/rtcm.h (96%) rename hypervisor/include/arch/x86/{ => asm}/rtct.h (100%) rename hypervisor/include/arch/x86/{ => asm}/security.h (100%) rename hypervisor/include/arch/x86/{ => asm}/seed.h (100%) rename hypervisor/include/arch/x86/{ => asm}/sgx.h (100%) rename hypervisor/include/arch/x86/{ => asm}/timer.h (100%) rename hypervisor/include/arch/x86/{ => asm}/trampoline.h (100%) rename hypervisor/include/arch/x86/{ => asm}/vm_config.h (99%) rename hypervisor/include/arch/x86/{ => asm}/vmx.h (100%) rename hypervisor/include/arch/x86/{ => asm}/vtd.h (100%) rename hypervisor/include/arch/x86/{ => asm}/zeropage.h (98%) diff --git a/doc/acrn.doxyfile b/doc/acrn.doxyfile index d7d17cc61..f721a5ea8 100644 --- a/doc/acrn.doxyfile +++ b/doc/acrn.doxyfile @@ -793,34 +793,34 @@ WARN_LOGFILE = # Note: If this tag is empty the current directory is searched. INPUT = custom-doxygen/mainpage.md \ - ../hypervisor/include/arch/x86/guest/guest_memory.h \ - ../hypervisor/include/arch/x86/guest/ept.h \ - ../hypervisor/include/arch/x86/mmu.h \ - ../hypervisor/include/arch/x86/cpu.h \ - ../hypervisor/include/arch/x86/pgtable.h \ - ../hypervisor/include/arch/x86/vtd.h \ - ../hypervisor/include/arch/x86/irq.h \ - ../hypervisor/include/arch/x86/guest/virq.h \ - ../hypervisor/include/arch/x86/guest/vmtrr.h \ - ../hypervisor/include/arch/x86/guest/vlapic.h \ + ../hypervisor/arch/x86/guest/trusty.c \ + ../hypervisor/include/arch/x86/asm/guest/guest_memory.h \ + ../hypervisor/include/arch/x86/asm/guest/ept.h \ + ../hypervisor/include/arch/x86/asm/mmu.h \ + ../hypervisor/include/arch/x86/asm/cpu.h \ + ../hypervisor/include/arch/x86/asm/pgtable.h \ + ../hypervisor/include/arch/x86/asm/vtd.h \ + ../hypervisor/include/arch/x86/asm/irq.h \ + ../hypervisor/include/arch/x86/asm/guest/virq.h \ + ../hypervisor/include/arch/x86/asm/guest/vmtrr.h \ + ../hypervisor/include/arch/x86/asm/guest/vlapic.h \ + ../hypervisor/include/arch/x86/asm/guest/vmx_io.h \ + ../hypervisor/include/arch/x86/asm/guest/assign.h \ + ../hypervisor/include/arch/x86/asm/guest/vcpu.h \ + ../hypervisor/include/arch/x86/asm/guest/virtual_cr.h \ + ../hypervisor/include/arch/x86/asm/timer.h \ + ../hypervisor/include/arch/x86/asm/ioapic.h \ + ../hypervisor/include/arch/x86/asm/lapic.h \ + ../hypervisor/include/lib/crypto/crypto_api.h \ ../hypervisor/include/dm/vioapic.h \ ../hypervisor/include/dm/vpic.h \ ../hypervisor/include/dm/io_req.h \ - ../hypervisor/include/arch/x86/guest/vmx_io.h \ - ../hypervisor/include/arch/x86/guest/assign.h \ ../hypervisor/include/common/hypercall.h \ ../hypervisor/include/common/irq.h \ ../hypervisor/include/common/ptdev.h \ ../hypervisor/include/public/acrn_common.h \ ../hypervisor/include/public/acrn_hv_defs.h \ - ../hypervisor/include/arch/x86/guest/vcpu.h \ - ../hypervisor/include/arch/x86/guest/virtual_cr.h \ - ../hypervisor/include/arch/x86/timer.h \ - ../hypervisor/arch/x86/guest/trusty.c \ ../devicemodel/include/virtio.h \ - ../hypervisor/include/arch/x86/ioapic.h \ - ../hypervisor/include/arch/x86/lapic.h \ - ../hypervisor/include/lib/crypto/crypto_api.h \ ../devicemodel/include/virtio_kernel.h \ ../devicemodel/include/vhost.h \ ../devicemodel/include/dm.h \ diff --git a/hypervisor/Makefile b/hypervisor/Makefile index dc357d79f..3545f937f 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -137,7 +137,6 @@ REL_INCLUDE_PATH += include REL_INCLUDE_PATH += include/lib REL_INCLUDE_PATH += include/lib/crypto REL_INCLUDE_PATH += include/common -REL_INCLUDE_PATH += include/arch REL_INCLUDE_PATH += include/debug REL_INCLUDE_PATH += include/public REL_INCLUDE_PATH += include/dm @@ -145,6 +144,11 @@ REL_INCLUDE_PATH += include/hw REL_INCLUDE_PATH += boot/include REL_INCLUDE_PATH += boot/include/guest +# TODO: ARCH name should come from generated config.mk. +# Fixed to x86 for now. +ARCH := x86 +REL_INCLUDE_PATH += include/arch/$(ARCH) + INCLUDE_PATH := $(realpath $(REL_INCLUDE_PATH)) INCLUDE_PATH += $(HV_OBJDIR)/include INCLUDE_PATH += $(BOARD_INFO_DIR) diff --git a/hypervisor/acpi_parser/acpi_ext.c b/hypervisor/acpi_parser/acpi_ext.c index 0a1466199..74d529586 100644 --- a/hypervisor/acpi_parser/acpi_ext.c +++ b/hypervisor/acpi_parser/acpi_ext.c @@ -29,13 +29,13 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include -#include +#include /* Per ACPI spec: * There are two fundamental types of ACPI tables: diff --git a/hypervisor/acpi_parser/dmar_parse.c b/hypervisor/acpi_parser/dmar_parse.c index d68431eed..1484d023b 100644 --- a/hypervisor/acpi_parser/dmar_parse.c +++ b/hypervisor/acpi_parser/dmar_parse.c @@ -6,11 +6,11 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include static uint32_t dmar_unit_cnt; diff --git a/hypervisor/arch/x86/configs/pci_dev.c b/hypervisor/arch/x86/configs/pci_dev.c index 28415eaa0..190d5ba91 100644 --- a/hypervisor/arch/x86/configs/pci_dev.c +++ b/hypervisor/arch/x86/configs/pci_dev.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include #include /* diff --git a/hypervisor/arch/x86/configs/vacpi.c b/hypervisor/arch/x86/configs/vacpi.c index 5dfa7defb..daf8b1331 100644 --- a/hypervisor/arch/x86/configs/vacpi.c +++ b/hypervisor/arch/x86/configs/vacpi.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include /** diff --git a/hypervisor/arch/x86/configs/vm_config.c b/hypervisor/arch/x86/configs/vm_config.c index 89027e169..890999836 100644 --- a/hypervisor/arch/x86/configs/vm_config.c +++ b/hypervisor/arch/x86/configs/vm_config.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include /* * @pre vm_id < CONFIG_MAX_VM_NUM diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c index 76e59a808..953a43699 100644 --- a/hypervisor/arch/x86/cpu.c +++ b/hypervisor/arch/x86/cpu.c @@ -5,32 +5,32 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #define CPU_UP_TIMEOUT 100U /* millisecond */ #define CPU_DOWN_TIMEOUT 100U /* millisecond */ diff --git a/hypervisor/arch/x86/cpu_caps.c b/hypervisor/arch/x86/cpu_caps.c index 005aa127e..8a6753620 100644 --- a/hypervisor/arch/x86/cpu_caps.c +++ b/hypervisor/arch/x86/cpu_caps.c @@ -5,17 +5,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include /* TODO: add more capability per requirement */ /* APICv features */ diff --git a/hypervisor/arch/x86/cpu_state_tbl.c b/hypervisor/arch/x86/cpu_state_tbl.c index a5b98bae2..f975e17e5 100644 --- a/hypervisor/arch/x86/cpu_state_tbl.c +++ b/hypervisor/arch/x86/cpu_state_tbl.c @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /* The table includes cpu px info of Intel A3960 SoC */ static const struct cpu_px_data px_a3960[17] = { diff --git a/hypervisor/arch/x86/e820.c b/hypervisor/arch/x86/e820.c index 4916e4137..e3a3322f6 100644 --- a/hypervisor/arch/x86/e820.c +++ b/hypervisor/arch/x86/e820.c @@ -6,12 +6,12 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include /* * e820.c contains the related e820 operations; like HV to get memory info for its MMU setup; diff --git a/hypervisor/arch/x86/exception.c b/hypervisor/arch/x86/exception.c index 9b8151a6f..4014cd9c3 100644 --- a/hypervisor/arch/x86/exception.c +++ b/hypervisor/arch/x86/exception.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include void dispatch_exception(struct intr_excp_ctx *ctx) diff --git a/hypervisor/arch/x86/gdt.c b/hypervisor/arch/x86/gdt.c index 8ac23c7d5..f9620fd52 100644 --- a/hypervisor/arch/x86/gdt.c +++ b/hypervisor/arch/x86/gdt.c @@ -5,8 +5,8 @@ */ #include -#include -#include +#include +#include static void set_tss_desc(struct tss_64_descriptor *desc, uint64_t tss, size_t tss_limit, uint32_t type) diff --git a/hypervisor/arch/x86/guest/assign.c b/hypervisor/arch/x86/guest/assign.c index 81edc77c1..5bad2d1ca 100644 --- a/hypervisor/arch/x86/guest/assign.c +++ b/hypervisor/arch/x86/guest/assign.c @@ -6,14 +6,14 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include /* * Check if the IRQ is single-destination and return the destination vCPU if so. diff --git a/hypervisor/arch/x86/guest/ept.c b/hypervisor/arch/x86/guest/ept.c index b6f1205b2..ba26c9b43 100644 --- a/hypervisor/arch/x86/guest/ept.c +++ b/hypervisor/arch/x86/guest/ept.c @@ -6,16 +6,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #define DBG_LEVEL_EPT 6U diff --git a/hypervisor/arch/x86/guest/guest_memory.c b/hypervisor/arch/x86/guest/guest_memory.c index 7eae784f4..426b735c1 100644 --- a/hypervisor/arch/x86/guest/guest_memory.c +++ b/hypervisor/arch/x86/guest/guest_memory.c @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include struct page_walk_info { diff --git a/hypervisor/arch/x86/guest/hyperv.c b/hypervisor/arch/x86/guest/hyperv.c index 9ac7c96e7..29facbd83 100644 --- a/hypervisor/arch/x86/guest/hyperv.c +++ b/hypervisor/arch/x86/guest/hyperv.c @@ -8,10 +8,10 @@ */ #include -#include +#include #include -#include -#include +#include +#include #define DBG_LEVEL_HYPERV 6U diff --git a/hypervisor/arch/x86/guest/instr_emul.c b/hypervisor/arch/x86/guest/instr_emul.c index c2579c3f9..ab55f69b6 100644 --- a/hypervisor/arch/x86/guest/instr_emul.c +++ b/hypervisor/arch/x86/guest/instr_emul.c @@ -30,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #define CPU_REG_FIRST CPU_REG_RAX #define CPU_REG_LAST CPU_REG_GDTR diff --git a/hypervisor/arch/x86/guest/pm.c b/hypervisor/arch/x86/guest/pm.c index 742227c18..ccef45302 100644 --- a/hypervisor/arch/x86/guest/pm.c +++ b/hypervisor/arch/x86/guest/pm.c @@ -5,13 +5,13 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include int32_t validate_pstate(const struct acrn_vm *vm, uint64_t perf_ctl) { diff --git a/hypervisor/arch/x86/guest/splitlock.c b/hypervisor/arch/x86/guest/splitlock.c index 7c2079457..09bcace47 100644 --- a/hypervisor/arch/x86/guest/splitlock.c +++ b/hypervisor/arch/x86/guest/splitlock.c @@ -5,14 +5,14 @@ */ #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include -#include +#include static bool is_guest_ac_enabled(struct acrn_vcpu *vcpu) { diff --git a/hypervisor/arch/x86/guest/trusty.c b/hypervisor/arch/x86/guest/trusty.c index b7e5fbba8..f31a456d2 100644 --- a/hypervisor/arch/x86/guest/trusty.c +++ b/hypervisor/arch/x86/guest/trusty.c @@ -5,18 +5,18 @@ */ #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #define TRUSTY_VERSION 1U #define TRUSTY_VERSION_2 2U diff --git a/hypervisor/arch/x86/guest/ucode.c b/hypervisor/arch/x86/guest/ucode.c index 2d3b03e30..4ad6fbc22 100644 --- a/hypervisor/arch/x86/guest/ucode.c +++ b/hypervisor/arch/x86/guest/ucode.c @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #define MICRO_CODE_SIZE_MAX 0x40000U diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c index 512cb2cc6..7028374d6 100644 --- a/hypervisor/arch/x86/guest/vcpu.c +++ b/hypervisor/arch/x86/guest/vcpu.c @@ -6,21 +6,21 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include /* stack_frame is linked with the sequence of stack operation in arch_switch_to() */ struct stack_frame { diff --git a/hypervisor/arch/x86/guest/vcpuid.c b/hypervisor/arch/x86/guest/vcpuid.c index 479191795..f6da8284d 100644 --- a/hypervisor/arch/x86/guest/vcpuid.c +++ b/hypervisor/arch/x86/guest/vcpuid.c @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include static inline const struct vcpuid_entry *local_find_vcpuid_entry(const struct acrn_vcpu *vcpu, diff --git a/hypervisor/arch/x86/guest/ve820.c b/hypervisor/arch/x86/guest/ve820.c index 820dbc6ec..3f208ef92 100644 --- a/hypervisor/arch/x86/guest/ve820.c +++ b/hypervisor/arch/x86/guest/ve820.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #define ENTRY_HPA1_LOW_PART1 2U #define ENTRY_HPA1_LOW_PART2 4U diff --git a/hypervisor/arch/x86/guest/virq.c b/hypervisor/arch/x86/guest/virq.c index b8fb4ba98..e83ef1bcd 100644 --- a/hypervisor/arch/x86/guest/virq.c +++ b/hypervisor/arch/x86/guest/virq.c @@ -6,18 +6,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #define EXCEPTION_ERROR_CODE_VALID 8U diff --git a/hypervisor/arch/x86/guest/virtual_cr.c b/hypervisor/arch/x86/guest/virtual_cr.c index 876c763f3..9357c65cf 100644 --- a/hypervisor/arch/x86/guest/virtual_cr.c +++ b/hypervisor/arch/x86/guest/virtual_cr.c @@ -8,16 +8,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c index 574728464..4d0c4abf7 100644 --- a/hypervisor/arch/x86/guest/vlapic.c +++ b/hypervisor/arch/x86/guest/vlapic.c @@ -31,21 +31,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include "vlapic_priv.h" #define VLAPIC_VERBOS 0 diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c index bf5c13a47..7b2b6a217 100644 --- a/hypervisor/arch/x86/guest/vm.c +++ b/hypervisor/arch/x86/guest/vm.c @@ -7,37 +7,37 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include /* Local variables */ diff --git a/hypervisor/arch/x86/guest/vm_reset.c b/hypervisor/arch/x86/guest/vm_reset.c index 4605e2995..24d593324 100644 --- a/hypervisor/arch/x86/guest/vm_reset.c +++ b/hypervisor/arch/x86/guest/vm_reset.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include /** * @pre vm != NULL diff --git a/hypervisor/arch/x86/guest/vmcall.c b/hypervisor/arch/x86/guest/vmcall.c index 8b51b3c39..1d46fa7bf 100644 --- a/hypervisor/arch/x86/guest/vmcall.c +++ b/hypervisor/arch/x86/guest/vmcall.c @@ -6,10 +6,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/arch/x86/guest/vmcs.c b/hypervisor/arch/x86/guest/vmcs.c index b1c2a4efc..8f89f41d2 100644 --- a/hypervisor/arch/x86/guest/vmcs.c +++ b/hypervisor/arch/x86/guest/vmcs.c @@ -7,16 +7,16 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include /* rip, rsp, ia32_efer and rflags are written to VMCS in start_vcpu */ diff --git a/hypervisor/arch/x86/guest/vmexit.c b/hypervisor/arch/x86/guest/vmexit.c index ba8d7fbc0..83281154a 100644 --- a/hypervisor/arch/x86/guest/vmexit.c +++ b/hypervisor/arch/x86/guest/vmexit.c @@ -6,21 +6,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include /* * According to "SDM APPENDIX C VMX BASIC EXIT REASONS", diff --git a/hypervisor/arch/x86/guest/vmsr.c b/hypervisor/arch/x86/guest/vmsr.c index 5d4293615..d26542c65 100644 --- a/hypervisor/arch/x86/guest/vmsr.c +++ b/hypervisor/arch/x86/guest/vmsr.c @@ -6,17 +6,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/hypervisor/arch/x86/guest/vmtrr.c b/hypervisor/arch/x86/guest/vmtrr.c index d9311b6dc..3a116403f 100644 --- a/hypervisor/arch/x86/guest/vmtrr.c +++ b/hypervisor/arch/x86/guest/vmtrr.c @@ -4,12 +4,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define MTRR_FIXED_RANGE_ALL_WB (MTRR_MEM_TYPE_WB \ diff --git a/hypervisor/arch/x86/guest/vmx_asm.S b/hypervisor/arch/x86/guest/vmx_asm.S index 17211d7a4..19b232c9b 100644 --- a/hypervisor/arch/x86/guest/vmx_asm.S +++ b/hypervisor/arch/x86/guest/vmx_asm.S @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include /* NOTE: * diff --git a/hypervisor/arch/x86/guest/vmx_io.c b/hypervisor/arch/x86/guest/vmx_io.c index b6c028907..abaa88927 100644 --- a/hypervisor/arch/x86/guest/vmx_io.c +++ b/hypervisor/arch/x86/guest/vmx_io.c @@ -6,15 +6,15 @@ #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/hypervisor/arch/x86/idt.S b/hypervisor/arch/x86/idt.S index d9e0e16a4..beb08c8f0 100644 --- a/hypervisor/arch/x86/idt.S +++ b/hypervisor/arch/x86/idt.S @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include .altmacro diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c index 4548bdf76..caddf9105 100644 --- a/hypervisor/arch/x86/init.c +++ b/hypervisor/arch/x86/init.c @@ -5,15 +5,15 @@ */ #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include /* boot_regs store the multiboot info magic and address, defined in diff --git a/hypervisor/arch/x86/ioapic.c b/hypervisor/arch/x86/ioapic.c index 404453bab..7c8225fc2 100644 --- a/hypervisor/arch/x86/ioapic.c +++ b/hypervisor/arch/x86/ioapic.c @@ -7,12 +7,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/hypervisor/arch/x86/irq.c b/hypervisor/arch/x86/irq.c index 5d98e2595..2d9337d60 100644 --- a/hypervisor/arch/x86/irq.c +++ b/hypervisor/arch/x86/irq.c @@ -5,17 +5,17 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include static spinlock_t x86_irq_spinlock = { .head = 0U, .tail = 0U, }; diff --git a/hypervisor/arch/x86/lapic.c b/hypervisor/arch/x86/lapic.c index d44d67936..d570cd97c 100644 --- a/hypervisor/arch/x86/lapic.c +++ b/hypervisor/arch/x86/lapic.c @@ -5,13 +5,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /* intr_lapic_icr_delivery_mode */ #define INTR_LAPIC_ICR_FIXED 0x0U diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c index 77c7bc92d..ca9d1ce58 100644 --- a/hypervisor/arch/x86/mmu.c +++ b/hypervisor/arch/x86/mmu.c @@ -28,14 +28,14 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/hypervisor/arch/x86/nmi.c b/hypervisor/arch/x86/nmi.c index e75ff1c32..0b0232c82 100644 --- a/hypervisor/arch/x86/nmi.c +++ b/hypervisor/arch/x86/nmi.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include void handle_nmi(__unused struct intr_excp_ctx *ctx) { diff --git a/hypervisor/arch/x86/notify.c b/hypervisor/arch/x86/notify.c index d329395e7..ef9ccfeeb 100644 --- a/hypervisor/arch/x86/notify.c +++ b/hypervisor/arch/x86/notify.c @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static uint32_t notification_irq = IRQ_INVALID; diff --git a/hypervisor/arch/x86/page.c b/hypervisor/arch/x86/page.c index 61f239bc4..8dc9a7e45 100644 --- a/hypervisor/arch/x86/page.c +++ b/hypervisor/arch/x86/page.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include -#include -#include +#include +#include #include diff --git a/hypervisor/arch/x86/pagetable.c b/hypervisor/arch/x86/pagetable.c index 4891b5844..653203d57 100644 --- a/hypervisor/arch/x86/pagetable.c +++ b/hypervisor/arch/x86/pagetable.c @@ -7,8 +7,8 @@ #include #include #include -#include -#include +#include +#include #include #define DBG_LEVEL_MMU 6U diff --git a/hypervisor/arch/x86/platform_caps.c b/hypervisor/arch/x86/platform_caps.c index 8431d9994..11b10ccea 100644 --- a/hypervisor/arch/x86/platform_caps.c +++ b/hypervisor/arch/x86/platform_caps.c @@ -5,6 +5,6 @@ */ #include -#include +#include struct platform_caps_x86 platform_caps = {.pi = true}; diff --git a/hypervisor/arch/x86/pm.c b/hypervisor/arch/x86/pm.c index 8a846ea1d..621b9c122 100644 --- a/hypervisor/arch/x86/pm.c +++ b/hypervisor/arch/x86/pm.c @@ -4,19 +4,19 @@ */ #include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include struct cpu_context cpu_ctx; diff --git a/hypervisor/arch/x86/rdt.c b/hypervisor/arch/x86/rdt.c index 739b3ce34..77bf58c79 100644 --- a/hypervisor/arch/x86/rdt.c +++ b/hypervisor/arch/x86/rdt.c @@ -5,17 +5,17 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include const uint16_t hv_clos = 0U; /* RDT features can support different numbers of CLOS. Set the lowers numerical diff --git a/hypervisor/arch/x86/rtcm.c b/hypervisor/arch/x86/rtcm.c index 0782a9c0c..39fae5e9b 100644 --- a/hypervisor/arch/x86/rtcm.c +++ b/hypervisor/arch/x86/rtcm.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include -#include +#include #include #include #include -#include -#include +#include +#include static uint64_t software_sram_bottom_hpa; diff --git a/hypervisor/arch/x86/security.c b/hypervisor/arch/x86/security.c index 436a37f40..29f69156e 100644 --- a/hypervisor/arch/x86/security.c +++ b/hypervisor/arch/x86/security.c @@ -5,12 +5,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include static bool skip_l1dfl_vmentry; diff --git a/hypervisor/arch/x86/seed/seed.c b/hypervisor/arch/x86/seed/seed.c index 21dbf2e68..ab073251d 100644 --- a/hypervisor/arch/x86/seed/seed.c +++ b/hypervisor/arch/x86/seed/seed.c @@ -4,16 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include "seed_abl.h" #include "seed_sbl.h" diff --git a/hypervisor/arch/x86/seed/seed_abl.c b/hypervisor/arch/x86/seed/seed_abl.c index a6dae6b23..212e14ffd 100644 --- a/hypervisor/arch/x86/seed/seed_abl.c +++ b/hypervisor/arch/x86/seed/seed_abl.c @@ -5,10 +5,10 @@ */ #include -#include -#include +#include +#include #include -#include +#include #include "seed_abl.h" #define ABL_SEED_LEN 32U diff --git a/hypervisor/arch/x86/seed/seed_sbl.c b/hypervisor/arch/x86/seed/seed_sbl.c index 067d1b129..8e8012713 100644 --- a/hypervisor/arch/x86/seed/seed_sbl.c +++ b/hypervisor/arch/x86/seed/seed_sbl.c @@ -5,11 +5,11 @@ */ #include -#include -#include +#include +#include #include #include -#include +#include #include "seed_sbl.h" #define SEED_ENTRY_TYPE_SVNSEED 0x1U diff --git a/hypervisor/arch/x86/sgx.c b/hypervisor/arch/x86/sgx.c index 56f70ca78..7b0bd8176 100644 --- a/hypervisor/arch/x86/sgx.c +++ b/hypervisor/arch/x86/sgx.c @@ -6,11 +6,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #define SGX_OPTED_IN (MSR_IA32_FEATURE_CONTROL_SGX_GE | MSR_IA32_FEATURE_CONTROL_LOCK) diff --git a/hypervisor/arch/x86/timer.c b/hypervisor/arch/x86/timer.c index 2137cba98..1e65be593 100644 --- a/hypervisor/arch/x86/timer.c +++ b/hypervisor/arch/x86/timer.c @@ -6,14 +6,14 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include +#include #define MAX_TIMER_ACTIONS 32U #define CAL_MS 10U diff --git a/hypervisor/arch/x86/trampoline.c b/hypervisor/arch/x86/trampoline.c index 47002f637..a7a02008b 100644 --- a/hypervisor/arch/x86/trampoline.c +++ b/hypervisor/arch/x86/trampoline.c @@ -5,12 +5,12 @@ */ #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include static uint64_t trampoline_start16_paddr; diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c index 613935b1b..c37e9d90f 100644 --- a/hypervisor/arch/x86/vmx.c +++ b/hypervisor/arch/x86/vmx.c @@ -7,10 +7,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include /** * @pre addr != NULL && addr is 4KB-aligned diff --git a/hypervisor/arch/x86/vtd.c b/hypervisor/arch/x86/vtd.c index 7e4a9956a..eb18ec890 100644 --- a/hypervisor/arch/x86/vtd.c +++ b/hypervisor/arch/x86/vtd.c @@ -8,22 +8,22 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #define DBG_IOMMU 0 diff --git a/hypervisor/boot/acpi_base.c b/hypervisor/boot/acpi_base.c index 2541b6f63..949f9e7ef 100644 --- a/hypervisor/boot/acpi_base.c +++ b/hypervisor/boot/acpi_base.c @@ -29,12 +29,12 @@ #include #include #include "acpi.h" -#include -#include +#include +#include #include #include #include -#include +#include #include static struct acpi_table_rsdp *acpi_rsdp; diff --git a/hypervisor/boot/guest/vboot_info.c b/hypervisor/boot/guest/vboot_info.c index 25941b29f..d41b31432 100644 --- a/hypervisor/boot/guest/vboot_info.c +++ b/hypervisor/boot/guest/vboot_info.c @@ -7,14 +7,14 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/boot/multiboot/multiboot.c b/hypervisor/boot/multiboot/multiboot.c index 84f57a365..5bf623b04 100644 --- a/hypervisor/boot/multiboot/multiboot.c +++ b/hypervisor/boot/multiboot/multiboot.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/hypervisor/boot/multiboot/multiboot2.c b/hypervisor/boot/multiboot/multiboot2.c index 3ffeefabe..0e1860f70 100644 --- a/hypervisor/boot/multiboot/multiboot2.c +++ b/hypervisor/boot/multiboot/multiboot2.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "multiboot_priv.h" /** diff --git a/hypervisor/boot/reloc.c b/hypervisor/boot/reloc.c index bc4d28412..e7aa42f4e 100644 --- a/hypervisor/boot/reloc.c +++ b/hypervisor/boot/reloc.c @@ -6,7 +6,7 @@ #include #include -#include +#include #ifdef CONFIG_RELOC #define DT_NULL 0U /* end of .dynamic section */ diff --git a/hypervisor/common/event.c b/hypervisor/common/event.c index 8cc77fabd..e05cd963c 100644 --- a/hypervisor/common/event.c +++ b/hypervisor/common/event.c @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c index 97fb554fd..44af69da1 100644 --- a/hypervisor/common/hv_main.c +++ b/hypervisor/common/hv_main.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c index 145138f32..122e4414c 100644 --- a/hypervisor/common/hypercall.c +++ b/hypervisor/common/hypercall.c @@ -4,26 +4,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #define DBG_LEVEL_HYCALL 6U diff --git a/hypervisor/common/irq.c b/hypervisor/common/irq.c index 34b8af163..2a43b1534 100644 --- a/hypervisor/common/irq.c +++ b/hypervisor/common/irq.c @@ -5,11 +5,11 @@ */ #include -#include +#include #include #include -#include -#include +#include +#include static spinlock_t irq_alloc_spinlock = { .head = 0U, .tail = 0U, }; diff --git a/hypervisor/common/ptdev.c b/hypervisor/common/ptdev.c index 32d041268..b2d482977 100644 --- a/hypervisor/common/ptdev.c +++ b/hypervisor/common/ptdev.c @@ -5,13 +5,13 @@ */ #include -#include -#include +#include +#include #include #include #include #include -#include +#include #define PTIRQ_ENTRY_HASHBITS 9U #define PTIRQ_ENTRY_HASHSIZE (1U << PTIRQ_ENTRY_HASHBITS) diff --git a/hypervisor/common/sched_bvt.c b/hypervisor/common/sched_bvt.c index b4a56f50a..bd32467e2 100644 --- a/hypervisor/common/sched_bvt.c +++ b/hypervisor/common/sched_bvt.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #define BVT_MCU_MS 1U diff --git a/hypervisor/common/sched_iorr.c b/hypervisor/common/sched_iorr.c index ad98b4e4c..deffd177f 100644 --- a/hypervisor/common/sched_iorr.c +++ b/hypervisor/common/sched_iorr.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #define CONFIG_SLICE_MS 10UL diff --git a/hypervisor/common/sched_noop.c b/hypervisor/common/sched_noop.c index 8e9edbfc7..b55fb3a55 100644 --- a/hypervisor/common/sched_noop.c +++ b/hypervisor/common/sched_noop.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include static int32_t sched_noop_init(struct sched_control *ctl) diff --git a/hypervisor/common/schedule.c b/hypervisor/common/schedule.c index 6cc181d19..1e88ff74a 100644 --- a/hypervisor/common/schedule.c +++ b/hypervisor/common/schedule.c @@ -6,13 +6,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include bool is_idle_thread(const struct thread_object *obj) { diff --git a/hypervisor/common/softirq.c b/hypervisor/common/softirq.c index dfcd066df..8a56f1b30 100644 --- a/hypervisor/common/softirq.c +++ b/hypervisor/common/softirq.c @@ -5,9 +5,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include static softirq_handler softirq_handlers[NR_SOFTIRQS]; diff --git a/hypervisor/common/trusty_hypercall.c b/hypervisor/common/trusty_hypercall.c index e2f70e33d..3f9279500 100644 --- a/hypervisor/common/trusty_hypercall.c +++ b/hypervisor/common/trusty_hypercall.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index cd231e7a8..bb1a2b7b7 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/debug/console.c b/hypervisor/debug/console.c index 854c4edc8..e1b7f5c75 100644 --- a/hypervisor/debug/console.c +++ b/hypervisor/debug/console.c @@ -8,11 +8,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/hypervisor/debug/dump.c b/hypervisor/debug/dump.c index 03e28260e..53a4648ef 100644 --- a/hypervisor/debug/dump.c +++ b/hypervisor/debug/dump.c @@ -5,12 +5,12 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/debug/hypercall.c b/hypervisor/debug/hypercall.c index d41ce2679..779a27bab 100644 --- a/hypervisor/debug/hypercall.c +++ b/hypervisor/debug/hypercall.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #ifdef PROFILING_ON diff --git a/hypervisor/debug/logmsg.c b/hypervisor/debug/logmsg.c index 755e3aed3..2265e1825 100644 --- a/hypervisor/debug/logmsg.c +++ b/hypervisor/debug/logmsg.c @@ -5,10 +5,10 @@ */ #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/hypervisor/debug/npk_log.c b/hypervisor/debug/npk_log.c index c953a0f8e..e5ea0b4b4 100644 --- a/hypervisor/debug/npk_log.c +++ b/hypervisor/debug/npk_log.c @@ -4,11 +4,11 @@ */ #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/hypervisor/debug/profiling.c b/hypervisor/debug/profiling.c index ab2b453a7..c300bc418 100644 --- a/hypervisor/debug/profiling.c +++ b/hypervisor/debug/profiling.c @@ -7,12 +7,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/hypervisor/debug/sbuf.c b/hypervisor/debug/sbuf.c index 59a0a498d..20f918032 100644 --- a/hypervisor/debug/sbuf.c +++ b/hypervisor/debug/sbuf.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include uint32_t sbuf_next_ptr(uint32_t pos_arg, uint32_t span, uint32_t scope) diff --git a/hypervisor/debug/shell.c b/hypervisor/debug/shell.c index a90ecb9a3..39cd161db 100644 --- a/hypervisor/debug/shell.c +++ b/hypervisor/debug/shell.c @@ -6,22 +6,22 @@ #include #include -#include +#include #include "shell_priv.h" -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #define TEMP_STR_SIZE 60U #define MAX_STR_SIZE 256U diff --git a/hypervisor/debug/shell_priv.h b/hypervisor/debug/shell_priv.h index 6e07078d1..c3e608a34 100644 --- a/hypervisor/debug/shell_priv.h +++ b/hypervisor/debug/shell_priv.h @@ -7,7 +7,7 @@ #ifndef SHELL_PRIV_H #define SHELL_PRIV_H -#include +#include #define SHELL_CMD_MAX_LEN 100U #define SHELL_STRING_MAX_LEN (PAGE_SIZE << 2U) diff --git a/hypervisor/debug/trace.c b/hypervisor/debug/trace.c index 86c42a612..34b193fd9 100644 --- a/hypervisor/debug/trace.c +++ b/hypervisor/debug/trace.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #define TRACE_CUSTOM 0xFCU diff --git a/hypervisor/debug/uart16550.c b/hypervisor/debug/uart16550.c index 191d86fe9..cd605137c 100644 --- a/hypervisor/debug/uart16550.c +++ b/hypervisor/debug/uart16550.c @@ -5,12 +5,12 @@ */ #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #define MAX_BDF_LEN 8 diff --git a/hypervisor/dm/io_req.c b/hypervisor/dm/io_req.c index 11b465149..2d34c7a32 100644 --- a/hypervisor/dm/io_req.c +++ b/hypervisor/dm/io_req.c @@ -3,8 +3,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include #include diff --git a/hypervisor/dm/mmio_dev.c b/hypervisor/dm/mmio_dev.c index 8ecb2dc21..012eca673 100644 --- a/hypervisor/dm/mmio_dev.c +++ b/hypervisor/dm/mmio_dev.c @@ -7,9 +7,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include int32_t assign_mmio_dev(struct acrn_vm *vm, const struct acrn_mmiodev *mmiodev) { diff --git a/hypervisor/dm/vgpio.c b/hypervisor/dm/vgpio.c index 6558f73c5..52b86603a 100644 --- a/hypervisor/dm/vgpio.c +++ b/hypervisor/dm/vgpio.c @@ -38,11 +38,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef P2SB_VGPIO_DM_ENABLED diff --git a/hypervisor/dm/vioapic.c b/hypervisor/dm/vioapic.c index cbee67e2a..f1dd57a7e 100644 --- a/hypervisor/dm/vioapic.c +++ b/hypervisor/dm/vioapic.c @@ -30,13 +30,13 @@ #define pr_prefix "vioapic: " -#include +#include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #define RTBL_RO_BITS ((uint32_t)0x00004000U | (uint32_t)0x00001000U) /*Remote IRR and Delivery Status bits*/ diff --git a/hypervisor/dm/vpci/ivshmem.c b/hypervisor/dm/vpci/ivshmem.c index cc700f1b4..07c428791 100644 --- a/hypervisor/dm/vpci/ivshmem.c +++ b/hypervisor/dm/vpci/ivshmem.c @@ -5,9 +5,9 @@ */ #ifdef CONFIG_IVSHMEM_ENABLED -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/hypervisor/dm/vpci/pci_pt.c b/hypervisor/dm/vpci/pci_pt.c index 3f5aa3825..ff37cda37 100644 --- a/hypervisor/dm/vpci/pci_pt.c +++ b/hypervisor/dm/vpci/pci_pt.c @@ -26,14 +26,14 @@ * * $FreeBSD$ */ -#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "vpci_priv.h" diff --git a/hypervisor/dm/vpci/vdev.c b/hypervisor/dm/vpci/vdev.c index 74b6e8659..c1bf57931 100644 --- a/hypervisor/dm/vpci/vdev.c +++ b/hypervisor/dm/vpci/vdev.c @@ -27,9 +27,9 @@ * $FreeBSD$ */ -#include +#include #include "vpci_priv.h" -#include +#include #include #include diff --git a/hypervisor/dm/vpci/vhostbridge.c b/hypervisor/dm/vpci/vhostbridge.c index b9d0cf843..295a63fed 100644 --- a/hypervisor/dm/vpci/vhostbridge.c +++ b/hypervisor/dm/vpci/vhostbridge.c @@ -34,7 +34,7 @@ * Series Host Bridge (rev 0b) */ -#include +#include #include #include "vpci_priv.h" #include diff --git a/hypervisor/dm/vpci/vmcs9900.c b/hypervisor/dm/vpci/vmcs9900.c index d61641921..cdd4b06d8 100644 --- a/hypervisor/dm/vpci/vmcs9900.c +++ b/hypervisor/dm/vpci/vmcs9900.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #include #include #include diff --git a/hypervisor/dm/vpci/vmsi.c b/hypervisor/dm/vpci/vmsi.c index a6e878e81..49b3d9ad9 100644 --- a/hypervisor/dm/vpci/vmsi.c +++ b/hypervisor/dm/vpci/vmsi.c @@ -27,11 +27,11 @@ * $FreeBSD$ */ -#include +#include #include -#include +#include #include -#include +#include #include "vpci_priv.h" diff --git a/hypervisor/dm/vpci/vmsix.c b/hypervisor/dm/vpci/vmsix.c index 507e45423..4db3791fb 100644 --- a/hypervisor/dm/vpci/vmsix.c +++ b/hypervisor/dm/vpci/vmsix.c @@ -27,11 +27,11 @@ * $FreeBSD$ */ -#include +#include #include #include -#include -#include +#include +#include #include #include "vpci_priv.h" diff --git a/hypervisor/dm/vpci/vmsix_on_msi.c b/hypervisor/dm/vpci/vmsix_on_msi.c index d6c2237da..5a9b18fec 100644 --- a/hypervisor/dm/vpci/vmsix_on_msi.c +++ b/hypervisor/dm/vpci/vmsix_on_msi.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include "vpci_priv.h" #define PER_VECTOR_MASK_CAP 0x0100U diff --git a/hypervisor/dm/vpci/vpci.c b/hypervisor/dm/vpci/vpci.c index 2f75fdbe4..14e5653d0 100644 --- a/hypervisor/dm/vpci/vpci.c +++ b/hypervisor/dm/vpci/vpci.c @@ -29,14 +29,14 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include "vpci_priv.h" -#include +#include #include static void vpci_init_vdevs(struct acrn_vm *vm); diff --git a/hypervisor/dm/vpci/vpci_bridge.c b/hypervisor/dm/vpci/vpci_bridge.c index c425f79e2..7f5a8473a 100644 --- a/hypervisor/dm/vpci/vpci_bridge.c +++ b/hypervisor/dm/vpci/vpci_bridge.c @@ -45,7 +45,7 @@ * 1. SOS how to reset PCI devices under the PCI bridge */ -#include +#include #include #include #include diff --git a/hypervisor/dm/vpci/vsriov.c b/hypervisor/dm/vpci/vsriov.c index 730931b12..3f13ce6e9 100644 --- a/hypervisor/dm/vpci/vsriov.c +++ b/hypervisor/dm/vpci/vsriov.c @@ -27,10 +27,10 @@ * $FreeBSD$ */ -#include +#include #include #include -#include +#include #include #include "vpci_priv.h" diff --git a/hypervisor/dm/vpic.c b/hypervisor/dm/vpic.c index 1ba367a9a..64b0e7a24 100644 --- a/hypervisor/dm/vpic.c +++ b/hypervisor/dm/vpic.c @@ -27,14 +27,14 @@ #define pr_prefix "vpic: " -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #define DBG_LEVEL_PIC 6U diff --git a/hypervisor/dm/vrtc.c b/hypervisor/dm/vrtc.c index bec9dbfd8..d72363cf8 100644 --- a/hypervisor/dm/vrtc.c +++ b/hypervisor/dm/vrtc.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include #define CMOS_ADDR_PORT 0x70U #define CMOS_DATA_PORT 0x71U diff --git a/hypervisor/dm/vuart.c b/hypervisor/dm/vuart.c index da5872305..a3890f9df 100644 --- a/hypervisor/dm/vuart.c +++ b/hypervisor/dm/vuart.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #define init_vuart_lock(vu) spinlock_init(&((vu)->lock)) diff --git a/hypervisor/hw/pci.c b/hypervisor/hw/pci.c index 5511a788c..95b1b1d22 100644 --- a/hypervisor/hw/pci.c +++ b/hypervisor/hw/pci.c @@ -32,17 +32,17 @@ * */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/hypervisor/include/arch/x86/apicreg.h b/hypervisor/include/arch/x86/asm/apicreg.h similarity index 99% rename from hypervisor/include/arch/x86/apicreg.h rename to hypervisor/include/arch/x86/asm/apicreg.h index 1380fa620..b4024d6e5 100644 --- a/hypervisor/include/arch/x86/apicreg.h +++ b/hypervisor/include/arch/x86/asm/apicreg.h @@ -29,7 +29,7 @@ #ifndef APICREG_H #define APICREG_H -#include +#include /* * Local && I/O APIC definitions. diff --git a/hypervisor/include/arch/x86/board.h b/hypervisor/include/arch/x86/asm/board.h similarity index 97% rename from hypervisor/include/arch/x86/board.h rename to hypervisor/include/arch/x86/asm/board.h index 489ab04e7..30a5bc484 100644 --- a/hypervisor/include/arch/x86/board.h +++ b/hypervisor/include/arch/x86/asm/board.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/hypervisor/include/arch/x86/boot/ld_sym.h b/hypervisor/include/arch/x86/asm/boot/ld_sym.h similarity index 100% rename from hypervisor/include/arch/x86/boot/ld_sym.h rename to hypervisor/include/arch/x86/asm/boot/ld_sym.h diff --git a/hypervisor/include/arch/x86/cpu.h b/hypervisor/include/arch/x86/asm/cpu.h similarity index 100% rename from hypervisor/include/arch/x86/cpu.h rename to hypervisor/include/arch/x86/asm/cpu.h diff --git a/hypervisor/include/arch/x86/cpu_caps.h b/hypervisor/include/arch/x86/asm/cpu_caps.h similarity index 100% rename from hypervisor/include/arch/x86/cpu_caps.h rename to hypervisor/include/arch/x86/asm/cpu_caps.h diff --git a/hypervisor/include/arch/x86/cpufeatures.h b/hypervisor/include/arch/x86/asm/cpufeatures.h similarity index 100% rename from hypervisor/include/arch/x86/cpufeatures.h rename to hypervisor/include/arch/x86/asm/cpufeatures.h diff --git a/hypervisor/include/arch/x86/cpuid.h b/hypervisor/include/arch/x86/asm/cpuid.h similarity index 100% rename from hypervisor/include/arch/x86/cpuid.h rename to hypervisor/include/arch/x86/asm/cpuid.h diff --git a/hypervisor/include/arch/x86/default_acpi_info.h b/hypervisor/include/arch/x86/asm/default_acpi_info.h similarity index 100% rename from hypervisor/include/arch/x86/default_acpi_info.h rename to hypervisor/include/arch/x86/asm/default_acpi_info.h diff --git a/hypervisor/include/arch/x86/e820.h b/hypervisor/include/arch/x86/asm/e820.h similarity index 100% rename from hypervisor/include/arch/x86/e820.h rename to hypervisor/include/arch/x86/asm/e820.h diff --git a/hypervisor/include/arch/x86/gdt.h b/hypervisor/include/arch/x86/asm/gdt.h similarity index 99% rename from hypervisor/include/arch/x86/gdt.h rename to hypervisor/include/arch/x86/asm/gdt.h index a0d08c2e8..a21f38fdd 100644 --- a/hypervisor/include/arch/x86/gdt.h +++ b/hypervisor/include/arch/x86/asm/gdt.h @@ -69,7 +69,7 @@ #ifndef ASSEMBLER #include -#include +#include #define TSS_AVAIL (9U) diff --git a/hypervisor/include/arch/x86/guest/assign.h b/hypervisor/include/arch/x86/asm/guest/assign.h similarity index 100% rename from hypervisor/include/arch/x86/guest/assign.h rename to hypervisor/include/arch/x86/asm/guest/assign.h diff --git a/hypervisor/include/arch/x86/guest/ept.h b/hypervisor/include/arch/x86/asm/guest/ept.h similarity index 100% rename from hypervisor/include/arch/x86/guest/ept.h rename to hypervisor/include/arch/x86/asm/guest/ept.h diff --git a/hypervisor/include/arch/x86/guest/guest_memory.h b/hypervisor/include/arch/x86/asm/guest/guest_memory.h similarity index 100% rename from hypervisor/include/arch/x86/guest/guest_memory.h rename to hypervisor/include/arch/x86/asm/guest/guest_memory.h diff --git a/hypervisor/include/arch/x86/guest/guest_pm.h b/hypervisor/include/arch/x86/asm/guest/guest_pm.h similarity index 100% rename from hypervisor/include/arch/x86/guest/guest_pm.h rename to hypervisor/include/arch/x86/asm/guest/guest_pm.h diff --git a/hypervisor/include/arch/x86/guest/hyperv.h b/hypervisor/include/arch/x86/asm/guest/hyperv.h similarity index 97% rename from hypervisor/include/arch/x86/guest/hyperv.h rename to hypervisor/include/arch/x86/asm/guest/hyperv.h index 4b3fb9764..5311a30a1 100644 --- a/hypervisor/include/arch/x86/guest/hyperv.h +++ b/hypervisor/include/arch/x86/asm/guest/hyperv.h @@ -7,7 +7,7 @@ #ifndef HYPERV_H #define HYPERV_H -#include +#include /* Hyper-V MSR numbers */ #define HV_X64_MSR_GUEST_OS_ID 0x40000000U diff --git a/hypervisor/include/arch/x86/guest/instr_emul.h b/hypervisor/include/arch/x86/asm/guest/instr_emul.h similarity index 98% rename from hypervisor/include/arch/x86/guest/instr_emul.h rename to hypervisor/include/arch/x86/asm/guest/instr_emul.h index 1272a2655..6969c0412 100644 --- a/hypervisor/include/arch/x86/guest/instr_emul.h +++ b/hypervisor/include/arch/x86/asm/guest/instr_emul.h @@ -31,8 +31,8 @@ #define INSTR_EMUL_H #include -#include -#include +#include +#include struct acrn_vcpu; struct instr_emul_vie_op { diff --git a/hypervisor/include/arch/x86/guest/splitlock.h b/hypervisor/include/arch/x86/asm/guest/splitlock.h similarity index 100% rename from hypervisor/include/arch/x86/guest/splitlock.h rename to hypervisor/include/arch/x86/asm/guest/splitlock.h diff --git a/hypervisor/include/arch/x86/guest/trusty.h b/hypervisor/include/arch/x86/asm/guest/trusty.h similarity index 99% rename from hypervisor/include/arch/x86/guest/trusty.h rename to hypervisor/include/arch/x86/asm/guest/trusty.h index b1cca1e63..a31e5edf1 100644 --- a/hypervisor/include/arch/x86/guest/trusty.h +++ b/hypervisor/include/arch/x86/asm/guest/trusty.h @@ -7,7 +7,7 @@ #ifndef TRUSTY_H_ #define TRUSTY_H_ #include -#include +#include #define RPMB_MAX_PARTITION_NUMBER 6U #define MMC_PROD_NAME_WITH_PSN_LEN 15U diff --git a/hypervisor/include/arch/x86/guest/ucode.h b/hypervisor/include/arch/x86/asm/guest/ucode.h similarity index 100% rename from hypervisor/include/arch/x86/guest/ucode.h rename to hypervisor/include/arch/x86/asm/guest/ucode.h diff --git a/hypervisor/include/arch/x86/guest/vcpu.h b/hypervisor/include/arch/x86/asm/guest/vcpu.h similarity index 98% rename from hypervisor/include/arch/x86/guest/vcpu.h rename to hypervisor/include/arch/x86/asm/guest/vcpu.h index 520bca320..11c339a67 100644 --- a/hypervisor/include/arch/x86/guest/vcpu.h +++ b/hypervisor/include/arch/x86/asm/guest/vcpu.h @@ -17,17 +17,17 @@ #ifndef ASSEMBLER #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /** * @brief vcpu diff --git a/hypervisor/include/arch/x86/guest/vcpuid.h b/hypervisor/include/arch/x86/asm/guest/vcpuid.h similarity index 100% rename from hypervisor/include/arch/x86/guest/vcpuid.h rename to hypervisor/include/arch/x86/asm/guest/vcpuid.h diff --git a/hypervisor/include/arch/x86/guest/virq.h b/hypervisor/include/arch/x86/asm/guest/virq.h similarity index 100% rename from hypervisor/include/arch/x86/guest/virq.h rename to hypervisor/include/arch/x86/asm/guest/virq.h diff --git a/hypervisor/include/arch/x86/guest/virtual_cr.h b/hypervisor/include/arch/x86/asm/guest/virtual_cr.h similarity index 100% rename from hypervisor/include/arch/x86/guest/virtual_cr.h rename to hypervisor/include/arch/x86/asm/guest/virtual_cr.h diff --git a/hypervisor/include/arch/x86/guest/vlapic.h b/hypervisor/include/arch/x86/asm/guest/vlapic.h similarity index 98% rename from hypervisor/include/arch/x86/guest/vlapic.h rename to hypervisor/include/arch/x86/asm/guest/vlapic.h index f4d73a583..0235ec988 100644 --- a/hypervisor/include/arch/x86/guest/vlapic.h +++ b/hypervisor/include/arch/x86/asm/guest/vlapic.h @@ -30,9 +30,9 @@ #ifndef VLAPIC_H #define VLAPIC_H -#include -#include -#include +#include +#include +#include /** * @file vlapic.h diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/asm/guest/vm.h similarity index 96% rename from hypervisor/include/arch/x86/guest/vm.h rename to hypervisor/include/arch/x86/asm/guest/vm.h index 80eca5c39..5bb4fd630 100644 --- a/hypervisor/include/arch/x86/guest/vm.h +++ b/hypervisor/include/arch/x86/asm/guest/vm.h @@ -13,22 +13,22 @@ #ifndef ASSEMBLER -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #ifdef CONFIG_HYPERV_ENABLED -#include +#include #endif enum reset_mode { diff --git a/hypervisor/include/arch/x86/guest/vm_reset.h b/hypervisor/include/arch/x86/asm/guest/vm_reset.h similarity index 100% rename from hypervisor/include/arch/x86/guest/vm_reset.h rename to hypervisor/include/arch/x86/asm/guest/vm_reset.h diff --git a/hypervisor/include/arch/x86/guest/vmcs.h b/hypervisor/include/arch/x86/asm/guest/vmcs.h similarity index 98% rename from hypervisor/include/arch/x86/guest/vmcs.h rename to hypervisor/include/arch/x86/asm/guest/vmcs.h index a33b38a6c..b121ca6c0 100644 --- a/hypervisor/include/arch/x86/guest/vmcs.h +++ b/hypervisor/include/arch/x86/asm/guest/vmcs.h @@ -12,7 +12,7 @@ #ifndef ASSEMBLER #include -#include +#include #define VMX_VMENTRY_FAIL 0x80000000U diff --git a/hypervisor/include/arch/x86/guest/vmexit.h b/hypervisor/include/arch/x86/asm/guest/vmexit.h similarity index 100% rename from hypervisor/include/arch/x86/guest/vmexit.h rename to hypervisor/include/arch/x86/asm/guest/vmexit.h diff --git a/hypervisor/include/arch/x86/guest/vmtrr.h b/hypervisor/include/arch/x86/asm/guest/vmtrr.h similarity index 100% rename from hypervisor/include/arch/x86/guest/vmtrr.h rename to hypervisor/include/arch/x86/asm/guest/vmtrr.h diff --git a/hypervisor/include/arch/x86/guest/vmx_io.h b/hypervisor/include/arch/x86/asm/guest/vmx_io.h similarity index 100% rename from hypervisor/include/arch/x86/guest/vmx_io.h rename to hypervisor/include/arch/x86/asm/guest/vmx_io.h diff --git a/hypervisor/include/arch/x86/host_pm.h b/hypervisor/include/arch/x86/asm/host_pm.h similarity index 100% rename from hypervisor/include/arch/x86/host_pm.h rename to hypervisor/include/arch/x86/asm/host_pm.h diff --git a/hypervisor/include/arch/x86/idt.h b/hypervisor/include/arch/x86/asm/idt.h similarity index 100% rename from hypervisor/include/arch/x86/idt.h rename to hypervisor/include/arch/x86/asm/idt.h diff --git a/hypervisor/include/arch/x86/init.h b/hypervisor/include/arch/x86/asm/init.h similarity index 100% rename from hypervisor/include/arch/x86/init.h rename to hypervisor/include/arch/x86/asm/init.h diff --git a/hypervisor/include/arch/x86/io.h b/hypervisor/include/arch/x86/asm/io.h similarity index 100% rename from hypervisor/include/arch/x86/io.h rename to hypervisor/include/arch/x86/asm/io.h diff --git a/hypervisor/include/arch/x86/ioapic.h b/hypervisor/include/arch/x86/asm/ioapic.h similarity index 98% rename from hypervisor/include/arch/x86/ioapic.h rename to hypervisor/include/arch/x86/asm/ioapic.h index 37ae7d084..b044198d4 100644 --- a/hypervisor/include/arch/x86/ioapic.h +++ b/hypervisor/include/arch/x86/asm/ioapic.h @@ -7,7 +7,7 @@ #ifndef ARCH_X86_IOAPIC_H #define ARCH_X86_IOAPIC_H -#include +#include #define NR_LEGACY_IRQ 16U #define NR_LEGACY_PIN NR_LEGACY_IRQ diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/asm/irq.h similarity index 99% rename from hypervisor/include/arch/x86/irq.h rename to hypervisor/include/arch/x86/asm/irq.h index 823bf29d8..187d7704e 100644 --- a/hypervisor/include/arch/x86/irq.h +++ b/hypervisor/include/arch/x86/asm/irq.h @@ -10,7 +10,7 @@ #include /** - * @file arch/x86/irq.h + * @file arch/x86/asm/irq.h * * @brief public APIs for x86 IRQ handling */ diff --git a/hypervisor/include/arch/x86/lapic.h b/hypervisor/include/arch/x86/asm/lapic.h similarity index 100% rename from hypervisor/include/arch/x86/lapic.h rename to hypervisor/include/arch/x86/asm/lapic.h diff --git a/hypervisor/include/arch/x86/lib/atomic.h b/hypervisor/include/arch/x86/asm/lib/atomic.h similarity index 100% rename from hypervisor/include/arch/x86/lib/atomic.h rename to hypervisor/include/arch/x86/asm/lib/atomic.h diff --git a/hypervisor/include/arch/x86/lib/bits.h b/hypervisor/include/arch/x86/asm/lib/bits.h similarity index 99% rename from hypervisor/include/arch/x86/lib/bits.h rename to hypervisor/include/arch/x86/asm/lib/bits.h index 0928a374a..d0b8d0586 100644 --- a/hypervisor/include/arch/x86/lib/bits.h +++ b/hypervisor/include/arch/x86/asm/lib/bits.h @@ -29,7 +29,7 @@ #ifndef BITS_H #define BITS_H -#include +#include /** * diff --git a/hypervisor/include/arch/x86/lib/spinlock.h b/hypervisor/include/arch/x86/asm/lib/spinlock.h similarity index 100% rename from hypervisor/include/arch/x86/lib/spinlock.h rename to hypervisor/include/arch/x86/asm/lib/spinlock.h diff --git a/hypervisor/include/arch/x86/mmu.h b/hypervisor/include/arch/x86/asm/mmu.h similarity index 97% rename from hypervisor/include/arch/x86/mmu.h rename to hypervisor/include/arch/x86/asm/mmu.h index 50fd9691f..ffb749326 100644 --- a/hypervisor/include/arch/x86/mmu.h +++ b/hypervisor/include/arch/x86/asm/mmu.h @@ -45,10 +45,10 @@ #ifndef ASSEMBLER -#include -#include -#include -#include +#include +#include +#include +#include /* Define cache line size (in bytes) */ #define CACHE_LINE_SIZE 64U diff --git a/hypervisor/include/arch/x86/msr.h b/hypervisor/include/arch/x86/asm/msr.h similarity index 100% rename from hypervisor/include/arch/x86/msr.h rename to hypervisor/include/arch/x86/asm/msr.h diff --git a/hypervisor/include/arch/x86/notify.h b/hypervisor/include/arch/x86/asm/notify.h similarity index 100% rename from hypervisor/include/arch/x86/notify.h rename to hypervisor/include/arch/x86/asm/notify.h diff --git a/hypervisor/include/arch/x86/page.h b/hypervisor/include/arch/x86/asm/page.h similarity index 97% rename from hypervisor/include/arch/x86/page.h rename to hypervisor/include/arch/x86/asm/page.h index 48435269b..2d78634cb 100644 --- a/hypervisor/include/arch/x86/page.h +++ b/hypervisor/include/arch/x86/asm/page.h @@ -7,7 +7,7 @@ #ifndef PAGE_H #define PAGE_H -#include +#include #define PAGE_SHIFT 12U #define PAGE_SIZE (1U << PAGE_SHIFT) diff --git a/hypervisor/include/arch/x86/pci_dev.h b/hypervisor/include/arch/x86/asm/pci_dev.h similarity index 92% rename from hypervisor/include/arch/x86/pci_dev.h rename to hypervisor/include/arch/x86/asm/pci_dev.h index 2ef9e79a4..c4916bdd9 100644 --- a/hypervisor/include/arch/x86/pci_dev.h +++ b/hypervisor/include/arch/x86/asm/pci_dev.h @@ -7,7 +7,7 @@ #ifndef PCI_DEV_H_ #define PCI_DEV_H_ -#include +#include extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/hypervisor/include/arch/x86/per_cpu.h b/hypervisor/include/arch/x86/asm/per_cpu.h similarity index 94% rename from hypervisor/include/arch/x86/per_cpu.h rename to hypervisor/include/arch/x86/asm/per_cpu.h index 326236563..2ccf6bc44 100644 --- a/hypervisor/include/arch/x86/per_cpu.h +++ b/hypervisor/include/arch/x86/asm/per_cpu.h @@ -10,15 +10,15 @@ #include #include #include -#include -#include -#include #include #include -#include #include -#include -#include +#include +#include +#include +#include +#include +#include struct per_cpu_region { /* vmxon_region MUST be 4KB-aligned */ diff --git a/hypervisor/include/arch/x86/pgtable.h b/hypervisor/include/arch/x86/asm/pgtable.h similarity index 99% rename from hypervisor/include/arch/x86/pgtable.h rename to hypervisor/include/arch/x86/asm/pgtable.h index 6f2f59ee4..ad3da72bd 100644 --- a/hypervisor/include/arch/x86/pgtable.h +++ b/hypervisor/include/arch/x86/asm/pgtable.h @@ -11,7 +11,7 @@ #ifndef PGTABLE_H #define PGTABLE_H -#include +#include #define PAGE_PRESENT (1UL << 0U) #define PAGE_RW (1UL << 1U) diff --git a/hypervisor/include/arch/x86/platform_caps.h b/hypervisor/include/arch/x86/asm/platform_caps.h similarity index 100% rename from hypervisor/include/arch/x86/platform_caps.h rename to hypervisor/include/arch/x86/asm/platform_caps.h diff --git a/hypervisor/include/arch/x86/rdt.h b/hypervisor/include/arch/x86/asm/rdt.h similarity index 100% rename from hypervisor/include/arch/x86/rdt.h rename to hypervisor/include/arch/x86/asm/rdt.h diff --git a/hypervisor/include/arch/x86/rtcm.h b/hypervisor/include/arch/x86/asm/rtcm.h similarity index 96% rename from hypervisor/include/arch/x86/rtcm.h rename to hypervisor/include/arch/x86/asm/rtcm.h index 02f7db280..b9957457d 100644 --- a/hypervisor/include/arch/x86/rtcm.h +++ b/hypervisor/include/arch/x86/asm/rtcm.h @@ -7,7 +7,7 @@ #ifndef RTCM_H #define RTCM_H -#include +#include #define MSABI __attribute__((ms_abi)) diff --git a/hypervisor/include/arch/x86/rtct.h b/hypervisor/include/arch/x86/asm/rtct.h similarity index 100% rename from hypervisor/include/arch/x86/rtct.h rename to hypervisor/include/arch/x86/asm/rtct.h diff --git a/hypervisor/include/arch/x86/security.h b/hypervisor/include/arch/x86/asm/security.h similarity index 100% rename from hypervisor/include/arch/x86/security.h rename to hypervisor/include/arch/x86/asm/security.h diff --git a/hypervisor/include/arch/x86/seed.h b/hypervisor/include/arch/x86/asm/seed.h similarity index 100% rename from hypervisor/include/arch/x86/seed.h rename to hypervisor/include/arch/x86/asm/seed.h diff --git a/hypervisor/include/arch/x86/sgx.h b/hypervisor/include/arch/x86/asm/sgx.h similarity index 100% rename from hypervisor/include/arch/x86/sgx.h rename to hypervisor/include/arch/x86/asm/sgx.h diff --git a/hypervisor/include/arch/x86/timer.h b/hypervisor/include/arch/x86/asm/timer.h similarity index 100% rename from hypervisor/include/arch/x86/timer.h rename to hypervisor/include/arch/x86/asm/timer.h diff --git a/hypervisor/include/arch/x86/trampoline.h b/hypervisor/include/arch/x86/asm/trampoline.h similarity index 100% rename from hypervisor/include/arch/x86/trampoline.h rename to hypervisor/include/arch/x86/asm/trampoline.h diff --git a/hypervisor/include/arch/x86/vm_config.h b/hypervisor/include/arch/x86/asm/vm_config.h similarity index 99% rename from hypervisor/include/arch/x86/vm_config.h rename to hypervisor/include/arch/x86/asm/vm_config.h index 7251310e5..b143e413c 100644 --- a/hypervisor/include/arch/x86/vm_config.h +++ b/hypervisor/include/arch/x86/asm/vm_config.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #define CONFIG_MAX_VM_NUM (PRE_VM_NUM + SOS_VM_NUM + MAX_POST_VM_NUM) diff --git a/hypervisor/include/arch/x86/vmx.h b/hypervisor/include/arch/x86/asm/vmx.h similarity index 100% rename from hypervisor/include/arch/x86/vmx.h rename to hypervisor/include/arch/x86/asm/vmx.h diff --git a/hypervisor/include/arch/x86/vtd.h b/hypervisor/include/arch/x86/asm/vtd.h similarity index 100% rename from hypervisor/include/arch/x86/vtd.h rename to hypervisor/include/arch/x86/asm/vtd.h diff --git a/hypervisor/include/arch/x86/zeropage.h b/hypervisor/include/arch/x86/asm/zeropage.h similarity index 98% rename from hypervisor/include/arch/x86/zeropage.h rename to hypervisor/include/arch/x86/asm/zeropage.h index 39b94b4d7..cc2b047d3 100644 --- a/hypervisor/include/arch/x86/zeropage.h +++ b/hypervisor/include/arch/x86/asm/zeropage.h @@ -6,7 +6,7 @@ #ifndef ZEROPAGE_H #define ZEROPAGE_H -#include +#include #include struct zero_page { diff --git a/hypervisor/include/common/event.h b/hypervisor/include/common/event.h index 77b625ff7..78430b21e 100644 --- a/hypervisor/include/common/event.h +++ b/hypervisor/include/common/event.h @@ -1,6 +1,6 @@ #ifndef EVENT_H #define EVENT_H -#include +#include struct sched_event { spinlock_t lock; diff --git a/hypervisor/include/common/irq.h b/hypervisor/include/common/irq.h index cdf010ec6..5916929df 100644 --- a/hypervisor/include/common/irq.h +++ b/hypervisor/include/common/irq.h @@ -8,7 +8,7 @@ #define COMMON_IRQ_H #include -#include +#include /** * @file common/irq.h diff --git a/hypervisor/include/common/ptdev.h b/hypervisor/include/common/ptdev.h index c1b688d30..27a7ae204 100644 --- a/hypervisor/include/common/ptdev.h +++ b/hypervisor/include/common/ptdev.h @@ -7,8 +7,8 @@ #ifndef PTDEV_H #define PTDEV_H #include -#include -#include +#include +#include enum intx_ctlr { diff --git a/hypervisor/include/common/schedule.h b/hypervisor/include/common/schedule.h index e2c99230b..86e07f7a1 100644 --- a/hypervisor/include/common/schedule.h +++ b/hypervisor/include/common/schedule.h @@ -6,9 +6,9 @@ #ifndef SCHEDULE_H #define SCHEDULE_H -#include +#include #include -#include +#include #define NEED_RESCHEDULE (1U) diff --git a/hypervisor/include/debug/logmsg.h b/hypervisor/include/debug/logmsg.h index b90907b30..1e70ab2d9 100644 --- a/hypervisor/include/debug/logmsg.h +++ b/hypervisor/include/debug/logmsg.h @@ -6,7 +6,7 @@ #ifndef LOGMSG_H #define LOGMSG_H -#include +#include /* Logging severity levels */ #define LOG_FATAL 1U diff --git a/hypervisor/include/debug/profiling.h b/hypervisor/include/debug/profiling.h index 4223f4065..48a2098e2 100644 --- a/hypervisor/include/debug/profiling.h +++ b/hypervisor/include/debug/profiling.h @@ -11,6 +11,8 @@ #include #endif +struct acrn_vcpu; + void profiling_vmenter_handler(struct acrn_vcpu *vcpu); void profiling_pre_vmexit_handler(struct acrn_vcpu *vcpu); void profiling_post_vmexit_handler(struct acrn_vcpu *vcpu); diff --git a/hypervisor/include/debug/profiling_internal.h b/hypervisor/include/debug/profiling_internal.h index d4ce7f21e..43d8da3f8 100644 --- a/hypervisor/include/debug/profiling_internal.h +++ b/hypervisor/include/debug/profiling_internal.h @@ -9,8 +9,8 @@ #ifdef PROFILING_ON -#include -#include +#include +#include #define MAX_MSR_LIST_NUM 15U #define MAX_PROFILING_MSR_STORE_NUM 1 diff --git a/hypervisor/include/debug/trace.h b/hypervisor/include/debug/trace.h index 27dd1f5cb..2ecb8b04c 100644 --- a/hypervisor/include/debug/trace.h +++ b/hypervisor/include/debug/trace.h @@ -11,7 +11,7 @@ #ifndef TRACE_H #define TRACE_H -#include +#include /* TIMER EVENT */ #define TRACE_TIMER_ACTION_ADDED 0x1U #define TRACE_TIMER_ACTION_PCKUP 0x2U diff --git a/hypervisor/include/dm/vioapic.h b/hypervisor/include/dm/vioapic.h index 11db95aa7..2a2833289 100644 --- a/hypervisor/include/dm/vioapic.h +++ b/hypervisor/include/dm/vioapic.h @@ -37,8 +37,8 @@ * @brief public APIs for virtual I/O APIC */ -#include -#include +#include +#include #include #define VIOAPIC_BASE 0xFEC00000UL diff --git a/hypervisor/include/dm/vpci.h b/hypervisor/include/dm/vpci.h index d9b57b551..4fba29fd3 100644 --- a/hypervisor/include/dm/vpci.h +++ b/hypervisor/include/dm/vpci.h @@ -30,7 +30,7 @@ #ifndef VPCI_H_ #define VPCI_H_ -#include +#include #include #include diff --git a/hypervisor/include/dm/vuart.h b/hypervisor/include/dm/vuart.h index 1c8a01ec3..941983d55 100644 --- a/hypervisor/include/dm/vuart.h +++ b/hypervisor/include/dm/vuart.h @@ -30,8 +30,8 @@ #ifndef VUART_H #define VUART_H #include -#include -#include +#include +#include #define RX_BUF_SIZE 256U #define TX_BUF_SIZE 8192U diff --git a/hypervisor/release/dump.c b/hypervisor/release/dump.c index a367ab66b..dd07a9706 100644 --- a/hypervisor/release/dump.c +++ b/hypervisor/release/dump.c @@ -5,7 +5,7 @@ */ #include -#include +#include void dump_intr_excp_frame(__unused const struct intr_excp_ctx *ctx) {} void dump_exception(__unused struct intr_excp_ctx *ctx, __unused uint16_t pcpu_id) {} diff --git a/hypervisor/release/hypercall.c b/hypervisor/release/hypercall.c index b7eb841b6..ade0c97ff 100644 --- a/hypervisor/release/hypercall.c +++ b/hypervisor/release/hypercall.c @@ -6,7 +6,7 @@ #include #include -#include +#include int32_t hcall_setup_sbuf(__unused struct acrn_vm *vm, __unused struct acrn_vm *target_vm, __unused uint64_t param1, __unused uint64_t param2) diff --git a/hypervisor/release/profiling.c b/hypervisor/release/profiling.c index 0d86a98f3..edc7004b3 100644 --- a/hypervisor/release/profiling.c +++ b/hypervisor/release/profiling.c @@ -5,7 +5,7 @@ */ #include -#include +#include void profiling_vmenter_handler(__unused struct acrn_vcpu *vcpu) {} void profiling_pre_vmexit_handler(__unused struct acrn_vcpu *vcpu) {} diff --git a/misc/config_tools/board_config/board_c.py b/misc/config_tools/board_config/board_c.py index 9b359f182..c0a4072bf 100644 --- a/misc/config_tools/board_config/board_c.py +++ b/misc/config_tools/board_config/board_c.py @@ -15,9 +15,9 @@ class RDT(enum.Enum): MBA = 2 INCLUDE_HEADER = """ -#include -#include -#include +#include +#include +#include #include #include """ diff --git a/misc/config_tools/board_config/board_cfg_gen.py b/misc/config_tools/board_config/board_cfg_gen.py index 17c8f281f..aad6dd114 100755 --- a/misc/config_tools/board_config/board_cfg_gen.py +++ b/misc/config_tools/board_config/board_cfg_gen.py @@ -19,7 +19,7 @@ import vbar_base_h ACRN_PATH = common.SOURCE_ROOT_DIR ACRN_CONFIG_DEF = ACRN_PATH + "misc/config_tools/data/" -ACRN_DEFAULT_ACPI = ACRN_PATH + "hypervisor/include/arch/x86/default_acpi_info.h" +ACRN_DEFAULT_ACPI = ACRN_PATH + "hypervisor/include/arch/x86/asm/default_acpi_info.h" GEN_FILE = ["pci_devices.h", "board.c", "platform_acpi_info.h", "misc_cfg.h", "board_info.h", "vbar_base.h"] diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/hybrid/pci_dev.c index d6cca39a6..5c629d56f 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/pci_dev.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/pci_dev.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include -#include -#include +#include +#include struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/hybrid/pt_intx.c index b3c925a7c..dfc1bdcd5 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/pt_intx.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/pt_intx.c @@ -4,5 +4,5 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include struct pt_intx_config vm0_pt_intx[1U]; diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c index bb1350cc7..5995f06a0 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; extern struct pt_intx_config vm0_pt_intx[1U]; struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = { diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/ivshmem_cfg.h b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/ivshmem_cfg.h index efb1f36de..9be7216a5 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/ivshmem_cfg.h +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/ivshmem_cfg.h @@ -8,7 +8,7 @@ #define IVSHMEM_CFG_H #include -#include +#include #define IVSHMEM_SHM_REGION_0 "hv:/shm_region_0" /* The IVSHMEM_SHM_SIZE is the sum of all memory regions. The size range of each memory region is [2MB, 512MB] and is a diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pci_dev.c index 9fd191504..8fb7be399 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pci_dev.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pci_dev.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include -#include -#include +#include +#include #include /* diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pt_intx.c index b3c925a7c..dfc1bdcd5 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pt_intx.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/pt_intx.c @@ -4,5 +4,5 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include struct pt_intx_config vm0_pt_intx[1U]; diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c index 714e9f734..f80d72f57 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include extern struct acrn_vm_pci_dev_config vm0_pci_devs[VM0_CONFIG_PCI_DEV_NUM]; extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; extern struct acrn_vm_pci_dev_config vm2_pci_devs[VM2_CONFIG_PCI_DEV_NUM]; diff --git a/misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c index d6cca39a6..5c629d56f 100644 --- a/misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c +++ b/misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include -#include -#include +#include +#include struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; diff --git a/misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c index b3c925a7c..dfc1bdcd5 100644 --- a/misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c +++ b/misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c @@ -4,5 +4,5 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include struct pt_intx_config vm0_pt_intx[1U]; diff --git a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c index 75bb8de17..e07ec9054 100644 --- a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM]; extern struct pt_intx_config vm0_pt_intx[1U]; struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = { diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c index 12943a15e..3debf1ba7 100644 --- a/misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c +++ b/misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include #include #include -#include -#include +#include +#include diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c index b3c925a7c..dfc1bdcd5 100644 --- a/misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c +++ b/misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c @@ -4,5 +4,5 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include struct pt_intx_config vm0_pt_intx[1U]; diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c index 6da3934c3..ee0d04757 100644 --- a/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #include -#include +#include extern struct pt_intx_config vm0_pt_intx[1U]; struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = { { diff --git a/misc/config_tools/scenario_config/ivshmem_cfg_h.py b/misc/config_tools/scenario_config/ivshmem_cfg_h.py index 1aa737e81..0dccd1c41 100644 --- a/misc/config_tools/scenario_config/ivshmem_cfg_h.py +++ b/misc/config_tools/scenario_config/ivshmem_cfg_h.py @@ -95,7 +95,7 @@ def generate_file(scenario_items, config): if vm_info.shmem.shmem_enabled == 'y': print("#include ", file=config) - print("#include ", file=config) + print("#include ", file=config) write_shmem_regions(config) print("{0}".format(IVSHMEM_END_DEFINE), file=config) diff --git a/misc/config_tools/scenario_config/pci_dev_c.py b/misc/config_tools/scenario_config/pci_dev_c.py index 5969f34fa..ea143027b 100644 --- a/misc/config_tools/scenario_config/pci_dev_c.py +++ b/misc/config_tools/scenario_config/pci_dev_c.py @@ -131,12 +131,12 @@ def generate_file(vm_info, config): print("{}".format(scenario_cfg_lib.HEADER_LICENSE), file=config) print("", file=config) - print("#include ", file=config) + print("#include ", file=config) print("#include ", file=config) print("#include ", file=config) print("#include ", file=config) - print("#include ", file=config) - print("#include ", file=config) + print("#include ", file=config) + print("#include ", file=config) if pci_vuart_enabled: print("#include ", file=config) # Insert header for share memory diff --git a/misc/config_tools/scenario_config/pt_intx_c.py b/misc/config_tools/scenario_config/pt_intx_c.py index 96ef2a096..c864d6262 100644 --- a/misc/config_tools/scenario_config/pt_intx_c.py +++ b/misc/config_tools/scenario_config/pt_intx_c.py @@ -17,7 +17,7 @@ def generate_file(vm_info, config): print("{}".format(scenario_cfg_lib.HEADER_LICENSE), file=config) print("", file=config) - print("#include ", file=config) + print("#include ", file=config) print("", file=config) if (board_cfg_lib.is_matched_board(("ehl-crb-b")) diff --git a/misc/config_tools/scenario_config/vm_configurations_c.py b/misc/config_tools/scenario_config/vm_configurations_c.py index 2882685af..4de1728ce 100644 --- a/misc/config_tools/scenario_config/vm_configurations_c.py +++ b/misc/config_tools/scenario_config/vm_configurations_c.py @@ -9,9 +9,9 @@ import board_cfg_lib import scenario_cfg_lib C_HEADER = scenario_cfg_lib.HEADER_LICENSE + r""" -#include +#include #include -#include +#include """ def get_pre_vm_type(vm_type, vm_i): diff --git a/misc/config_tools/xforms/ivshmem_cfg.h.xsl b/misc/config_tools/xforms/ivshmem_cfg.h.xsl index 0f65f55c3..037e47a0a 100644 --- a/misc/config_tools/xforms/ivshmem_cfg.h.xsl +++ b/misc/config_tools/xforms/ivshmem_cfg.h.xsl @@ -29,7 +29,7 @@ - + diff --git a/misc/config_tools/xforms/pt_intx.c.xsl b/misc/config_tools/xforms/pt_intx.c.xsl index 7b05aa1f9..3a42e611d 100644 --- a/misc/config_tools/xforms/pt_intx.c.xsl +++ b/misc/config_tools/xforms/pt_intx.c.xsl @@ -18,7 +18,7 @@ - + diff --git a/misc/config_tools/xforms/vm_configurations.c.xsl b/misc/config_tools/xforms/vm_configurations.c.xsl index e6039e112..bc5e0aea3 100644 --- a/misc/config_tools/xforms/vm_configurations.c.xsl +++ b/misc/config_tools/xforms/vm_configurations.c.xsl @@ -14,9 +14,9 @@ - + - + diff --git a/misc/hv_prebuild/static_checks.c b/misc/hv_prebuild/static_checks.c index 077b72ec3..a1fdd863d 100644 --- a/misc/hv_prebuild/static_checks.c +++ b/misc/hv_prebuild/static_checks.c @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define CAT__(A,B) A ## B #define CAT_(A,B) CAT__(A,B) diff --git a/misc/hv_prebuild/vm_cfg_checks.c b/misc/hv_prebuild/vm_cfg_checks.c index cd58734b2..3c628cb0b 100644 --- a/misc/hv_prebuild/vm_cfg_checks.c +++ b/misc/hv_prebuild/vm_cfg_checks.c @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include