From 3124018917698b3bc10a1f9971fe9019e444426f Mon Sep 17 00:00:00 2001
From: Victor Sun <victor.sun@intel.com>
Date: Tue, 3 Aug 2021 20:44:38 +0800
Subject: [PATCH] HV: vm_load: rename vboot_info.h to vboot.h

vboot_info.h declares vm loader function also, so rename the file name to
vboot.h;

Tracked-On: #6323

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
---
 hypervisor/arch/x86/guest/vm.c                          | 2 +-
 hypervisor/boot/guest/bzimage_loader.c                  | 2 +-
 hypervisor/boot/guest/rawimage_loader.c                 | 2 +-
 hypervisor/boot/guest/vboot_info.c                      | 2 +-
 hypervisor/boot/include/guest/{vboot_info.h => vboot.h} | 6 +++---
 hypervisor/common/vm_load.c                             | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename hypervisor/boot/include/guest/{vboot_info.h => vboot.h} (82%)

diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 4d89f849d..b41527c17 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -25,7 +25,7 @@
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
 #include <logmsg.h>
-#include <vboot_info.h>
+#include <vboot.h>
 #include <asm/board.h>
 #include <asm/sgx.h>
 #include <sbuf.h>
diff --git a/hypervisor/boot/guest/bzimage_loader.c b/hypervisor/boot/guest/bzimage_loader.c
index 1a472640f..c9773d7f1 100644
--- a/hypervisor/boot/guest/bzimage_loader.c
+++ b/hypervisor/boot/guest/bzimage_loader.c
@@ -10,7 +10,7 @@
 #include <asm/guest/ept.h>
 #include <asm/mmu.h>
 #include <boot.h>
-#include <vboot_info.h>
+#include <vboot.h>
 #include <vacpi.h>
 #include <efi_mmap.h>
 #include <errno.h>
diff --git a/hypervisor/boot/guest/rawimage_loader.c b/hypervisor/boot/guest/rawimage_loader.c
index 4dd240669..60f0ffb76 100644
--- a/hypervisor/boot/guest/rawimage_loader.c
+++ b/hypervisor/boot/guest/rawimage_loader.c
@@ -5,7 +5,7 @@
  */
 
 #include <asm/guest/vm.h>
-#include <vboot_info.h>
+#include <vboot.h>
 
 /**
  * @pre vm != NULL
diff --git a/hypervisor/boot/guest/vboot_info.c b/hypervisor/boot/guest/vboot_info.c
index 278c959d1..79ba5e0a9 100644
--- a/hypervisor/boot/guest/vboot_info.c
+++ b/hypervisor/boot/guest/vboot_info.c
@@ -18,7 +18,7 @@
 #include <asm/guest/ept.h>
 #include <reloc.h>
 #include <logmsg.h>
-#include <vboot_info.h>
+#include <vboot.h>
 #include <vacpi.h>
 
 #define DBG_LEVEL_BOOT	6U
diff --git a/hypervisor/boot/include/guest/vboot_info.h b/hypervisor/boot/include/guest/vboot.h
similarity index 82%
rename from hypervisor/boot/include/guest/vboot_info.h
rename to hypervisor/boot/include/guest/vboot.h
index 442703bde..c696265f6 100644
--- a/hypervisor/boot/include/guest/vboot_info.h
+++ b/hypervisor/boot/include/guest/vboot.h
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef VBOOT_INFO_H
+#ifndef VBOOT_H
 
-#define VBOOT_INFO_H
+#define VBOOT_H
 
 int32_t init_vm_boot_info(struct acrn_vm *vm);
 void load_sw_module(struct acrn_vm *vm, struct sw_module_info *sw_module);
@@ -19,4 +19,4 @@ int32_t vm_rawimage_loader(struct acrn_vm *vm);
 #endif
 
 
-#endif /* end of include guard: VBOOT_INFO_H */
+#endif /* end of include guard: VBOOT_H */
diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c
index dea34c955..1434f9b52 100644
--- a/hypervisor/common/vm_load.c
+++ b/hypervisor/common/vm_load.c
@@ -5,7 +5,7 @@
  */
 
 #include <asm/guest/vm.h>
-#include <vboot_info.h>
+#include <vboot.h>
 #include <errno.h>
 #include <logmsg.h>