github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-07 20:00:13 +00:00
Code Issues Projects Releases Wiki Activity

hv: add vm restart API

Browse Source 
And export the API to DM. DM will do system reboot/S3 resume based
on this API.

Also add the pre-assumption description for some vm APIs.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei
2018-05-11 19:19:27 +08:00
committed by lijinxia
parent a4eebb0ef8
commit f576f97ea8
6 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
hypervisor/arch/x86/guest/vm.c
View File

@@ -289,6 +289,9 @@ int shutdown_vm(struct vm *vm)
return status;
}
/**
* * @pre vm != NULL
*/
int start_vm(struct vm *vm)
{
struct vcpu *vcpu = NULL;
@@ -303,9 +306,33 @@ int start_vm(struct vm *vm)
return 0;
}
/*
* DM only pause vm for shutdown/reboot. If we need to
* extend the pause vm for DM, this API should be extended.
/**
* * @pre vm != NULL
*/
int reset_vm(struct vm *vm)
{
int i;
struct vcpu *vcpu = NULL;
if (vm->state != VM_PAUSED)
return -1;
foreach_vcpu(i, vm, vcpu) {
reset_vcpu(vcpu);
if (is_vcpu_bsp(vcpu))
vm_sw_loader(vm, vcpu);
vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL;
}
vioapic_reset(vm->arch_vm.virt_ioapic);
start_vm(vm);
return 0;
}
/**
* * @pre vm != NULL
*/
void pause_vm(struct vm *vm)
{
@@ -323,6 +350,9 @@ void pause_vm(struct vm *vm)
}
}
/**
* * @pre vm != NULL
*/
void resume_vm(struct vm *vm)
{
uint16_t i;
@@ -335,13 +365,19 @@ void resume_vm(struct vm *vm)
vm->state = VM_STARTED;
}
/* Resume vm from S3 state
/**
* @brief Resume vm from S3 state
*
* To resume vm after guest enter S3 state:
* - reset BSP
* - BSP will be put to real mode with entry set as wakeup_vec
* - init_vmcs BSP. We could call init_vmcs here because we know current
* pcpu is mapped to BSP of vm.
*
* @vm[in] vm pointer to vm data structure
* @wakeup_vec[in] The resume address of vm
*
* @pre vm != NULL
*/
void resume_vm_from_s3(struct vm *vm, uint32_t wakeup_vec)
{

5
hypervisor/arch/x86/guest/vmcall.c
View File

@@ -65,6 +65,11 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
ret = hcall_start_vm((uint16_t)param1);
break;
case HC_RESET_VM:
/* param1: vmid */
ret = hcall_reset_vm((uint16_t)param1);
break;
case HC_PAUSE_VM:
/* param1: vmid */
ret = hcall_pause_vm((uint16_t)param1);