summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2012-06-10 18:09:27 +0300
committerAvi Kivity <avi@redhat.com>2012-07-09 14:19:03 +0300
commit7c068e45587a83d4235dda55d35a7d305c58e0e5 (patch)
treeddc23a736d9588b794c0b305b60305f190ab66e8 /arch/x86/kvm
parentbdea48e305389b3c8c0f786a317f9da984c16604 (diff)
downloadblackbird-op-linux-7c068e45587a83d4235dda55d35a7d305c58e0e5.tar.gz
blackbird-op-linux-7c068e45587a83d4235dda55d35a7d305c58e0e5.zip
KVM: VMX: Continue emulating after batch exhausted
If we return early from an invalid guest state emulation loop, make sure we return to it later if the guest state is still invalid. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/vmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6cdb40457695..2e51e7c6d2a8 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5002,7 +5002,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
schedule();
}
- vmx->emulation_required = 0;
+ vmx->emulation_required = !guest_state_valid(vcpu);
out:
return ret;
}
OpenPOWER on IntegriCloud