From de0a5a48d679b59137d327aa3c676a5dee96a4a4 Mon Sep 17 00:00:00 2001
From: Mingqiang Chi <mingqiang.chi@intel.com>
Date: Sat, 12 Oct 2019 16:32:02 +0800
Subject: [PATCH] hv:remove some unnecessary includes

--remove unnecessary includes
--remove unnecssary forward-declaration for 'struct vhm_request'

Tracked-On: #861
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
---
 hypervisor/arch/x86/guest/vcpu.c        | 1 -
 hypervisor/arch/x86/guest/vm.c          | 2 +-
 hypervisor/arch/x86/guest/vm_reset.c    | 2 --
 hypervisor/arch/x86/guest/vmcs.c        | 1 -
 hypervisor/arch/x86/init.c              | 1 -
 hypervisor/boot/guest/vboot_info.c      | 1 -
 hypervisor/common/hv_main.c             | 1 -
 hypervisor/common/vm_load.c             | 1 -
 hypervisor/dm/vpci/pci_pt.c             | 2 --
 hypervisor/dm/vpci/vhostbridge.c        | 1 -
 hypervisor/dm/vpci/vmsi.c               | 1 -
 hypervisor/dm/vpci/vpci.c               | 1 -
 hypervisor/include/arch/x86/vm_config.h | 1 -
 hypervisor/include/common/hypercall.h   | 2 --
 14 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 1207f8b97..d8f0286a8 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -17,7 +17,6 @@
 #include <vmcs.h>
 #include <mmu.h>
 #include <sprintf.h>
