diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2007-12-12 10:40:02 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2007-12-12 10:40:02 +0000 |
| commit | ba25075759a192b3ec87ece653801af25f2ebee1 (patch) | |
| tree | 8970b2646d2701bbfb6a31297199285b70d78d61 | |
| parent | aa54a5e57e80bbe5a77e2413f1a6b08767488eb9 (diff) | |
| download | xen-ba25075759a192b3ec87ece653801af25f2ebee1.tar.gz xen-ba25075759a192b3ec87ece653801af25f2ebee1.tar.bz2 xen-ba25075759a192b3ec87ece653801af25f2ebee1.zip | |
hvm: Fix is_isa_irq_masked().
Incorrectly it was not checking whether the vlapic is masking the pic.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
| -rw-r--r-- | xen/arch/x86/hvm/irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index de21d0f357..0d737f9eed 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -362,12 +362,13 @@ int get_isa_irq_vector(struct vcpu *v, int isa_irq, enum hvm_intsrc src) int is_isa_irq_masked(struct vcpu *v, int isa_irq) { unsigned int gsi = hvm_isa_irq_to_gsi(isa_irq); + uint8_t pic_imr; if ( is_lvtt(v, isa_irq) ) return !is_lvtt_enabled(v); - return ((v->domain->arch.hvm_domain.vpic[isa_irq >> 3].imr & - (1 << (isa_irq & 7))) && + pic_imr = v->domain->arch.hvm_domain.vpic[isa_irq >> 3].imr; + return (((pic_imr & (1 << (isa_irq & 7))) || !vlapic_accept_pic_intr(v)) && domain_vioapic(v->domain)->redirtbl[gsi].fields.mask); } |