From c72d95b198c4270050091ba9d493b70f6f8cc80e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 7 Mar 2011 17:39:45 +0200
Subject: [PATCH] --- yaml --- r: 247989 b: refs/heads/master c:
 887864758580c80710947c38a4692032163777df h: refs/heads/master i:   247987:
 95632a9141f617f9e52bc3dd7c35118717dc436e v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/vmx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8d9789beb707..951df8c549b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5ca8e572c4d8cb8dec1cf5b3fc9c7066f6b2c29
+refs/heads/master: 887864758580c80710947c38a4692032163777df
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index f95f48b26006..1bdb49de6a22 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -3118,7 +3118,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
 	enum emulation_result er;
 
 	vect_info = vmx->idt_vectoring_info;
-	intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
+	intr_info = vmx->exit_intr_info;
 
 	if (is_machine_check(intr_info))
 		return handle_machine_check(vcpu);