lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: x86 emulator: do not open code return values from the emulator

Browse Source 
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Gleb Natapov
2011-03-28 16:57:49 +02:00
committed by Avi Kivity
parent 0be839bfb4
commit a0c0ab2feb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/emulate.c
View File

@@ -2287,7 +2287,7 @@ int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
ctxt->eip = c->eip; 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, static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned seg,
@@ -3333,7 +3333,7 @@ done_prefixes:
} }
done: 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) static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
@@ -4163,5 +4163,5 @@ twobyte_insn:
goto writeback; goto writeback;
cannot_emulate: cannot_emulate:
return -1; return EMULATION_FAILED;
} }