PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86 emulator: don't update vcpu state if instruction is restarted

Browse Source 
No need to update vcpu state since instruction is in the middle of the
emulation.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Gleb Natapov 2010-07-29 15:11:52 +03:00 committed by Avi Kivity
parent 63540382cc
commit e85d28f8e8
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arch/x86/kvm/x86.c
View File

@ -4057,32 +4057,27 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
return handle_emulation_failure(vcpu);
}
r = EMULATE_DONE;
if (vcpu->arch.emulate_ctxt.exception >= 0)
inject_emulated_exception(vcpu);
else if (vcpu->arch.pio.count) {
if (!vcpu->arch.pio.in)
vcpu->arch.pio.count = 0;
r = EMULATE_DO_MMIO;
} else if (vcpu->mmio_needed) {
if (vcpu->mmio_is_write)
vcpu->mmio_needed = 0;
r = EMULATE_DO_MMIO;
} else if (vcpu->arch.emulate_ctxt.restart)
goto restart;
toggle_interruptibility(vcpu, vcpu->arch.emulate_ctxt.interruptibility);
kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);
if (vcpu->arch.emulate_ctxt.exception >= 0) {
inject_emulated_exception(vcpu);
return EMULATE_DONE;
}
if (vcpu->arch.pio.count) {
if (!vcpu->arch.pio.in)
vcpu->arch.pio.count = 0;
return EMULATE_DO_MMIO;
}
if (vcpu->mmio_needed) {
if (vcpu->mmio_is_write)
vcpu->mmio_needed = 0;
return EMULATE_DO_MMIO;
}
if (vcpu->arch.emulate_ctxt.restart)
goto restart;
return EMULATE_DONE;
return r;
}
EXPORT_SYMBOL_GPL(emulate_instruction);