diff options
| author | Avi Kivity <avi@redhat.com> | 2011-06-01 15:34:24 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-07-12 13:16:09 +0300 |
| commit | 36dd9bb5ce32bc39e25a5fcc61415f13e3ed5d17 (patch) | |
| tree | 6c007056ff4a4945d414026401d0c9bf9e66a16d /arch/x86/include/asm/kvm_emulate.h | |
| parent | 2e4ce7f574369f374ad537a180b4870e2098cf0e (diff) | |
| download | op-kernel-dev-36dd9bb5ce32bc39e25a5fcc61415f13e3ed5d17.zip op-kernel-dev-36dd9bb5ce32bc39e25a5fcc61415f13e3ed5d17.tar.gz | |
KVM: x86 emulator: rename decode_cache::eip to _eip
The name eip conflicts with a field of the same name in x86_emulate_ctxt,
which we plan to fold decode_cache into.
The name _eip is unfortunate, but what's really needed is a refactoring
here, not a better name.
Signed-off-by: Avi Kivity <avi@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index c0f77e0..d0e100f 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -253,7 +253,7 @@ struct decode_cache { u8 modrm_rm; u8 modrm_seg; bool rip_relative; - unsigned long eip; + unsigned long _eip; /* Fields above regs are cleared together. */ unsigned long regs[NR_VCPU_REGS]; struct fetch_cache fetch; |
