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

Commit fb5e336b authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: drop set_rflags callback 



Not needed anymore now that the CPL is computed directly
during task switch.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2356aaeb

arch/x86/include/asm/kvm_emulate.h

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ struct x86_emulate_ops { 
	void (*set_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);

	ulong (*get_cr)(struct x86_emulate_ctxt *ctxt, int cr);

	int (*set_cr)(struct x86_emulate_ctxt *ctxt, int cr, ulong val);

	void (*set_rflags)(struct x86_emulate_ctxt *ctxt, ulong val);

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

	int (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong *dest);

	int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);

arch/x86/kvm/x86.c

+0 −6
Original line number Diff line number Diff line
@@ -4646,11 +4646,6 @@ static int emulator_set_cr(struct x86_emulate_ctxt *ctxt, int cr, ulong val) 
	return res;

}



static void emulator_set_rflags(struct x86_emulate_ctxt *ctxt, ulong val)

{

	kvm_set_rflags(emul_to_vcpu(ctxt), val);

}



static int emulator_get_cpl(struct x86_emulate_ctxt *ctxt)

{

	return kvm_x86_ops->get_cpl(emul_to_vcpu(ctxt));
@@ -4835,7 +4830,6 @@ static const struct x86_emulate_ops emulate_ops = { 
	.set_idt	     = emulator_set_idt,

	.get_cr              = emulator_get_cr,

	.set_cr              = emulator_set_cr,

	.set_rflags          = emulator_set_rflags,

	.cpl                 = emulator_get_cpl,

	.get_dr              = emulator_get_dr,

	.set_dr              = emulator_set_dr,