diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-03-18 15:20:06 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:15:59 +0300 |
| commit | 063db061b9b3472c925f09ae3a0a8359b80c2295 (patch) | |
| tree | b38642f43f436c88ab67c5cadd618596d6e9130a /arch/x86/include/asm/kvm_emulate.h | |
| parent | 9c5372445c1ad4fcdb4128957ec89334223b8113 (diff) | |
| download | talos-op-linux-063db061b9b3472c925f09ae3a0a8359b80c2295.tar.gz talos-op-linux-063db061b9b3472c925f09ae3a0a8359b80c2295.zip | |
KVM: Provide current eip as part of emulator context.
Eliminate the need to call back into KVM to get it from emulator.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index b048fd21c54e..07657258af8f 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -141,7 +141,7 @@ struct decode_cache { u8 seg_override; unsigned int d; unsigned long regs[NR_VCPU_REGS]; - unsigned long eip, eip_orig; + unsigned long eip; /* modrm */ u8 modrm; u8 modrm_mod; @@ -160,6 +160,7 @@ struct x86_emulate_ctxt { struct kvm_vcpu *vcpu; unsigned long eflags; + unsigned long eip; /* eip before instruction emulation */ /* Emulated execution mode, represented by an X86EMUL_MODE value. */ int mode; u32 cs_base; |
