ia64/xen-unstable

changeset 16705:e4fd457a3dd5

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>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Jan 11 10:53:44 2008 +0000 (2008-01-11)
parents 56b42d68518e
children f2b4779623d2
files xen/arch/x86/hvm/svm/intr.c xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/vmx/intr.c xen/arch/x86/hvm/vmx/vmx.c
line diff
     1.1 --- a/xen/arch/x86/hvm/svm/intr.c	Thu Jan 10 22:53:43 2008 +0000
     1.2 +++ b/xen/arch/x86/hvm/svm/intr.c	Fri Jan 11 10:53:44 2008 +0000
     1.3 @@ -102,7 +102,6 @@ asmlinkage void svm_intr_assist(void)
     1.4  
     1.5      /* Crank the handle on interrupt state. */
     1.6      pt_update_irq(v);
     1.7 -    hvm_maybe_deassert_evtchn_irq();
     1.8  
     1.9      do {
    1.10          intack = hvm_vcpu_has_pending_irq(v);
     2.1 --- a/xen/arch/x86/hvm/svm/svm.c	Thu Jan 10 22:53:43 2008 +0000
     2.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Fri Jan 11 10:53:44 2008 +0000
     2.3 @@ -2023,6 +2023,8 @@ asmlinkage void svm_vmexit_handler(struc
     2.4  
     2.5      perfc_incra(svmexits, exit_reason);
     2.6  
     2.7 +    hvm_maybe_deassert_evtchn_irq();
     2.8 +
     2.9      /* Event delivery caused this intercept? Queue for redelivery. */
    2.10      eventinj = vmcb->exitintinfo;
    2.11      if ( unlikely(eventinj.fields.v) &&
     3.1 --- a/xen/arch/x86/hvm/vmx/intr.c	Thu Jan 10 22:53:43 2008 +0000
     3.2 +++ b/xen/arch/x86/hvm/vmx/intr.c	Fri Jan 11 10:53:44 2008 +0000
     3.3 @@ -157,7 +157,6 @@ asmlinkage void vmx_intr_assist(void)
     3.4      /* Crank the handle on interrupt state. */
     3.5      pt_update_irq(v);
     3.6      vmx_dirq_assist(v);
     3.7 -    hvm_maybe_deassert_evtchn_irq();
     3.8  
     3.9      do {
    3.10          intack = hvm_vcpu_has_pending_irq(v);
     4.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Thu Jan 10 22:53:43 2008 +0000
     4.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Fri Jan 11 10:53:44 2008 +0000
     4.3 @@ -2741,6 +2741,8 @@ asmlinkage void vmx_vmexit_handler(struc
     4.4      if ( unlikely(exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) )
     4.5          return vmx_failed_vmentry(exit_reason, regs);
     4.6  
     4.7 +    hvm_maybe_deassert_evtchn_irq();
     4.8 +
     4.9      /* Event delivery caused this intercept? Queue for redelivery. */
    4.10      idtv_info = __vmread(IDT_VECTORING_INFO);
    4.11      if ( unlikely(idtv_info & INTR_INFO_VALID_MASK) &&