[Xen-changelog] [xen-unstable] hvm: Fix mistake in timer cleanup.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197538161 0
# Node ID 2ebced8f8bafe196b5c6e7097d98d77e93e254af
# Parent  4553bc1087d9f73e5c27f5511c1d4c724b4dbccf
hvm: Fix mistake in timer cleanup.
Spotted by Dexuan Cui <dexuan.cui@xxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/vpt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 4553bc1087d9 -r 2ebced8f8baf xen/arch/x86/hvm/vpt.c
--- a/xen/arch/x86/hvm/vpt.c    Wed Dec 12 15:41:20 2007 +0000
+++ b/xen/arch/x86/hvm/vpt.c    Thu Dec 13 09:29:21 2007 +0000
@@ -53,8 +53,8 @@ static int pt_irq_masked(struct periodic
     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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog