HV: cleanup for header inclusions.

ZideChen0 · lijinxia · commit d594878e31dc · 2018-05-25T10:45:56.000+08:00
used https://gitlab.com/esr/deheader to detect and remove unnecessary header file inclusions Signed-off-by: Zide Chen <zide.chen@intel.com>
diff --git a/hypervisor/arch/x86/cpuid.c b/hypervisor/arch/x86/cpuid.c
@@ -32,7 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <cpu.h>
 #include <hv_debug.h>
 
 static inline struct vcpuid_entry *find_vcpuid_entry(struct vcpu *vcpu,
diff --git a/hypervisor/arch/x86/debug/reboot.c b/hypervisor/arch/x86/debug/reboot.c
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <acrn_common.h>
-#include <io.h>
 
 int warm_reboot(void)
 {
diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/ept.c
@@ -30,10 +30,8 @@
 
 #include <hypervisor.h>
 #include <hv_lib.h>
-#include <acrn_common.h>
 #include <acrn_hv_defs.h>
 #include <hv_arch.h>
-#include <hypercall.h>
 #include <hv_debug.h>
 
 #include "guest/instr_emul_wrapper.h"
diff --git a/hypervisor/arch/x86/gdt.c b/hypervisor/arch/x86/gdt.c
@@ -29,7 +29,6 @@
  */
 
 #include <hv_lib.h>
-#include <cpu.h>
 #include <gdt.h>
 
 DEFINE_CPU_DATA(struct tss_64, tss);
diff --git a/hypervisor/arch/x86/guest/guest.c b/hypervisor/arch/x86/guest/guest.c
@@ -32,12 +32,10 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_cfg.h>
 #include <bsp_extern.h>
 #include <acrn_hv_defs.h>
 #include <hv_debug.h>
 #include <multiboot.h>
-#include <zeropage.h>
 
 #define ACRN_DBG_GUEST	6
 
diff --git a/hypervisor/arch/x86/guest/instr_emul_wrapper.c b/hypervisor/arch/x86/guest/instr_emul_wrapper.c
@@ -32,7 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
 #include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
diff --git a/hypervisor/arch/x86/guest/ucode.c b/hypervisor/arch/x86/guest/ucode.c
@@ -31,7 +31,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <hv_debug.h>
 #include <ucode.h>
 
 uint64_t get_microcode_version(void)
diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c
@@ -34,7 +34,6 @@
 #include <acrn_common.h>
 #include <hv_arch.h>
 #include <acrn_hv_defs.h>
-#include <bsp_extern.h>
 #include <hv_debug.h>
 
 #include "instr_emul_wrapper.h"
diff --git a/hypervisor/arch/x86/intr_lapic.c b/hypervisor/arch/x86/intr_lapic.c
@@ -32,7 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
 #include <hv_debug.h>
 
 /* Rate range 1 to 1000 or 1uSec to 1mSec */
diff --git a/hypervisor/arch/x86/io.c b/hypervisor/arch/x86/io.c
@@ -33,7 +33,6 @@
 #include <acrn_common.h>
 #include <hv_arch.h>
 #include <hv_debug.h>
-#include <hypercall.h>
 
 int dm_emulate_pio_post(struct vcpu *vcpu)
 {
diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c
@@ -31,7 +31,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
 #include <hv_debug.h>
 
 static void *mmu_pml4_addr;
diff --git a/hypervisor/arch/x86/notify.c b/hypervisor/arch/x86/notify.c
@@ -33,7 +33,6 @@
 #include <acrn_common.h>
 #include <hv_arch.h>
 #include <hv_debug.h>
-#include <irq.h>
 
 static struct dev_handler_node *notification_node;
 
diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/trusty.c
@@ -34,7 +34,6 @@
 #include <acrn_hv_defs.h>
 #include <hv_debug.h>
 #include <hkdf.h>
-#include "rtl.h"
 
 _Static_assert(NR_WORLD == 2, "Only 2 Worlds supported!");
 
diff --git a/hypervisor/boot/acpi.c b/hypervisor/boot/acpi.c
@@ -30,9 +30,6 @@
 #include <hypervisor.h>
 #include <hv_lib.h>
 #include <cpu.h>
-#include <acrn_common.h>
-#include <bsp_extern.h>
-#include <hv_arch.h>
 #include <hv_debug.h>
 #include "acpi.h"
 #ifdef CONFIG_EFI_STUB
diff --git a/hypervisor/boot/sbl/multiboot.c b/hypervisor/boot/sbl/multiboot.c
@@ -32,9 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_cfg.h>
-#include <bsp_extern.h>
-#include <acrn_hv_defs.h>
 #include <hv_debug.h>
 #include <multiboot.h>
 #include <zeropage.h>
diff --git a/hypervisor/bsp/sbl/sbl.c b/hypervisor/bsp/sbl/sbl.c
@@ -30,9 +30,6 @@
 
 #include <hypervisor.h>
 #include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <bsp_extern.h>
 #include <vtd.h>
 
 /* IOAPIC id */
diff --git a/hypervisor/bsp/uefi/cmdline.c b/hypervisor/bsp/uefi/cmdline.c
@@ -32,8 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
-#include <acrn_hv_defs.h>
 #include <hv_debug.h>
 #include <multiboot.h>
 
diff --git a/hypervisor/bsp/uefi/uefi.c b/hypervisor/bsp/uefi/uefi.c
@@ -32,7 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
 #include <multiboot.h>
 #ifdef CONFIG_EFI_STUB
 #include <acrn_efi.h>
diff --git a/hypervisor/common/trusty_hypercall.c b/hypervisor/common/trusty_hypercall.c
@@ -33,7 +33,6 @@
 #include <acrn_common.h>
 #include <hv_arch.h>
 #include <hypercall.h>
-#include <acrn_hv_defs.h>
 #include <hv_debug.h>
 
 int64_t hcall_world_switch(struct vcpu *vcpu)
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
@@ -32,7 +32,6 @@
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>
-#include <bsp_extern.h>
 #include <hv_debug.h>
 #include <zeropage.h>
 
diff --git a/hypervisor/debug/shell_internal.c b/hypervisor/debug/shell_internal.c
@@ -32,7 +32,6 @@
 #include <acrn_common.h>
 #include <hv_arch.h>
 #include <hv_debug.h>
-#include <hypercall.h>
 #include <reboot.h>
 #include "shell_internal.h"
 #include "serial_internal.h"
diff --git a/hypervisor/lib/memory.c b/hypervisor/lib/memory.c
@@ -8,8 +8,6 @@
 #include <hv_arch.h>
 #include <hv_debug.h>
 #include <hypervisor.h>
-#include <util.h>
-#include <macros.h>
 
 /************************************************************************/
 /*  Memory pool declaration (block size = MALLOC_ALIGN)   */
diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c
@@ -30,8 +30,6 @@
 
 #include <hypervisor.h>
 #include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
 
 #ifndef NULL
 #define NULL ((void *) 0)
diff --git a/hypervisor/lib/string.c b/hypervisor/lib/string.c
@@ -8,7 +8,6 @@
  * constants.
  */
 
-#include <types.h>
 #include <hv_lib.h>
 #include <acrn_common.h>
 #include <hv_arch.h>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`* SPDX-License-Identifier: BSD-3-Clause`
`4`	`4`	`*/`
`5`	`5`	`#include <acrn_common.h>`
`6`		`-#include <io.h>`
`7`	`6`
`8`	`7`	`int warm_reboot(void)`
`9`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`#include <acrn_common.h>`
`34`	`34`	`#include <hv_arch.h>`
`35`	`35`	`#include <hv_debug.h>`
`36`		`-#include <hypercall.h>`
`37`	`36`
`38`	`37`	`int dm_emulate_pio_post(struct vcpu *vcpu)`
`39`	`38`	`{`