diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-08-25 12:47:43 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-10-24 10:51:34 +0200 |
| commit | d2ddd1c48364e4161052d6089f06b2cf3c50496b (patch) | |
| tree | f8dd6a949e5006e2f39575b567f22d9033b9d1a7 /arch/x86/include/asm/kvm_emulate.h | |
| parent | 3e2f65d57a0c1897fcc3287eeb41f117f4d021e5 (diff) | |
| download | linux-stable-d2ddd1c48364e4161052d6089f06b2cf3c50496b.tar.gz linux-stable-d2ddd1c48364e4161052d6089f06b2cf3c50496b.tar.bz2 linux-stable-d2ddd1c48364e4161052d6089f06b2cf3c50496b.zip | |
KVM: x86 emulator: get rid of "restart" in emulation context.
x86_emulate_insn() will return 1 if instruction can be restarted
without re-entering a guest.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/kvm_emulate.h')
| -rw-r--r-- | arch/x86/include/asm/kvm_emulate.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index 1bbf2b6f2a7e..1bf11400ae99 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -224,7 +224,6 @@ struct x86_emulate_ctxt { /* interruptibility state, as a result of execution of STI or MOV SS */ int interruptibility; - bool restart; /* restart string instruction after writeback */ bool perm_ok; /* do not check permissions if true */ int exception; /* exception that happens during emulation or -1 */ @@ -255,6 +254,9 @@ struct x86_emulate_ctxt { #endif int x86_decode_insn(struct x86_emulate_ctxt *ctxt); +#define EMULATION_FAILED -1 +#define EMULATION_OK 0 +#define EMULATION_RESTART 1 int x86_emulate_insn(struct x86_emulate_ctxt *ctxt); int emulator_task_switch(struct x86_emulate_ctxt *ctxt, u16 tss_selector, int reason, |