summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-09-19 14:34:08 +0200
committerAvi Kivity <avi@redhat.com>2010-10-24 10:53:02 +0200
commit49e9d557f9b6e9639390b63b645f2def8dde5f1b (patch)
treebf5938665cfa712845d6e490f1cb169bf8f2d78f /arch
parenta92601bb707f6f49fd5563ef3d09928e70cc222e (diff)
downloadlinux-49e9d557f9b6e9639390b63b645f2def8dde5f1b.tar.gz
linux-49e9d557f9b6e9639390b63b645f2def8dde5f1b.tar.bz2
linux-49e9d557f9b6e9639390b63b645f2def8dde5f1b.zip
KVM: VMX: Respect interrupt window in big real mode
If an interrupt is pending, we need to stop emulation so we can inject it. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 9d3f972aa19c..28c72da93a1b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3582,8 +3582,17 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
struct vcpu_vmx *vmx = to_vmx(vcpu);
enum emulation_result err = EMULATE_DONE;
int ret = 1;
+ u32 cpu_exec_ctrl;
+ bool intr_window_requested;
+
+ cpu_exec_ctrl = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);
+ intr_window_requested = cpu_exec_ctrl & CPU_BASED_VIRTUAL_INTR_PENDING;
while (!guest_state_valid(vcpu)) {
+ if (intr_window_requested
+ && (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
+ return handle_interrupt_window(&vmx->vcpu);
+
err = emulate_instruction(vcpu, 0, 0, 0);
if (err == EMULATE_DO_MMIO) {