KVM: x86 emulator: Rename 'cr2' to 'memop'

Previous patches have removed the dependency on cr2; we can now stop passing
it to the emulator and rename uses to 'memop'.

Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index 5e58156..12f1d6f 100644 (file)
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -1702,7 +1702,6 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 
                vcpu->emulate_ctxt.vcpu = vcpu;
                vcpu->emulate_ctxt.eflags = kvm_x86_ops->get_rflags(vcpu);
-               vcpu->emulate_ctxt.cr2 = cr2;
                vcpu->emulate_ctxt.mode =
                        (vcpu->emulate_ctxt.eflags & X86_EFLAGS_VM)
                        ? X86EMUL_MODE_REAL : cs_l

diff --cc drivers/kvm/x86_emulate.c
Simple merge

diff --cc drivers/kvm/x86_emulate.h
Simple merge