From 296a60dce3bbddc589e3f6695a7a684b6754d14e Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Tue, 12 Apr 2011 12:36:23 +0300
Subject: [PATCH] --- yaml --- r: 248084 b: refs/heads/master c:
 4947e7cd0ee36e1aa37dfec4f7fa71cc64a2f0fd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f6e1ef225fb7..647820a370bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d7d810255982bfcc355cdb8972d72843acb0cf8
+refs/heads/master: 4947e7cd0ee36e1aa37dfec4f7fa71cc64a2f0fd
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 7466abae84bf..3624f202b440 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -3993,7 +3993,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 	jump_far:
 		memcpy(&sel, c->src.valptr + c->op_bytes, 2);
 
-		if (load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS))
+		rc = load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS);
+		if (rc != X86EMUL_CONTINUE)
 			goto done;
 
 		c->eip = 0;