From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 13 Dec 2007 09:29:21 +0000 (+0000)
Subject: hvm: Fix mistake in timer cleanup.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14616^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d3c70654cff15d02edcac6fa12817618af97f73;p=xen.git

hvm: Fix mistake in timer cleanup.
Spotted by Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c
index 45c9350226..2879a66d55 100644
--- a/xen/arch/x86/hvm/vpt.c
+++ b/xen/arch/x86/hvm/vpt.c
@@ -53,8 +53,8 @@ static int pt_irq_masked(struct periodic_time *pt)
     if ( pt->source == PTSRC_lapic )
     {
         struct vlapic *vlapic = vcpu_vlapic(v);
-        return (vlapic_enabled(vlapic) &&
-                !(vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
+        return (!vlapic_enabled(vlapic) ||
+                (vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_MASKED));
     }
 
     isa_irq = pt->irq;