1 files changed, 24 insertions, 28 deletions

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 0049211959c0..6040d115ef51 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -229,7 +229,26 @@ struct read_cache {
         unsigned long end;
 };
 
-struct decode_cache {
+struct x86_emulate_ctxt {
+        struct x86_emulate_ops *ops;
+
+        /* Register state before/after emulation. */
+        unsigned long eflags;
+        unsigned long eip; /* eip before instruction emulation */
+        /* Emulated execution mode, represented by an X86EMUL_MODE value. */
+        int mode;
+
+        /* interruptibility state, as a result of execution of STI or MOV SS */
+        int interruptibility;
+
+        bool guest_mode; /* guest running a nested guest */
+        bool perm_ok; /* do not check permissions if true */
+        bool only_vendor_specific_insn;
+
+        bool have_exception;
+        struct x86_exception exception;
+
+        /* decode cache */
         u8 twobyte;
         u8 b;
         u8 intercept;
@@ -246,8 +265,6 @@ struct decode_cache {
         unsigned int d;
         int (*execute)(struct x86_emulate_ctxt *ctxt);
         int (*check_perm)(struct x86_emulate_ctxt *ctxt);
-        unsigned long regs[NR_VCPU_REGS];
-        unsigned long eip;
         /* modrm */
         u8 modrm;
         u8 modrm_mod;
@@ -255,34 +272,14 @@ struct decode_cache {
         u8 modrm_rm;
         u8 modrm_seg;
         bool rip_relative;
+        unsigned long _eip;
+        /* Fields above regs are cleared together. */
+        unsigned long regs[NR_VCPU_REGS];
         struct fetch_cache fetch;
         struct read_cache io_read;
         struct read_cache mem_read;
 };
 
-struct x86_emulate_ctxt {
-        struct x86_emulate_ops *ops;
-
-        /* Register state before/after emulation. */
-        unsigned long eflags;
-        unsigned long eip; /* eip before instruction emulation */
-        /* Emulated execution mode, represented by an X86EMUL_MODE value. */
-        int mode;
-
-        /* interruptibility state, as a result of execution of STI or MOV SS */
-        int interruptibility;
-
-        bool guest_mode; /* guest running a nested guest */
-        bool perm_ok; /* do not check permissions if true */
-        bool only_vendor_specific_insn;
-
-        bool have_exception;
-        struct x86_exception exception;
-
-        /* decode cache */
-        struct decode_cache decode;
-};
-
 /* Repeat String Operation Prefix */
 #define REPE_PREFIX     0xf3
 #define REPNE_PREFIX    0xf2
@@ -373,6 +370,5 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);
 int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
                          u16 tss_selector, int reason,
                          bool has_error_code, u32 error_code);
-int emulate_int_real(struct x86_emulate_ctxt *ctxt,
-                     struct x86_emulate_ops *ops, int irq);
+int emulate_int_real(struct x86_emulate_ctxt *ctxt, int irq);
 #endif /* _ASM_X86_KVM_X86_EMULATE_H */