hv:remove common header files

remove hypervisor.h/hv_debug.h/hv_arch.h

Tracked-On: #1842
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>

deleted:    include/arch/x86/hv_arch.h
deleted:    include/hv_debug.h
deleted:    include/hypervisor.h

hypervisor/boot/acpi.c

@@ -26,11 +26,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
 #include <firmware.h>
 #include "acpi_priv.h"
 #include "acpi.h"
+#include <pgtable.h>
+#include <ioapic.h>
+#include <logmsg.h>
+#include <host_pm.h>
 
 #define ACPI_SIG_RSDP             "RSD PTR " /* Root System Description Ptr */
 #define ACPI_OEM_ID_SIZE           6

hypervisor/boot/sbl/multiboot.c

@@ -3,11 +3,18 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <errno.h>
+#include <sprintf.h>
 #include <multiboot.h>
+#include <pgtable.h>
+#include <guest_memory.h>
 #include <zeropage.h>
 #include <seed.h>
+#include <mmu.h>
+#include <vm.h>
+#include <logmsg.h>
 
 #define ACRN_DBG_BOOT	6U
 

hypervisor/hw/pci.c

@@ -28,10 +28,12 @@
  *
  * $FreeBSD$
  */
-
-#include <hypervisor.h>
-#include <uart16550.h>
+#include <types.h>
+#include <spinlock.h>
+#include <io.h>
 #include <pci.h>
+#include <uart16550.h>
+#include <logmsg.h>
 
 static spinlock_t pci_device_lock;
 static uint32_t num_pci_pdev;

hypervisor/include/arch/x86/hv_arch.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef HV_ARCH_H
-#define HV_ARCH_H
-
-#include <cpu.h>
-#include <gdt.h>
-#include <idt.h>
-#include <apicreg.h>
-#include <lapic.h>
-#include <msr.h>
-#include <io.h>
-#include <io_req.h>
-#include <vmx_io.h>
-#include <ioapic.h>
-#include <vmtrr.h>
-#include <timer.h>
-#include <vlapic.h>
-#include <schedule.h>
-#include <vcpu.h>
-#include <trusty.h>
-#include <guest_pm.h>
-#include <host_pm.h>
-#include <vpic.h>
-#include <vuart.h>
-#include <vioapic.h>
-#include <vm.h>
-#include <cpuid.h>
-#include <page.h>
-#include <ept.h>
-#include <mmu.h>
-#include <pgtable.h>
-#include <irq.h>
-#include <vmx.h>
-#include <vmcs.h>
-#include <assign.h>
-
-#include <guest_memory.h>
-#include <vmexit.h>
-#include <cpufeatures.h>
-
-#endif /* HV_ARCH_H */

hypervisor/include/arch/x86/zeropage.h

@@ -6,6 +6,7 @@
 
 #ifndef ZEROPAGE_H
 #define ZEROPAGE_H
+#include <e820.h>
 
 struct zero_page {
 	uint8_t pad1[0x1e8];	/* 0x000 */

hypervisor/include/hv_debug.h

@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef HV_DEBUG_H
-#define HV_DEBUG_H
-
-#include <logmsg.h>
-#include <console.h>
-#include <dump.h>
-#include <trace.h>
-#include <sbuf.h>
-#include <npk_log.h>
-#include <profiling.h>
-
-#endif /* HV_DEBUG_H */

hypervisor/include/hypervisor.h

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/************************************************************************
- *
- *   FILE NAME
- *
- *       hypervisor.h
- *
- *   DESCRIPTION
- *
- *       This file includes hypervisor used header files.
- *       It should be included in all the source files.
- *
- *
- ************************************************************************/
-#ifndef HYPERVISOR_H
-#define HYPERVISOR_H
-
-/* 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_arch.h>
-#include <hv_debug.h>
-
-#endif /* HYPERVISOR_H */

hypervisor/lib/crypto/mbedtls/md.c

@@ -24,7 +24,6 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include <hypervisor.h>
 #include "md.h"
 #include "md_internal.h"
 

hypervisor/lib/crypto/mbedtls/md_wrap.c

@@ -24,7 +24,6 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include <hypervisor.h>
 #include "md_internal.h"
 #include "sha256.h"
 

hypervisor/lib/memory.c

@@ -2,8 +2,13 @@
  * Copyright (C) 2018 Intel Corporation.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <util.h>
+#include <bits.h>
+#include <spinlock.h>
+#include <page.h>
+#include <mem_mgt.h>
+#include <logmsg.h>
 
 /*
  * Memory pool declaration (block size = CONFIG_MALLOC_ALIGN)

hypervisor/lib/sprintf.c

@@ -3,8 +3,10 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <util.h>
+#include <sprintf.h>
 
 #ifndef NULL
 #define NULL ((void *) 0)

hypervisor/lib/string.c

@@ -2,8 +2,9 @@
  * Copyright (C) 2018 Intel Corporation.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-
-#include <hypervisor.h>
+#include <types.h>
+#include <rtl.h>
+#include <logmsg.h>
 
 static inline char hex_digit_value(char ch)
 {