1 files changed, 21 insertions, 12 deletions

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index a04fe4eb237d..eb181178fe0b 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -37,6 +37,7 @@ struct x86_instruction_info {
         u8  modrm_reg;          /* index of register used               */
         u8  modrm_rm;           /* rm part of modrm                     */
         u64 src_val;            /* value of source operand              */
+        u64 dst_val;            /* value of destination operand         */
         u8  src_bytes;          /* size of source operand               */
         u8  dst_bytes;          /* size of destination operand          */
         u8  ad_bytes;           /* size of src/dst address              */
@@ -194,6 +195,7 @@ struct x86_emulate_ops {
         int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);
         int (*set_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);
         int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);
+        int (*check_pmc)(struct x86_emulate_ctxt *ctxt, u32 pmc);
         int (*read_pmc)(struct x86_emulate_ctxt *ctxt, u32 pmc, u64 *pdata);
         void (*halt)(struct x86_emulate_ctxt *ctxt);
         void (*wbinvd)(struct x86_emulate_ctxt *ctxt);
@@ -231,7 +233,7 @@ struct operand {
         union {
                 unsigned long val;
                 u64 val64;
-                char valptr[sizeof(unsigned long) + 2];
+                char valptr[sizeof(sse128_t)];
                 sse128_t vec_val;
                 u64 mm_val;
                 void *data;
@@ -240,8 +242,8 @@ struct operand {
 
 struct fetch_cache {
         u8 data[15];
-        unsigned long start;
-        unsigned long end;
+        u8 *ptr;
+        u8 *end;
 };
 
 struct read_cache {
@@ -286,30 +288,36 @@ struct x86_emulate_ctxt {
         u8 opcode_len;
         u8 b;
         u8 intercept;
-        u8 lock_prefix;
-        u8 rep_prefix;
         u8 op_bytes;
         u8 ad_bytes;
-        u8 rex_prefix;
         struct operand src;
         struct operand src2;
         struct operand dst;
-        bool has_seg_override;
-        u8 seg_override;
-        u64 d;
         int (*execute)(struct x86_emulate_ctxt *ctxt);
         int (*check_perm)(struct x86_emulate_ctxt *ctxt);
+        /*
+         * The following six fields are cleared together,
+         * the rest are initialized unconditionally in x86_decode_insn
+         * or elsewhere
+         */
+        bool rip_relative;
+        u8 rex_prefix;
+        u8 lock_prefix;
+        u8 rep_prefix;
+        /* bitmaps of registers in _regs[] that can be read */
+        u32 regs_valid;
+        /* bitmaps of registers in _regs[] that have been written */
+        u32 regs_dirty;
         /* modrm */
         u8 modrm;
         u8 modrm_mod;
         u8 modrm_reg;
         u8 modrm_rm;
         u8 modrm_seg;
-        bool rip_relative;
+        u8 seg_override;
+        u64 d;
         unsigned long _eip;
         struct operand memop;
-        u32 regs_valid;  /* bitmaps of registers in _regs[] that can be read */
-        u32 regs_dirty;  /* bitmaps of registers in _regs[] that have been written */
         /* Fields above regs are cleared together. */
         unsigned long _regs[NR_VCPU_REGS];
         struct operand *memopp;
@@ -407,6 +415,7 @@ bool x86_page_table_writing_insn(struct x86_emulate_ctxt *ctxt);
 #define EMULATION_OK 0
 #define EMULATION_RESTART 1
 #define EMULATION_INTERCEPTED 2
+void init_decode_cache(struct x86_emulate_ctxt *ctxt);
 int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);
 int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
                          u16 tss_selector, int idt_index, int reason,