From 33ef6564620ab794ab0f3397cf9ca1d2375bafe9 Mon Sep 17 00:00:00 2001 From: Liang Yi Date: Thu, 4 Mar 2021 17:31:05 +0800 Subject: [PATCH] hv/mod-irq: use arch specific header files Requires explicit arch path name in the include directive. The config scripts was also updated to reflect this change. Tracked-On: #5825 Signed-off-by: Peter Fang Reviewed-by: Jason Chen CJ --- hypervisor/Makefile | 5 +-- hypervisor/acpi_parser/acpi_ext.c | 10 ++--- hypervisor/acpi_parser/dmar_parse.c | 12 +++--- 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/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 | 28 ++++++------- 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 | 19 ++++----- hypervisor/arch/x86/lapic.c | 14 +++---- hypervisor/arch/x86/mmu.c | 14 +++---- 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/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 | 10 ++--- 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 +++---- hypervisor/include/arch/x86/apicreg.h | 2 +- hypervisor/include/arch/x86/board.h | 2 +- hypervisor/include/arch/x86/gdt.h | 2 +- hypervisor/include/arch/x86/guest/hyperv.h | 2 +- .../include/arch/x86/guest/instr_emul.h | 4 +- hypervisor/include/arch/x86/guest/trusty.h | 2 +- hypervisor/include/arch/x86/guest/vcpu.h | 16 +++---- hypervisor/include/arch/x86/guest/vlapic.h | 6 +-- hypervisor/include/arch/x86/guest/vm.h | 22 +++++----- hypervisor/include/arch/x86/guest/vmcs.h | 2 +- hypervisor/include/arch/x86/ioapic.h | 2 +- hypervisor/include/arch/x86/lib/bits.h | 2 +- hypervisor/include/arch/x86/mmu.h | 8 ++-- hypervisor/include/arch/x86/page.h | 2 +- hypervisor/include/arch/x86/pci_dev.h | 2 +- hypervisor/include/arch/x86/per_cpu.h | 12 +++--- hypervisor/include/arch/x86/pgtable.h | 2 +- hypervisor/include/arch/x86/rtcm.h | 2 +- hypervisor/include/arch/x86/vm_config.h | 2 +- hypervisor/include/arch/x86/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 | 6 +-- hypervisor/include/debug/logmsg.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 +- misc/config_tools/board_config/board_c.py | 6 +-- .../scenario_config/ivshmem_cfg_h.py | 2 +- .../config_tools/scenario_config/pci_dev_c.py | 8 ++-- .../config_tools/scenario_config/pt_intx_c.py | 2 +- .../scenario_config/vm_configurations_c.py | 4 +- misc/hv_prebuild/static_checks.c | 6 +-- misc/hv_prebuild/vm_cfg_checks.c | 8 ++-- 139 files changed, 608 insertions(+), 612 deletions(-) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 5efcf4fbb..3278081d2 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -137,10 +137,7 @@ 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/x86 -REL_INCLUDE_PATH += include/arch/x86/boot -REL_INCLUDE_PATH += include/arch/x86/guest -REL_INCLUDE_PATH += include/arch/x86/lib +REL_INCLUDE_PATH += include/arch REL_INCLUDE_PATH += include/debug REL_INCLUDE_PATH += include/public REL_INCLUDE_PATH += include/dm diff --git a/hypervisor/acpi_parser/acpi_ext.c b/hypervisor/acpi_parser/acpi_ext.c index 794859d2c..0a1466199 100644 --- a/hypervisor/acpi_parser/acpi_ext.c +++ b/hypervisor/acpi_parser/acpi_ext.c @@ -28,14 +28,14 @@ */ #include #include -#include "acpi.h" -#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 b1c36f752..d68431eed 100644 --- a/hypervisor/acpi_parser/dmar_parse.c +++ b/hypervisor/acpi_parser/dmar_parse.c @@ -6,12 +6,12 @@ #include #include -#include -#include -#include -#include "pci.h" -#include "vtd.h" -#include "acpi.h" +#include +#include +#include +#include +#include +#include static uint32_t dmar_unit_cnt; static struct dmar_drhd drhd_info_array[MAX_DRHDS]; diff --git a/hypervisor/arch/x86/configs/pci_dev.c b/hypervisor/arch/x86/configs/pci_dev.c index 2e6ea7764..28415eaa0 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 9cda53b01..5dfa7defb 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 2fd7fef76..89027e169 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 42d6527e3..41e11c1fe 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 e239d4fdb..c225a0ddd 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 a8eef09ae..a5b98bae2 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 b847f093c..dd34e7aac 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/gdt.c b/hypervisor/arch/x86/gdt.c index 25654efe5..8ac23c7d5 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 366dc4886..81edc77c1 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 367efcdf8..e1815b7ee 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 068c33233..7eae784f4 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 458dbb4f3..d33730b69 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 0ff86a994..c2579c3f9 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 36fa180e8..742227c18 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 4e381716b..7c2079457 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 ddea6f405..058d527ca 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 b853e8392..2d3b03e30 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 9ebba21d7..88b45bd16 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 +#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 25bec2b97..02c58feba 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 77fd53361..b414eb11f 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 2035dc088..b8fb4ba98 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 68be87d6f..876c763f3 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 eddf5d3b1..574728464 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 3d4895a8e..a500cc798 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 7ec419c57..4605e2995 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 e1180cd0c..8b51b3c39 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 cfa982417..b1c2a4efc 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 0c1f29e48..ba8d7fbc0 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 d3f6294cb..1c8a2a092 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 119de8b54..d9311b6dc 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 86d9c96fc..17211d7a4 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 62acb3661..b6c028907 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 798a94f85..d9e0e16a4 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 3d2b6259a..4548bdf76 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 a06de83ba..404453bab 100644 --- a/hypervisor/arch/x86/ioapic.c +++ b/hypervisor/arch/x86/ioapic.c @@ -6,13 +6,13 @@ #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 8687189a5..5d98e2595 100644 --- a/hypervisor/arch/x86/irq.c +++ b/hypervisor/arch/x86/irq.c @@ -5,18 +5,17 @@ */ #include -#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 6f0f70c34..d44d67936 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 d5ae2d758..a7e22e074 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/notify.c b/hypervisor/arch/x86/notify.c index 03f3a0f2a..d329395e7 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 0e0a90ffc..61f239bc4 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 b0a513cdc..82fed9d92 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 c5321608c..8431d9994 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 017be8c91..8a846ea1d 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 e33e1b3aa..739b3ce34 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 9905daa3a..0782a9c0c 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 b2f3daeec..436a37f40 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 68f4f8a08..21dbf2e68 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 37133c60d..a6dae6b23 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 d1f7b6088..067d1b129 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 0ff324c57..56f70ca78 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 9c051bd76..2137cba98 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 19139081a..53b00c622 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 bc6e049ae..613935b1b 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 3cd0e728e..7e4a9956a 100644 --- a/hypervisor/arch/x86/vtd.c +++ b/hypervisor/arch/x86/vtd.c @@ -7,23 +7,23 @@ #define pr_prefix "iommu: " #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 45d2ab903..2541b6f63 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 d7e0f9319..25941b29f 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 45cbcede4..84f57a365 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 e3611ac90..3ffeefabe 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 dea5a694d..bc4d28412 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 b98494528..8cc77fabd 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 33cf0081a..97fb554fd 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 a25386958..145138f32 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 9a194745b..34b8af163 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 761f07fe3..32d041268 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 fc75b916e..b4a56f50a 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/schedule.c b/hypervisor/common/schedule.c index 0ce7f58ea..6cc181d19 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 aec994fed..dfcd066df 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 187fe0802..e2f70e33d 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 5e14dbedb..cd231e7a8 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 686235b77..854c4edc8 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 de4f9bd37..03e28260e 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 9a5271a15..d41ce2679 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 31d2d41f9..755e3aed3 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 eb9e16628..c953a0f8e 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 0b2dbcf9d..ab2b453a7 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 516830d6a..59a0a498d 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 2fd67f4b6..a90ecb9a3 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 af741aa26..6e07078d1 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 0ff7d9fdc..86c42a612 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 8d460109d..275c05219 100644 --- a/hypervisor/debug/uart16550.c +++ b/hypervisor/debug/uart16550.c @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#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 145f05f21..11b465149 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 7fd69306b..8ecb2dc21 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 8e18a3ade..6558f73c5 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 a086a85f0..cbee67e2a 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 cc4b1f67c..cc700f1b4 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 18a36578b..3f5aa3825 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 03b223ca0..74b6e8659 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 eed841e53..b9d0cf843 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 2fea12c61..d61641921 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 0f9c0c974..cd8c3fa10 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 482121c9d..507e45423 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 fcd50e348..d6c2237da 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 1d9f0d334..2f75fdbe4 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 "pci_dev.h" +#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 278187861..c425f79e2 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 0c4a15b2b..730931b12 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 ab2675413..1ba367a9a 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 3979b50ca..bec9dbfd8 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 6671ca61d..da5872305 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 3c6ce50af..5511a788c 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/apicreg.h index 74cd0e071..1380fa620 100644 --- a/hypervisor/include/arch/x86/apicreg.h +++ b/hypervisor/include/arch/x86/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/board.h index 427c2544d..489ab04e7 100644 --- a/hypervisor/include/arch/x86/board.h +++ b/hypervisor/include/arch/x86/board.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/hypervisor/include/arch/x86/gdt.h b/hypervisor/include/arch/x86/gdt.h index d40b32bf7..a0d08c2e8 100644 --- a/hypervisor/include/arch/x86/gdt.h +++ b/hypervisor/include/arch/x86/gdt.h @@ -69,7 +69,7 @@ #ifndef ASSEMBLER #include -#include +#include #define TSS_AVAIL (9U) diff --git a/hypervisor/include/arch/x86/guest/hyperv.h b/hypervisor/include/arch/x86/guest/hyperv.h index 32515748b..d448e3c0c 100644 --- a/hypervisor/include/arch/x86/guest/hyperv.h +++ b/hypervisor/include/arch/x86/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/guest/instr_emul.h index e71dd6f78..1272a2655 100644 --- a/hypervisor/include/arch/x86/guest/instr_emul.h +++ b/hypervisor/include/arch/x86/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/trusty.h b/hypervisor/include/arch/x86/guest/trusty.h index 46c21d31f..b1cca1e63 100644 --- a/hypervisor/include/arch/x86/guest/trusty.h +++ b/hypervisor/include/arch/x86/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/vcpu.h b/hypervisor/include/arch/x86/guest/vcpu.h index 6ee965672..520bca320 100644 --- a/hypervisor/include/arch/x86/guest/vcpu.h +++ b/hypervisor/include/arch/x86/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/vlapic.h b/hypervisor/include/arch/x86/guest/vlapic.h index 1ec99e320..f4d73a583 100644 --- a/hypervisor/include/arch/x86/guest/vlapic.h +++ b/hypervisor/include/arch/x86/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/guest/vm.h index db68c8380..80eca5c39 100644 --- a/hypervisor/include/arch/x86/guest/vm.h +++ b/hypervisor/include/arch/x86/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/vmcs.h b/hypervisor/include/arch/x86/guest/vmcs.h index 752946f57..a33b38a6c 100644 --- a/hypervisor/include/arch/x86/guest/vmcs.h +++ b/hypervisor/include/arch/x86/guest/vmcs.h @@ -12,7 +12,7 @@ #ifndef ASSEMBLER #include -#include +#include #define VMX_VMENTRY_FAIL 0x80000000U diff --git a/hypervisor/include/arch/x86/ioapic.h b/hypervisor/include/arch/x86/ioapic.h index 9ac65af82..37ae7d084 100644 --- a/hypervisor/include/arch/x86/ioapic.h +++ b/hypervisor/include/arch/x86/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/lib/bits.h b/hypervisor/include/arch/x86/lib/bits.h index addf22bad..0928a374a 100644 --- a/hypervisor/include/arch/x86/lib/bits.h +++ b/hypervisor/include/arch/x86/lib/bits.h @@ -29,7 +29,7 @@ #ifndef BITS_H #define BITS_H -#include +#include /** * diff --git a/hypervisor/include/arch/x86/mmu.h b/hypervisor/include/arch/x86/mmu.h index 5e5ac4561..139363872 100644 --- a/hypervisor/include/arch/x86/mmu.h +++ b/hypervisor/include/arch/x86/mmu.h @@ -44,10 +44,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/page.h b/hypervisor/include/arch/x86/page.h index 594095a0b..e0a42a6ac 100644 --- a/hypervisor/include/arch/x86/page.h +++ b/hypervisor/include/arch/x86/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/pci_dev.h index 51e1bae9d..2ef9e79a4 100644 --- a/hypervisor/include/arch/x86/pci_dev.h +++ b/hypervisor/include/arch/x86/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/per_cpu.h index 1a138bacf..326236563 100644 --- a/hypervisor/include/arch/x86/per_cpu.h +++ b/hypervisor/include/arch/x86/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/pgtable.h index e42d54ebe..ccf65f642 100644 --- a/hypervisor/include/arch/x86/pgtable.h +++ b/hypervisor/include/arch/x86/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/rtcm.h b/hypervisor/include/arch/x86/rtcm.h index ecca1aea1..02f7db280 100644 --- a/hypervisor/include/arch/x86/rtcm.h +++ b/hypervisor/include/arch/x86/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/vm_config.h b/hypervisor/include/arch/x86/vm_config.h index 7a3292564..7251310e5 100644 --- a/hypervisor/include/arch/x86/vm_config.h +++ b/hypervisor/include/arch/x86/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/zeropage.h b/hypervisor/include/arch/x86/zeropage.h index 746ce29ef..39b94b4d7 100644 --- a/hypervisor/include/arch/x86/zeropage.h +++ b/hypervisor/include/arch/x86/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 c7f398032..77b625ff7 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 00fdb55d8..cdf010ec6 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 6a006d4e7..c1b688d30 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 8400c75ab..e2c99230b 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 +#include #define NEED_RESCHEDULE (1U) diff --git a/hypervisor/include/debug/logmsg.h b/hypervisor/include/debug/logmsg.h index 58596b591..b90907b30 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_internal.h b/hypervisor/include/debug/profiling_internal.h index 03bd0f929..d4ce7f21e 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 9e717e1bc..27dd1f5cb 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 c5f1f1d77..11db95aa7 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 813881a2d..d9b57b551 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 51db8f5cc..1c8a01ec3 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/misc/config_tools/board_config/board_c.py b/misc/config_tools/board_config/board_c.py index 544b35810..9b359f182 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/scenario_config/ivshmem_cfg_h.py b/misc/config_tools/scenario_config/ivshmem_cfg_h.py index 5b06448a1..1aa737e81 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 a85910c44..30f43bc11 100644 --- a/misc/config_tools/scenario_config/pci_dev_c.py +++ b/misc/config_tools/scenario_config/pci_dev_c.py @@ -123,12 +123,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 @@ -306,4 +306,4 @@ def generate_file(vm_info, config): print("\t},", file=config) # Insert the end bracket of the pci_dev.c file - print("};", file=config) \ No newline at end of file + print("};", file=config) diff --git a/misc/config_tools/scenario_config/pt_intx_c.py b/misc/config_tools/scenario_config/pt_intx_c.py index ade30eed5..96ef2a096 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 6810325cc..4fa512d24 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/hv_prebuild/static_checks.c b/misc/hv_prebuild/static_checks.c index ba23313eb..077b72ec3 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 b77abbcf2..cd58734b2 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