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

Commit 537b37e2 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: VMX: Move real-mode interrupt injection fixup to vmx_complete_interrupts() 



This allows reuse of vmx_complete_interrupts() for cancelling injections.

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

arch/x86/kvm/vmx.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -182,6 +182,7 @@ static int init_rmode(struct kvm *kvm); 
static u64 construct_eptp(unsigned long root_hpa);

static u64 construct_eptp(unsigned long root_hpa);

static void kvm_cpu_vmxon(u64 addr);

static void kvm_cpu_vmxon(u64 addr);

static void kvm_cpu_vmxoff(void);

static void kvm_cpu_vmxoff(void);

static void fixup_rmode_irq(struct vcpu_vmx *vmx);





static DEFINE_PER_CPU(struct vmcs *, vmxarea);

static DEFINE_PER_CPU(struct vmcs *, vmxarea);

static DEFINE_PER_CPU(struct vmcs *, current_vmcs);

static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
@@ -3828,11 +3829,15 @@ static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx) 




static void vmx_complete_interrupts(struct vcpu_vmx *vmx)

static void vmx_complete_interrupts(struct vcpu_vmx *vmx)

{

{

	u32 idt_vectoring_info = vmx->idt_vectoring_info;

	u32 idt_vectoring_info;

	u8 vector;

	u8 vector;

	int type;

	int type;

	bool idtv_info_valid;

	bool idtv_info_valid;





	if (vmx->rmode.irq.pending)

		fixup_rmode_irq(vmx);



	idt_vectoring_info = vmx->idt_vectoring_info;

	idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK;

	idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK;





	vmx->vcpu.arch.nmi_injected = false;

	vmx->vcpu.arch.nmi_injected = false;
@@ -4040,8 +4045,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) 
	vcpu->arch.regs_dirty = 0;

	vcpu->arch.regs_dirty = 0;





	vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);

	vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);

	if (vmx->rmode.irq.pending)

		fixup_rmode_irq(vmx);





	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));

	asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));

	vmx->launched = 1;

	vmx->launched = 1;