Skip to content

Commit

Permalink
KVM: x86 emulator: drop vcpu argument from intercept callback
Browse files Browse the repository at this point in the history
Making the emulator caller agnostic.

Signed-off-by: Avi Kivity <[email protected]>
  • Loading branch information
avikivity committed May 22, 2011
1 parent 717746e commit 2953538
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/kvm_emulate.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ struct x86_emulate_ops {
int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);
void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables 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,
enum x86_intercept_stage stage);
};
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kvm/emulate.c
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,
.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)
Expand Down
4 changes: 2 additions & 2 deletions arch/x86/kvm/x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -4365,11 +4365,11 @@ static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt)
preempt_enable();
}

static int emulator_intercept(struct kvm_vcpu *vcpu,
static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
struct x86_instruction_info *info,
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 = {
Expand Down

0 comments on commit 2953538

Please sign in to comment.