diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c
index 030bcf1b0..788ad968f 100644
--- a/hypervisor/arch/x86/guest/vcpu.c
+++ b/hypervisor/arch/x86/guest/vcpu.c
@@ -278,13 +278,6 @@ void reset_vcpu(struct vcpu *vcpu)
 	vcpu->ioreq_pending = 0;
 	vcpu->arch_vcpu.nr_sipi = 0;
 	vcpu->pending_pre_work = 0;
-
-	vcpu->arch_vcpu.exception_info.exception = VECTOR_INVALID;
-	vcpu->arch_vcpu.cur_context = NORMAL_WORLD;
-	vcpu->arch_vcpu.irq_window_enabled = 0;
-	vcpu->arch_vcpu.inject_event_pending = false;
-	memset(vcpu->arch_vcpu.vmcs, 0, CPU_PAGE_SIZE);
-
 	vlapic = vcpu->arch_vcpu.vlapic;
 	vlapic_reset(vlapic);
 }
diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c
index 2f9fda5c4..2d00a0c67 100644
--- a/hypervisor/arch/x86/guest/vm.c
+++ b/hypervisor/arch/x86/guest/vm.c
@@ -274,7 +274,7 @@ void pause_vm(struct vm *vm)
 		pause_vcpu(vcpu, VCPU_ZOMBIE);
 }
 
-void resume_vm(struct vm *vm)
+int vm_resume(struct vm *vm)
 {
 	int i;
 	struct vcpu *vcpu = NULL;
@@ -283,6 +283,8 @@ void resume_vm(struct vm *vm)
 		resume_vcpu(vcpu);
 
 	vm->state = VM_STARTED;
+
+	return 0;
 }
 
 /* Create vm/vcpu for vm0 */
diff --git a/hypervisor/include/arch/x86/cpu.h b/hypervisor/include/arch/x86/cpu.h
index d78ca1177..70e0d1495 100644
--- a/hypervisor/include/arch/x86/cpu.h
+++ b/hypervisor/include/arch/x86/cpu.h
@@ -174,12 +174,8 @@ extern uint8_t                trampoline_pdpt_addr[];
 extern uint8_t                trampoline_gdt_ptr[];
 extern uint8_t                trampoline_start64_fixup[];
 
-/* In trampoline range, hold the jump target which trampline will jump to */
-extern uint64_t               main_entry[1];
-
 extern uint64_t trampoline_start16_paddr;
 extern int ibrs_type;
-extern spinlock_t trampoline_spinlock;
 
 /*
  * To support per_cpu access, we use a special struct "per_cpu_region" to hold
@@ -264,7 +260,6 @@ bool is_vapic_virt_reg_supported(void);
 bool cpu_has_cap(uint32_t bit);
 void load_cpu_state_data(void);
 void start_cpus();
-void stop_cpus();
 
 /* Read control register */
 #define CPU_CR_READ(cr, result_ptr)                         \
diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h
index b9471a863..7d043194d 100644
--- a/hypervisor/include/arch/x86/guest/vm.h
+++ b/hypervisor/include/arch/x86/guest/vm.h
@@ -171,7 +171,6 @@ struct vm_description {
 
 int shutdown_vm(struct vm *vm);
 void pause_vm(struct vm *vm);
-void resume_vm(struct vm *vm);
 int start_vm(struct vm *vm);
 int create_vm(struct vm_description *vm_desc, struct vm **vm);
 int prepare_vm0(void);
diff --git a/hypervisor/include/debug/console.h b/hypervisor/include/debug/console.h
index 99efc84ef..15c5bfda9 100644
--- a/hypervisor/include/debug/console.h
+++ b/hypervisor/include/debug/console.h
@@ -70,7 +70,7 @@ static inline void suspend_console(void)
 	del_timer(&console_timer);
 }
 
-static inline void resume_console(void)
+static inline void resume_console_enable(void)
 {
 	console_setup_timer();
 }
@@ -101,7 +101,7 @@ static inline void console_setup_timer(void) {}
 static inline uint32_t get_serial_handle(void) { return 0; }
 
 static inline void suspend_console(void) {}
-static inline void resume_console(void) {}
+static inline void resume_console_enable(void) {}
 #endif
 
 #endif /* CONSOLE_H */