-#include <cat.h>
 
 /* stack_frame is linked with the sequence of stack operation in arch_switch_to() */
 struct stack_frame {
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 50b99ec47..ee0ff9a36 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -24,12 +24,12 @@
 #include <pgtable.h>
 #include <mmu.h>
 #include <logmsg.h>
-#include <vboot.h>
 #include <vboot_info.h>
 #include <board.h>
 #include <sgx.h>
 #include <sbuf.h>
 #include <pci_dev.h>
+#include <vacpi.h>
 
 vm_sw_loader_t vm_sw_loader;
 
diff --git a/hypervisor/arch/x86/guest/vm_reset.c b/hypervisor/arch/x86/guest/vm_reset.c
index 2c7bb1805..0664a7ac8 100644
--- a/hypervisor/arch/x86/guest/vm_reset.c
+++ b/hypervisor/arch/x86/guest/vm_reset.c
@@ -10,8 +10,6 @@
 #include <logmsg.h>
 #include <per_cpu.h>
 #include <vm_reset.h>
-#include <default_acpi_info.h>
-#include <platform_acpi_info.h>
 
 /**
  * @pre vm != NULL
diff --git a/hypervisor/arch/x86/guest/vmcs.c b/hypervisor/arch/x86/guest/vmcs.c
index 018bdf570..c49e92a0c 100644
--- a/hypervisor/arch/x86/guest/vmcs.c
+++ b/hypervisor/arch/x86/guest/vmcs.c
@@ -7,7 +7,6 @@
  */
 
 #include <types.h>
-#include <errno.h>
 #include <vmcs.h>
 #include <vcpu.h>
 #include <vm.h>
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index 03fa743c1..e3990efd5 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -14,7 +14,6 @@
 #include <vmx.h>
 #include <vm.h>
 #include <logmsg.h>
-#include <vboot.h>
 #include <seed.h>
 
 /* Push sp magic to top of stack for call trace */
diff --git a/hypervisor/boot/guest/vboot_info.c b/hypervisor/boot/guest/vboot_info.c
index 306ee06bd..e4defc3b6 100644
--- a/hypervisor/boot/guest/vboot_info.c
+++ b/hypervisor/boot/guest/vboot_info.c
@@ -10,7 +10,6 @@
 #include <per_cpu.h>
 #include <irq.h>
 #include <boot_context.h>
-#include <sprintf.h>
 #include <multiboot.h>
 #include <pgtable.h>
 #include <zeropage.h>
diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c
index 2194acaa6..ac2c957ff 100644
--- a/hypervisor/common/hv_main.c
+++ b/hypervisor/common/hv_main.c
@@ -10,7 +10,6 @@
 #include <vmexit.h>
 #include <irq.h>
 #include <schedule.h>
-#include <softirq.h>
 #include <profiling.h>
 #include <trace.h>
 #include <logmsg.h>
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
index 63187835a..49fac50e4 100644
--- a/hypervisor/common/vm_load.c
+++ b/hypervisor/common/vm_load.c
@@ -7,7 +7,6 @@
 #include <vm.h>
 #include <e820.h>
 #include <zeropage.h>
-#include <boot_context.h>
 #include <ept.h>
 #include <mmu.h>
 #include <multiboot.h>
diff --git a/hypervisor/dm/vpci/pci_pt.c b/hypervisor/dm/vpci/pci_pt.c
index c61bf5860..b3c5194e2 100644
--- a/hypervisor/dm/vpci/pci_pt.c
+++ b/hypervisor/dm/vpci/pci_pt.c
@@ -27,10 +27,8 @@
 * $FreeBSD$
 */
 #include <vm.h>
-#include <errno.h>
 #include <ept.h>
 #include <mmu.h>
-#include <vmx.h>
 #include <logmsg.h>
 #include "vpci_priv.h"
 
diff --git a/hypervisor/dm/vpci/vhostbridge.c b/hypervisor/dm/vpci/vhostbridge.c
index a32cec805..ad471817e 100644
--- a/hypervisor/dm/vpci/vhostbridge.c
+++ b/hypervisor/dm/vpci/vhostbridge.c
@@ -36,7 +36,6 @@
 
 #include <vm.h>
 #include <pci.h>
-#include <errno.h>
 #include "vpci_priv.h"
 
 
diff --git a/hypervisor/dm/vpci/vmsi.c b/hypervisor/dm/vpci/vmsi.c
index 9fa21d6b4..d54441ad4 100644
--- a/hypervisor/dm/vpci/vmsi.c
+++ b/hypervisor/dm/vpci/vmsi.c
@@ -28,7 +28,6 @@
  */
 
 #include <vm.h>
-#include <errno.h>
 #include <ptdev.h>
 #include <assign.h>
 #include <vpci.h>
diff --git a/hypervisor/dm/vpci/vpci.c b/hypervisor/dm/vpci/vpci.c
index 0e8b2ecc4..07f44829b 100644
--- a/hypervisor/dm/vpci/vpci.c
+++ b/hypervisor/dm/vpci/vpci.c
@@ -30,7 +30,6 @@
 #include <vm.h>
 #include <vtd.h>
 #include <mmu.h>
-#include <errno.h>
 #include <logmsg.h>
 #include "vpci_priv.h"
 #include "pci_dev.h"
diff --git a/hypervisor/include/arch/x86/vm_config.h b/hypervisor/include/arch/x86/vm_config.h
index ae9f7a146..e0a0ce09c 100644
--- a/hypervisor/include/arch/x86/vm_config.h
+++ b/hypervisor/include/arch/x86/vm_config.h
@@ -11,7 +11,6 @@
 #include <pci.h>
 #include <multiboot.h>
 #include <acrn_common.h>
-#include <vacpi.h>
 #include <vm_configurations.h>
 #include <sgx.h>
 
diff --git a/hypervisor/include/common/hypercall.h b/hypervisor/include/common/hypercall.h
index 54ce786b3..c4a822546 100644
--- a/hypervisor/include/common/hypercall.h
+++ b/hypervisor/include/common/hypercall.h
@@ -13,8 +13,6 @@
 #ifndef HYPERCALL_H
 #define HYPERCALL_H
 
-struct vhm_request;
-
 bool is_hypercall_from_ring0(void);
 
 /**