aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/kvm_emulate.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-06-01 08:34:24 -0400
committerAvi Kivity <avi@redhat.com>2011-07-12 06:16:09 -0400
commit36dd9bb5ce32bc39e25a5fcc61415f13e3ed5d17 (patch)
tree6c007056ff4a4945d414026401d0c9bf9e66a16d /arch/x86/include/asm/kvm_emulate.h
parent2e4ce7f574369f374ad537a180b4870e2098cf0e (diff)
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.h2
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 c0f77e09ebce..d0e100f55b76 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -253,7 +253,7 @@ struct decode_cache {
253 u8 modrm_rm; 253 u8 modrm_rm;
254 u8 modrm_seg; 254 u8 modrm_seg;
255 bool rip_relative; 255 bool rip_relative;
256 unsigned long eip; 256 unsigned long _eip;
257 /* Fields above regs are cleared together. */ 257 /* Fields above regs are cleared together. */
258 unsigned long regs[NR_VCPU_REGS]; 258 unsigned long regs[NR_VCPU_REGS];
259 struct fetch_cache fetch; 259 struct fetch_cache fetch;