github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 01:54:44 +00:00
Code Issues Projects Releases Wiki Activity

hv: bugfix - MMIO access size was not properly initialized.

Browse Source 
- MMIO access size is not initialized before
  instruction emulation.
- rename 'analyze_instruction()' to 'decode_instruction()'

Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Yonghua Huang
2018-05-17 23:30:32 +08:00
committed by lijinxia
parent 99189b4e48
commit 0e5f7cb91c
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/arch/x86/ept.c
View File

@@ -339,10 +339,6 @@ static int dm_emulate_mmio_pre(struct vcpu *vcpu, uint64_t exit_qual)
{
int status;
status = analyze_instruction(vcpu, &vcpu->mmio);
if (status != 0)
return status;
if (vcpu->mmio.read_write == HV_MEM_IO_WRITE) {
status = emulate_instruction(vcpu, &vcpu->mmio);
if (status != 0)
@@ -404,6 +400,9 @@ int ept_violation_vmexit_handler(struct vcpu *vcpu)
*/
mmio->paddr = gpa;
if (decode_instruction(vcpu, mmio) != 0)
goto out;
list_for_each(pos, &vcpu->vm->mmio_list) {
mmio_handler = list_entry(pos, struct mem_io_node, list);
if ((mmio->paddr + mmio->access_size <=
@@ -419,9 +418,6 @@ int ept_violation_vmexit_handler(struct vcpu *vcpu)
return -EIO;
}
if (analyze_instruction(vcpu, mmio) != 0)
goto out;
if (mmio->read_write == HV_MEM_IO_WRITE) {
if (emulate_instruction(vcpu, mmio) != 0)
goto out;