Commit 2953538e authored by Avi Kivity's avatar Avi Kivity

KVM: x86 emulator: drop vcpu argument from intercept callback

Making the emulator caller agnostic.
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 717746e3
...@@ -185,7 +185,7 @@ struct x86_emulate_ops { ...@@ -185,7 +185,7 @@ struct x86_emulate_ops {
int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata); int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);
void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */ void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */
void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */ void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */
int (*intercept)(struct kvm_vcpu *vcpu, int (*intercept)(struct x86_emulate_ctxt *ctxt,
struct x86_instruction_info *info, struct x86_instruction_info *info,
enum x86_intercept_stage stage); enum x86_intercept_stage stage);
}; };
......
...@@ -438,7 +438,7 @@ static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt, ...@@ -438,7 +438,7 @@ static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,
.next_rip = ctxt->eip, .next_rip = ctxt->eip,
}; };
return ctxt->ops->intercept(ctxt->vcpu, &info, stage); return ctxt->ops->intercept(ctxt, &info, stage);
} }
static inline unsigned long ad_mask(struct decode_cache *c) static inline unsigned long ad_mask(struct decode_cache *c)
......
...@@ -4365,11 +4365,11 @@ static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt) ...@@ -4365,11 +4365,11 @@ static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt)
preempt_enable(); preempt_enable();
} }
static int emulator_intercept(struct kvm_vcpu *vcpu, static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
struct x86_instruction_info *info, struct x86_instruction_info *info,
enum x86_intercept_stage stage) enum x86_intercept_stage stage)
{ {
return kvm_x86_ops->check_intercept(vcpu, info, stage); return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
} }
static struct x86_emulate_ops emulate_ops = { static struct x86_emulate_ops emulate_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment