diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-01-11 10:53:44 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-01-11 10:53:44 +0000 |
| commit | 3dffd10d5839c688dbdf7d5806a0a04ab469b476 (patch) | |
| tree | af2fb088d200423eed1362750842a87c38cf4c92 | |
| parent | 0afa7733ef403ce05fb78603ecd46b110830a77f (diff) | |
| download | xen-3dffd10d5839c688dbdf7d5806a0a04ab469b476.tar.gz xen-3dffd10d5839c688dbdf7d5806a0a04ab469b476.tar.bz2 xen-3dffd10d5839c688dbdf7d5806a0a04ab469b476.zip | |
x86 hvm: hvm_maybe_deassert_evtchn_irq() needs to be called early in
vmexit handling, before IO-APIC can be EOIed or unmasked and resample
the fake INTx line.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/arch/x86/hvm/svm/intr.c | 1 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/svm/svm.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/vmx/intr.c | 1 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vmx.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c index 08bc897543..d2ba799a42 100644 --- a/xen/arch/x86/hvm/svm/intr.c +++ b/xen/arch/x86/hvm/svm/intr.c @@ -102,7 +102,6 @@ asmlinkage void svm_intr_assist(void) /* Crank the handle on interrupt state. */ pt_update_irq(v); - hvm_maybe_deassert_evtchn_irq(); do { intack = hvm_vcpu_has_pending_irq(v); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 3b331ffe67..cb4ebdd4d9 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2023,6 +2023,8 @@ asmlinkage void svm_vmexit_handler(struct cpu_user_regs *regs) perfc_incra(svmexits, exit_reason); + hvm_maybe_deassert_evtchn_irq(); + /* Event delivery caused this intercept? Queue for redelivery. */ eventinj = vmcb->exitintinfo; if ( unlikely(eventinj.fields.v) && diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index a4eb205392..da39d85e77 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -157,7 +157,6 @@ asmlinkage void vmx_intr_assist(void) /* Crank the handle on interrupt state. */ pt_update_irq(v); vmx_dirq_assist(v); - hvm_maybe_deassert_evtchn_irq(); do { intack = hvm_vcpu_has_pending_irq(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b414078ab2..3cb137268e 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2741,6 +2741,8 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( unlikely(exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) ) return vmx_failed_vmentry(exit_reason, regs); + hvm_maybe_deassert_evtchn_irq(); + /* Event delivery caused this intercept? Queue for redelivery. */ idtv_info = __vmread(IDT_VECTORING_INFO); if ( unlikely(idtv_info & INTR_INFO_VALID_MASK) && |