From a5723ccdc1f25f1ee8fd121471740dab16f0572a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 7 Jun 2012 17:08:48 +0300 Subject: [PATCH] --- yaml --- r: 315877 b: refs/heads/master c: b8405c184b4ef3abcebc5cf2211215944d6e2acc h: refs/heads/master i: 315875: b57ed0b88ca8543af14b2232a6b05ad4e0aa207c v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f1e33bd441c6..e424cea4b2f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0495f9b9992f80f82b14306946444b287193390 +refs/heads/master: b8405c184b4ef3abcebc5cf2211215944d6e2acc diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 82ab1fb2683e..debac4984347 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -4977,11 +4977,12 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) int ret = 1; u32 cpu_exec_ctrl; bool intr_window_requested; + unsigned count = 130; 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)) { + while (!guest_state_valid(vcpu) && count-- != 0) { if (intr_window_requested && (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF)) return handle_interrupt_window(&vmx->vcpu);