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

Commit ef050dc0 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: x86 emulator: set RFLAGS outside x86 emulator code 



Removes the need for set_flags() callback.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 95c55886

arch/x86/include/asm/kvm_emulate.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -142,7 +142,6 @@ struct x86_emulate_ops { 
	ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);

	ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);

	int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);

	int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);

	int (*cpl)(struct kvm_vcpu *vcpu);

	int (*cpl)(struct kvm_vcpu *vcpu);

	void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);

	int (*get_dr)(int dr, unsigned long *dest, struct kvm_vcpu *vcpu);

	int (*get_dr)(int dr, unsigned long *dest, struct kvm_vcpu *vcpu);

	int (*set_dr)(int dr, unsigned long value, struct kvm_vcpu *vcpu);

	int (*set_dr)(int dr, unsigned long value, struct kvm_vcpu *vcpu);

	int (*set_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);

	int (*set_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);

arch/x86/kvm/emulate.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -3034,7 +3034,6 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	/* Commit shadow register state. */

	/* Commit shadow register state. */

	memcpy(ctxt->vcpu->arch.regs, c->regs, sizeof c->regs);

	memcpy(ctxt->vcpu->arch.regs, c->regs, sizeof c->regs);

	ctxt->eip = c->eip;

	ctxt->eip = c->eip;

	ops->set_rflags(ctxt->vcpu, ctxt->eflags);





done:

done:

	return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;

	return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;

arch/x86/kvm/x86.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -3806,11 +3806,6 @@ static void emulator_set_segment_selector(u16 sel, int seg, 
	kvm_set_segment(vcpu, &kvm_seg, seg);

	kvm_set_segment(vcpu, &kvm_seg, seg);

}

}





static void emulator_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)

{

	kvm_x86_ops->set_rflags(vcpu, rflags);

}



static struct x86_emulate_ops emulate_ops = {

static struct x86_emulate_ops emulate_ops = {

	.read_std            = kvm_read_guest_virt_system,

	.read_std            = kvm_read_guest_virt_system,

	.write_std           = kvm_write_guest_virt_system,

	.write_std           = kvm_write_guest_virt_system,
@@ -3829,7 +3824,6 @@ static struct x86_emulate_ops emulate_ops = { 
	.get_cr              = emulator_get_cr,

	.get_cr              = emulator_get_cr,

	.set_cr              = emulator_set_cr,

	.set_cr              = emulator_set_cr,

	.cpl                 = emulator_get_cpl,

	.cpl                 = emulator_get_cpl,

	.set_rflags          = emulator_set_rflags,

	.get_dr              = emulator_get_dr,

	.get_dr              = emulator_get_dr,

	.set_dr              = emulator_set_dr,

	.set_dr              = emulator_set_dr,

	.set_msr             = kvm_set_msr,

	.set_msr             = kvm_set_msr,
@@ -3941,6 +3935,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 




	shadow_mask = vcpu->arch.emulate_ctxt.interruptibility;

	shadow_mask = vcpu->arch.emulate_ctxt.interruptibility;

	kvm_x86_ops->set_interrupt_shadow(vcpu, shadow_mask);

	kvm_x86_ops->set_interrupt_shadow(vcpu, shadow_mask);

	kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);

	kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);

	kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);





	if (vcpu->arch.pio.count) {

	if (vcpu->arch.pio.count) {