---

yaml --- r: 248084 b: refs/heads/master c: 4947e7c h: refs/heads/master v: v3
git-mirror · May 22, 2011 · 296a60d · 296a60d
1 parent 9524c0d
commit 296a60d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;