hv: merge hv_lib.h and hypervisor.h

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>

hypervisor/arch/x86/guest/mptable.c

@@ -4,12 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <hv_lib.h>
+#include <hypervisor.h>
-#include <acrn_common.h>
-#include <hv_arch.h>
-#include <hv_debug.h>
-#include <bsp_extern.h>
-#include <mptable.h>
 
 #define MPTABLE_BASE		0xF0000U
 

hypervisor/arch/x86/static_checks.c

@@ -3,8 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <hv_lib.h>
+#include <hypervisor.h>
-#include <hv_arch.h>
 #include <vm0_boot.h>
 
 #define CAT_(A,B) A ## 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)

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"
 
 

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"
 
 

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"
 
 

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

hypervisor/include/hv_lib.h

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef HV_LIB_H
-#define HV_LIB_H
-
-#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>
-
-#endif /* HV_LIB_H */

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>
 

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)
 {

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)