From d594878e31dcf15f807997e53b41d0a6346febff Mon Sep 17 00:00:00 2001 From: Zide Chen Date: Mon, 21 May 2018 13:24:26 -0700 Subject: [PATCH] HV: cleanup for header inclusions. used https://gitlab.com/esr/deheader to detect and remove unnecessary header file inclusions Signed-off-by: Zide Chen --- hypervisor/arch/x86/cpuid.c | 1 - hypervisor/arch/x86/debug/reboot.c | 1 - hypervisor/arch/x86/ept.c | 2 -- hypervisor/arch/x86/gdt.c | 1 - hypervisor/arch/x86/guest/guest.c | 2 -- hypervisor/arch/x86/guest/instr_emul_wrapper.c | 1 - hypervisor/arch/x86/guest/ucode.c | 1 - hypervisor/arch/x86/guest/vlapic.c | 1 - hypervisor/arch/x86/intr_lapic.c | 1 - hypervisor/arch/x86/io.c | 1 - hypervisor/arch/x86/mmu.c | 1 - hypervisor/arch/x86/notify.c | 1 - hypervisor/arch/x86/trusty.c | 1 - hypervisor/boot/acpi.c | 3 --- hypervisor/boot/sbl/multiboot.c | 3 --- hypervisor/bsp/sbl/sbl.c | 3 --- hypervisor/bsp/uefi/cmdline.c | 2 -- hypervisor/bsp/uefi/uefi.c | 1 - hypervisor/common/trusty_hypercall.c | 1 - hypervisor/common/vm_load.c | 1 - hypervisor/debug/shell_internal.c | 1 - hypervisor/lib/memory.c | 2 -- hypervisor/lib/sprintf.c | 2 -- hypervisor/lib/string.c | 1 - 24 files changed, 35 deletions(-) diff --git a/hypervisor/arch/x86/cpuid.c b/hypervisor/arch/x86/cpuid.c index cf1f3aa51..dbe9b0ff4 100644 --- a/hypervisor/arch/x86/cpuid.c +++ b/hypervisor/arch/x86/cpuid.c @@ -32,7 +32,6 @@ #include #include #include -#include #include 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 index 4aa783ef0..dafacdd10 100644 --- 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 -#include int warm_reboot(void) { diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/ept.c index 1f7722d28..5e7ac3ffd 100644 --- a/hypervisor/arch/x86/ept.c +++ b/hypervisor/arch/x86/ept.c @@ -30,10 +30,8 @@ #include #include -#include #include #include -#include #include #include "guest/instr_emul_wrapper.h" diff --git a/hypervisor/arch/x86/gdt.c b/hypervisor/arch/x86/gdt.c index 23d6ecab0..3b81f5ddb 100644 --- a/hypervisor/arch/x86/gdt.c +++ b/hypervisor/arch/x86/gdt.c @@ -29,7 +29,6 @@ */ #include -#include #include DEFINE_CPU_DATA(struct tss_64, tss); diff --git a/hypervisor/arch/x86/guest/guest.c b/hypervisor/arch/x86/guest/guest.c index 60ec1caa5..2b0c8606a 100644 --- a/hypervisor/arch/x86/guest/guest.c +++ b/hypervisor/arch/x86/guest/guest.c @@ -32,12 +32,10 @@ #include #include #include -#include #include #include #include #include -#include #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 index ad2a87c84..fbbcbebb1 100644 --- a/hypervisor/arch/x86/guest/instr_emul_wrapper.c +++ b/hypervisor/arch/x86/guest/instr_emul_wrapper.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include "instr_emul_wrapper.h" diff --git a/hypervisor/arch/x86/guest/ucode.c b/hypervisor/arch/x86/guest/ucode.c index b2cbc471d..fe3fa6a32 100644 --- a/hypervisor/arch/x86/guest/ucode.c +++ b/hypervisor/arch/x86/guest/ucode.c @@ -31,7 +31,6 @@ #include #include #include -#include #include uint64_t get_microcode_version(void) diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c index 1f68f4b28..570049dc3 100644 --- a/hypervisor/arch/x86/guest/vlapic.c +++ b/hypervisor/arch/x86/guest/vlapic.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include "instr_emul_wrapper.h" diff --git a/hypervisor/arch/x86/intr_lapic.c b/hypervisor/arch/x86/intr_lapic.c index b9f212982..299711bc5 100644 --- a/hypervisor/arch/x86/intr_lapic.c +++ b/hypervisor/arch/x86/intr_lapic.c @@ -32,7 +32,6 @@ #include #include #include -#include #include /* Rate range 1 to 1000 or 1uSec to 1mSec */ diff --git a/hypervisor/arch/x86/io.c b/hypervisor/arch/x86/io.c index e5bdc3d5e..6c37f7b0e 100644 --- a/hypervisor/arch/x86/io.c +++ b/hypervisor/arch/x86/io.c @@ -33,7 +33,6 @@ #include #include #include -#include int dm_emulate_pio_post(struct vcpu *vcpu) { diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c index 2af507b7c..ee50bbce7 100644 --- a/hypervisor/arch/x86/mmu.c +++ b/hypervisor/arch/x86/mmu.c @@ -31,7 +31,6 @@ #include #include #include -#include #include static void *mmu_pml4_addr; diff --git a/hypervisor/arch/x86/notify.c b/hypervisor/arch/x86/notify.c index 42d02bc9a..950794f4a 100644 --- a/hypervisor/arch/x86/notify.c +++ b/hypervisor/arch/x86/notify.c @@ -33,7 +33,6 @@ #include #include #include -#include static struct dev_handler_node *notification_node; diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/trusty.c index 23d2c0f02..4cbf93441 100644 --- a/hypervisor/arch/x86/trusty.c +++ b/hypervisor/arch/x86/trusty.c @@ -34,7 +34,6 @@ #include #include #include -#include "rtl.h" _Static_assert(NR_WORLD == 2, "Only 2 Worlds supported!"); diff --git a/hypervisor/boot/acpi.c b/hypervisor/boot/acpi.c index 3e294b406..58e5b118d 100644 --- a/hypervisor/boot/acpi.c +++ b/hypervisor/boot/acpi.c @@ -30,9 +30,6 @@ #include #include #include -#include -#include -#include #include #include "acpi.h" #ifdef CONFIG_EFI_STUB diff --git a/hypervisor/boot/sbl/multiboot.c b/hypervisor/boot/sbl/multiboot.c index 378611b34..f99c5ce82 100644 --- a/hypervisor/boot/sbl/multiboot.c +++ b/hypervisor/boot/sbl/multiboot.c @@ -32,9 +32,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/hypervisor/bsp/sbl/sbl.c b/hypervisor/bsp/sbl/sbl.c index bc9a42558..64f7d81a8 100644 --- a/hypervisor/bsp/sbl/sbl.c +++ b/hypervisor/bsp/sbl/sbl.c @@ -30,9 +30,6 @@ #include #include -#include -#include -#include #include /* IOAPIC id */ diff --git a/hypervisor/bsp/uefi/cmdline.c b/hypervisor/bsp/uefi/cmdline.c index 9b498a8f7..faef0011e 100644 --- a/hypervisor/bsp/uefi/cmdline.c +++ b/hypervisor/bsp/uefi/cmdline.c @@ -32,8 +32,6 @@ #include #include #include -#include -#include #include #include diff --git a/hypervisor/bsp/uefi/uefi.c b/hypervisor/bsp/uefi/uefi.c index 86b1e984f..9253edf34 100644 --- a/hypervisor/bsp/uefi/uefi.c +++ b/hypervisor/bsp/uefi/uefi.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #ifdef CONFIG_EFI_STUB #include diff --git a/hypervisor/common/trusty_hypercall.c b/hypervisor/common/trusty_hypercall.c index 64aeaa64a..5505d8d82 100644 --- a/hypervisor/common/trusty_hypercall.c +++ b/hypervisor/common/trusty_hypercall.c @@ -33,7 +33,6 @@ #include #include #include -#include #include int64_t hcall_world_switch(struct vcpu *vcpu) diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index e148f9a42..a50281473 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/hypervisor/debug/shell_internal.c b/hypervisor/debug/shell_internal.c index 362f8a05b..c94d588dc 100644 --- a/hypervisor/debug/shell_internal.c +++ b/hypervisor/debug/shell_internal.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include "shell_internal.h" #include "serial_internal.h" diff --git a/hypervisor/lib/memory.c b/hypervisor/lib/memory.c index 3230ddb10..9990ff83f 100644 --- a/hypervisor/lib/memory.c +++ b/hypervisor/lib/memory.c @@ -8,8 +8,6 @@ #include #include #include -#include -#include /************************************************************************/ /* Memory pool declaration (block size = MALLOC_ALIGN) */ diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c index 119129537..ef1365ebf 100644 --- a/hypervisor/lib/sprintf.c +++ b/hypervisor/lib/sprintf.c @@ -30,8 +30,6 @@ #include #include -#include -#include #ifndef NULL #define NULL ((void *) 0) diff --git a/hypervisor/lib/string.c b/hypervisor/lib/string.c index 9d6f46c3a..e241a60e8 100644 --- a/hypervisor/lib/string.c +++ b/hypervisor/lib/string.c @@ -8,7 +8,6 @@ * constants. */ -#include #include #include #include