diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 1769d0faa..bccd2a477 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -563,7 +563,7 @@ static void bsp_boot_post(void)
 
 	exec_vmxon_instr(BOOT_CPU_ID);
 
-	prepare_vm0();
+	prepare_vm(BOOT_CPU_ID);
 
 	default_idle();
 
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 620835548..f67904fe7 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -437,6 +437,18 @@ int prepare_vm0(void)
 	return err;
 }
 
+int prepare_vm(uint16_t pcpu_id)
+{
+	int err = 0;
+
+	/* prepare vm0 if pcpu_id is BOOT_CPU_ID */
+	if (pcpu_id == BOOT_CPU_ID) {
+		err  = prepare_vm0();
+	}
+
+	return err;
+}
+
 #ifdef CONFIG_VM0_DESC
 static inline bool vcpu_in_vm_desc(struct vcpu *vcpu,
 		struct vm_description *vm_desc)
diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h
index cfe280175..df374507d 100644
--- a/hypervisor/include/arch/x86/guest/vm.h
+++ b/hypervisor/include/arch/x86/guest/vm.h
@@ -181,7 +181,7 @@ void resume_vm_from_s3(struct vm *vm, uint32_t wakeup_vec);
 int start_vm(struct vm *vm);
 int reset_vm(struct vm *vm);
 int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm);
-int prepare_vm0(void);
+int prepare_vm(uint16_t pcpu_id);
 #ifdef CONFIG_VM0_DESC
 void vm_fixup(struct vm *vm);
 #endif