---

yaml --- r: 197746 b: refs/heads/master c: 0760d44 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · 8bc9163 · 8bc9163
1 parent 80a037e
commit 8bc9163
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f6abd06f521112a0a3bc906df273fa3ce0a9387
+refs/heads/master: 0760d44868f351ba30fc9a08cf1830e46aa72466
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -2402,6 +2402,8 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 	else
 		ret = task_switch_16(ctxt, ops, tss_selector, old_tss_sel,
 				     old_tss_base, &next_tss_desc);
+	if (ret != X86EMUL_CONTINUE)
+		return ret;
 
 	if (reason == TASK_SWITCH_CALL || reason == TASK_SWITCH_GATE)
 		ctxt->eflags = ctxt->eflags | X86_EFLAGS_NT;