From 9041cff0dcf18da9ad97f70bb813fdb3def39319 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Mon, 28 Mar 2011 16:57:49 +0200 Subject: [PATCH] --- yaml --- r: 248019 b: refs/heads/master c: a0c0ab2feb9d696978a7475dce4253ec62e98a16 h: refs/heads/master i: 248017: 3f537718bca21099275ee9ba0382d0a2b9ec9f76 248015: d8bda872750d8957addf42e37b577d814d209124 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/emulate.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 978083fe19a3..4ad2b213881c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0be839bfb4b12f17fba2d982353b0f674e327f9e +refs/heads/master: a0c0ab2feb9d696978a7475dce4253ec62e98a16 diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c index d88dcfd66a8f..ae5f49105c3b 100644 --- a/trunk/arch/x86/kvm/emulate.c +++ b/trunk/arch/x86/kvm/emulate.c @@ -2287,7 +2287,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, @@ -3333,7 +3333,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len) } 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) @@ -4163,5 +4163,5 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) goto writeback; cannot_emulate: - return -1; + return EMULATION_FAILED; }