hv: merge hv_lib.h and hypervisor.h

shiqingg · lijinxia · commit 74622d7d29c9 · 2018-09-27T15:55:41.000+08:00
merge hv_lib.h and hypervisor.h into one file Tracked-On: #861 Signed-off-by: Shiqing Gao <shiqing.gao@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
diff --git a/hypervisor/arch/x86/guest/mptable.c b/hypervisor/arch/x86/guest/mptable.c
@@ -4,12 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
-#include <bsp_extern.h>
-#include <mptable.h>
+#include <hypervisor.h>
 
 #define MPTABLE_BASE		0xF0000U
 
diff --git a/hypervisor/arch/x86/static_checks.c b/hypervisor/arch/x86/static_checks.c
@@ -3,8 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hv_lib.h>
-#include <hv_arch.h>
+#include <hypervisor.h>
 #include <vm0_boot.h>
 
 #define CAT_(A,B) A ## B
diff --git a/hypervisor/dm/vpci/hostbridge.c b/hypervisor/dm/vpci/hostbridge.c
@@ -35,10 +35,6 @@
 */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "pci_priv.h"
 
 static int vdev_hostbridge_init(struct pci_vdev *vdev)
diff --git a/hypervisor/dm/vpci/pci_pt.c b/hypervisor/dm/vpci/pci_pt.c
@@ -30,10 +30,6 @@
 /* Passthrough PCI device related operations */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "pci_priv.h"
 
 
diff --git a/hypervisor/dm/vpci/pci_vdev.c b/hypervisor/dm/vpci/pci_vdev.c
@@ -30,11 +30,6 @@
 /* Virtual PCI device related operations (read/write, etc) */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
-#include <acrn_hv_defs.h>
 #include "pci_priv.h"
 
 
diff --git a/hypervisor/dm/vpci/vpci.c b/hypervisor/dm/vpci/vpci.c
@@ -28,10 +28,6 @@
 */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 #include "pci_priv.h"
 
 
diff --git a/hypervisor/dm/vrtc.c b/hypervisor/dm/vrtc.c
@@ -5,10 +5,6 @@
  */
 
 #include <hypervisor.h>
-#include <hv_lib.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
 
 #define CMOS_ADDR_PORT		0x70U
 #define CMOS_DATA_PORT		0x71U
diff --git a/hypervisor/include/hv_lib.h b/hypervisor/include/hv_lib.h
diff --git a/hypervisor/include/hypervisor.h b/hypervisor/include/hypervisor.h
@@ -22,9 +22,17 @@
 
 /* Include config header file containing config options */
 #include <types.h>
+#include <errno.h>
+#include <rtl.h>
+#include <spinlock.h>
+#include <mem_mgt.h>
+#include <util.h>
+#include <list.h>
+#include <atomic.h>
+#include <bits.h>
+#include <sprintf.h>
 #include "acrn_common.h"
 #include <acrn_hv_defs.h>
-#include <hv_lib.h>
 #include <hv_arch.h>
 #include <hv_debug.h>
 
diff --git a/hypervisor/lib/misc.c b/hypervisor/lib/misc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
+#include <hypervisor.h>
 
 void udelay(uint32_t us)
 {
diff --git a/hypervisor/lib/sprintf.c b/hypervisor/lib/sprintf.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
+#include <hypervisor.h>
 
 #ifndef NULL
 #define NULL ((void *) 0)

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: BSD-3-Clause`
`5`	`5`	`*/`
`6`		`-#include <hv_lib.h>`
`7`		`-#include <hv_arch.h>`
	`6`	`+#include <hypervisor.h>`
`8`	`7`	`#include <vm0_boot.h>`
`9`	`8`
`10`	`9`	`#define CAT_(A,B) A ## B`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* SPDX-License-Identifier: BSD-3-Clause`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#include <hv_lib.h>`
	`7`	`+#include <hypervisor.h>`
`8`	`8`
`9`	`9`	`void udelay(uint32_t us)`
`10`	`10`	`{`