Skip to contentSkip to conversation

emulator: do not open code return values from the emulator

PATCH Applied Gleb Natapov 2 participants 2 messages Mar 28, 2011 – Apr 5, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 emulator: do not open code return values from the emulator

arch/x86/kvm/emulate.c +3 -3
index 14c5ad5..96c02a6 100644
@@ -2168,7 +2168,7 @@ int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
 			ctxt->eip = c->eip;
 	}
 
-	return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+	return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 }
 
 static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned seg,
@@ -2926,7 +2926,7 @@ done_prefixes:
 	}
 
 done:
-	return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+	return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 }
 
 static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
@@ -3739,5 +3739,5 @@ twobyte_insn:
 	goto writeback;
 
 cannot_emulate:
-	return -1;
+	return EMULATION_FAILED;
 }

--
Gleb.

Applied
#1 lore raw

On 03/28/2011 04:57 PM, Gleb Natapov wrote:

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function