From 689c1c28c5c8e97748daf24c8ececc9467663d76 Mon Sep 17 00:00:00 2001
From: Jason Chen CJ <jason.cj.chen@intel.com>
Date: Tue, 18 Dec 2018 09:55:48 +0800
Subject: [PATCH] function name change in init.c

- bsp_boot_init to init_primary_cpu
- bsp_boot_post to init_primary_cpu_post

Tracked-On: #1842
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
---
 hypervisor/arch/x86/boot/cpu_primary.S | 2 +-
 hypervisor/arch/x86/init.c             | 6 +++---
 hypervisor/include/arch/x86/init.h     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hypervisor/arch/x86/boot/cpu_primary.S b/hypervisor/arch/x86/boot/cpu_primary.S
index 5115bdad7..0033417f1 100644
--- a/hypervisor/arch/x86/boot/cpu_primary.S
+++ b/hypervisor/arch/x86/boot/cpu_primary.S
@@ -162,7 +162,7 @@ after:
     mov     %eax,%gs  // Was 32bit POC CLS
 
    /* continue with chipset level initialization */
-   call     bsp_boot_init
+   call     init_primary_cpu
 
 loop:
     jmp loop
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index 48ed14383..2b7123daa 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -75,7 +75,7 @@ static void enter_guest_mode(uint16_t pcpu_id)
 	cpu_dead();
 }
 
-static void bsp_boot_post(void)
+static void init_primary_cpu_post(void)
 {
 	/* Perform any necessary BSP initialization */
 	init_bsp();
@@ -96,7 +96,7 @@ static void bsp_boot_post(void)
 /* NOTE: this function is using temp stack, and after SWITCH_TO(runtime_sp, to)
  * it will switch to runtime stack.
  */
-void bsp_boot_init(void)
+void init_primary_cpu(void)
 {
 	uint64_t rsp;
 
@@ -105,7 +105,7 @@ void bsp_boot_init(void)
 	/* Switch to run-time stack */
 	rsp = (uint64_t)(&get_cpu_var(stack)[CONFIG_STACK_SIZE - 1]);
 	rsp &= ~(CPU_STACK_ALIGN - 1UL);
-	SWITCH_TO(rsp, bsp_boot_post);
+	SWITCH_TO(rsp, init_primary_cpu_post);
 }
 
 void init_secondary_cpu(void)
diff --git a/hypervisor/include/arch/x86/init.h b/hypervisor/include/arch/x86/init.h
index b8825a0c7..6e3207478 100644
--- a/hypervisor/include/arch/x86/init.h
+++ b/hypervisor/include/arch/x86/init.h
@@ -8,7 +8,7 @@
 /* hypervisor stack bottom magic('intl') */
 #define SP_BOTTOM_MAGIC    0x696e746cUL
 
-void bsp_boot_init(void);
+void init_primary_cpu(void);
 void init_secondary_cpu(void);
 
 #endif /* INIT_H*/