From a89c41dd4cf9acd3b69b7909f644aa8d34307d8d Mon Sep 17 00:00:00 2001
From: Minggui Cao <minggui.cao@intel.com>
Date: Tue, 26 Feb 2019 15:42:56 +0800
Subject: [PATCH] HV: cleanup header files under hypervisor/common

it removes hypervisor.h and just includes needed header files.

Tracked-On: #1842
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
---
 hypervisor/common/hv_main.c          |  8 +++++++-
 hypervisor/common/hypercall.c        | 10 +++++++++-
 hypervisor/common/io_req.c           |  6 +++++-
 hypervisor/common/ptdev.c            |  5 ++++-
 hypervisor/common/schedule.c         |  8 +++++++-
 hypervisor/common/softirq.c          |  6 ++++--
 hypervisor/common/stack_protector.c  |  4 ++--
 hypervisor/common/trusty_hypercall.c |  4 +++-
 hypervisor/common/vm_load.c          |  7 ++++++-
 9 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/hypervisor/common/hv_main.c b/hypervisor/common/hv_main.c
index 31bf1ee2e..b576bd6c6 100644
--- a/hypervisor/common/hv_main.c
+++ b/hypervisor/common/hv_main.c
@@ -4,9 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
+#include <vmcs.h>
+#include <vmexit.h>
+#include <irq.h>
 #include <schedule.h>
 #include <softirq.h>
+#include <profiling.h>
+#include <trace.h>
+#include <logmsg.h>
 
 void vcpu_thread(struct sched_object *obj)
 {
diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c
index 5ab924d16..db5653501 100644
--- a/hypervisor/common/hypercall.c
+++ b/hypervisor/common/hypercall.c
@@ -4,12 +4,20 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
+#include <vmcs.h>
 #include <schedule.h>
 #include <hypercall.h>
 #include <version.h>
 #include <reloc.h>
 #include <vtd.h>
+#include <per_cpu.h>
+#include <lapic.h>
+#include <assign.h>
+#include <ept.h>
+#include <mmu.h>
+#include <errno.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_HYCALL	6U
 
diff --git a/hypervisor/common/io_req.c b/hypervisor/common/io_req.c
index 322000c54..4bc880573 100644
--- a/hypervisor/common/io_req.c
+++ b/hypervisor/common/io_req.c
@@ -3,7 +3,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
+#include <irq.h>
+#include <errno.h>
+#include <atomic.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_IOREQUEST	6U
 
diff --git a/hypervisor/common/ptdev.c b/hypervisor/common/ptdev.c
index 303b63f97..e67d57b19 100644
--- a/hypervisor/common/ptdev.c
+++ b/hypervisor/common/ptdev.c
@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
 #include <softirq.h>
 #include <ptdev.h>
+#include <irq.h>
+#include <atomic.h>
+#include <logmsg.h>
 
 #define PTIRQ_BITMAP_ARRAY_SIZE	INT_DIV_ROUNDUP(CONFIG_MAX_PT_IRQ_ENTRIES, 64U)
 struct ptirq_remapping_info ptirq_entries[CONFIG_MAX_PT_IRQ_ENTRIES];
diff --git a/hypervisor/common/schedule.c b/hypervisor/common/schedule.c
index 75c44e5fa..bc4092037 100644
--- a/hypervisor/common/schedule.c
+++ b/hypervisor/common/schedule.c
@@ -4,8 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <rtl.h>
+#include <list.h>
+#include <bits.h>
+#include <cpu.h>
+#include <per_cpu.h>
+#include <lapic.h>
 #include <schedule.h>
+#include <sprintf.h>
 
 static uint64_t pcpu_used_bitmap;
 
diff --git a/hypervisor/common/softirq.c b/hypervisor/common/softirq.c
index 0b5467e7b..908f7b342 100644
--- a/hypervisor/common/softirq.c
+++ b/hypervisor/common/softirq.c
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <types.h>
+#include <bits.h>
+#include <cpu.h>
+#include <per_cpu.h>
 #include <softirq.h>
 
-
 static softirq_handler softirq_handlers[NR_SOFTIRQS];
 
 void init_softirq(void)
diff --git a/hypervisor/common/stack_protector.c b/hypervisor/common/stack_protector.c
index bc7a3338c..33581dc10 100644
--- a/hypervisor/common/stack_protector.c
+++ b/hypervisor/common/stack_protector.c
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <logmsg.h>
 
 void __stack_chk_fail(void)
 {
diff --git a/hypervisor/common/trusty_hypercall.c b/hypervisor/common/trusty_hypercall.c
index 396a98a7f..d39103fd3 100644
--- a/hypervisor/common/trusty_hypercall.c
+++ b/hypervisor/common/trusty_hypercall.c
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
+#include <errno.h>
 #include <hypercall.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_TRUSTY_HYCALL 6U
 
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
index 527ae21eb..5698b8933 100644
--- a/hypervisor/common/vm_load.c
+++ b/hypervisor/common/vm_load.c
@@ -4,10 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hypervisor.h>
+#include <vm.h>
 #include <e820.h>
 #include <zeropage.h>
 #include <boot_context.h>
+#include <ept.h>
+#include <mmu.h>
+#include <errno.h>
+#include <sprintf.h>
+#include <logmsg.h>
 
 static void prepare_bsp_gdt(struct acrn_vm *vm)
 {