summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-07-22 12:54:21 +0300
committerAvi Kivity <avi@redhat.com>2010-10-24 10:52:51 +0200
commit537b37e2674b7e4390a490e03cae53ca9ca99e30 (patch)
treec69f89afe9ba789af5bb53530fe6f5255f5aa939 /arch
parent51aa01d13d4a64422cf8095205fc4a02322aca2c (diff)
downloadlinux-537b37e2674b7e4390a490e03cae53ca9ca99e30.tar.gz
linux-537b37e2674b7e4390a490e03cae53ca9ca99e30.tar.bz2
linux-537b37e2674b7e4390a490e03cae53ca9ca99e30.zip
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: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 927d8404505a..541f0d2412b4 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -182,6 +182,7 @@ static int init_rmode(struct kvm *kvm);
static u64 construct_eptp(unsigned long root_hpa);
static void kvm_cpu_vmxon(u64 addr);
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 *, 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)
{
- u32 idt_vectoring_info = vmx->idt_vectoring_info;
+ u32 idt_vectoring_info;
u8 vector;
int type;
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;
vmx->vcpu.arch.nmi_injected = false;
@@ -4040,8 +4045,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
vcpu->arch.regs_dirty = 0;
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));
vmx->launched = 1;