KVM: x86 emulator: move memop, memopp into emulation context

Simplifies further generalization of decode.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 6040d115ef51..56bac3e3423e 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -275,6 +275,8 @@ struct x86_emulate_ctxt {
         unsigned long _eip;
         /* Fields above regs are cleared together. */
         unsigned long regs[NR_VCPU_REGS];
+        struct operand memop;
+        struct operand *memopp;
         struct fetch_cache fetch;
         struct read_cache io_read;
         struct read_cache mem_read;