From 66599e0aa770f27d6c482037ab27360e04bbcdb4 Mon Sep 17 00:00:00 2001
From: Liang Yi <yi.liang@intel.com>
Date: Mon, 18 Jan 2021 07:10:39 +0800
Subject: [PATCH] hv: modularization: multiboot

Calling sanitize_multiboot() from init.c instead of cpu.c.

Tracked-On: #5661
Signed-off-by: Vijay Dhanraj <vijay.dhanraj@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
---
 hypervisor/arch/x86/cpu.c  | 4 ----
 hypervisor/arch/x86/init.c | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 1be14e6e7..859bda103 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -131,10 +131,6 @@ void init_pcpu_pre(bool is_bsp)
 			panic("hardware not support!");
 		}
 
-		if (sanitize_multiboot_info() != 0) {
-			panic("Multiboot info error!");
-		}
-
 		init_pcpu_model_name();
 
 		load_pcpu_state_data();
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index d627a01df..3d667881c 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -90,6 +90,10 @@ void init_primary_pcpu(void)
 
 	init_debug_pre();
 
+	if (sanitize_multiboot_info() != 0) {
+		panic("Multiboot info error!");
+	}
+
 	init_pcpu_pre(true);
 
 	init_seed();