diff options
author | Gleb Natapov <gleb@redhat.com> | 2010-08-25 05:47:43 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-24 04:51:34 -0400 |
commit | d2ddd1c48364e4161052d6089f06b2cf3c50496b (patch) | |
tree | f8dd6a949e5006e2f39575b567f22d9033b9d1a7 /arch/x86/include/asm | |
parent | 3e2f65d57a0c1897fcc3287eeb41f117f4d021e5 (diff) |
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')
-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 { | |||
224 | /* interruptibility state, as a result of execution of STI or MOV SS */ | 224 | /* interruptibility state, as a result of execution of STI or MOV SS */ |
225 | int interruptibility; | 225 | int interruptibility; |
226 | 226 | ||
227 | bool restart; /* restart string instruction after writeback */ | ||
228 | bool perm_ok; /* do not check permissions if true */ | 227 | bool perm_ok; /* do not check permissions if true */ |
229 | 228 | ||
230 | int exception; /* exception that happens during emulation or -1 */ | 229 | int exception; /* exception that happens during emulation or -1 */ |
@@ -255,6 +254,9 @@ struct x86_emulate_ctxt { | |||
255 | #endif | 254 | #endif |
256 | 255 | ||
257 | int x86_decode_insn(struct x86_emulate_ctxt *ctxt); | 256 | int x86_decode_insn(struct x86_emulate_ctxt *ctxt); |
257 | #define EMULATION_FAILED -1 | ||
258 | #define EMULATION_OK 0 | ||
259 | #define EMULATION_RESTART 1 | ||
258 | int x86_emulate_insn(struct x86_emulate_ctxt *ctxt); | 260 | int x86_emulate_insn(struct x86_emulate_ctxt *ctxt); |
259 | int emulator_task_switch(struct x86_emulate_ctxt *ctxt, | 261 | int emulator_task_switch(struct x86_emulate_ctxt *ctxt, |
260 | u16 tss_selector, int reason, | 262 | u16 tss_selector, int reason, |