Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcaf5cc5 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: x86 emulator: add new ->wbinvd() callback 



Instead of calling kvm_emulate_wbinvd() directly.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d6aa1000

arch/x86/include/asm/kvm_emulate.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct x86_emulate_ops { 
	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);

	void (*halt)(struct x86_emulate_ctxt *ctxt);

	void (*wbinvd)(struct x86_emulate_ctxt *ctxt);

	int (*fix_hypercall)(struct x86_emulate_ctxt *ctxt);

	void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */

	void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */

arch/x86/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -4092,7 +4092,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
		rc = em_clts(ctxt);

		break;

	case 0x09:		/* wbinvd */

		kvm_emulate_wbinvd(ctxt->vcpu);

		ctxt->ops->wbinvd(ctxt);

		break;

	case 0x08:		/* invd */

	case 0x0d:		/* GrpP (prefetch) */

arch/x86/kvm/x86.c

+6 −0
Original line number Diff line number Diff line
@@ -4154,6 +4154,11 @@ int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu) 
}

EXPORT_SYMBOL_GPL(kvm_emulate_wbinvd);



static void emulator_wbinvd(struct x86_emulate_ctxt *ctxt)

{

	kvm_emulate_wbinvd(emul_to_vcpu(ctxt));

}



int emulator_get_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long *dest)

{

	return _kvm_get_dr(emul_to_vcpu(ctxt), dr, dest);
@@ -4408,6 +4413,7 @@ static struct x86_emulate_ops emulate_ops = { 
	.set_msr             = emulator_set_msr,

	.get_msr             = emulator_get_msr,

	.halt                = emulator_halt,

	.wbinvd              = emulator_wbinvd,

	.fix_hypercall       = emulator_fix_hypercall,

	.get_fpu             = emulator_get_fpu,

	.put_fpu             = emulator_put_fpu,