aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/hvm/vpt.c
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-12-13 09:29:21 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-12-13 09:29:21 +0000
commit5d3c70654cff15d02edcac6fa12817618af97f73 (patch)
treeaa75b8fab3c284250054c6e108b596f66e7ab74f /xen/arch/x86/hvm/vpt.c
parent77f9359c57fc54bdf92bb35294de573f78814166 (diff)
downloadxen-5d3c70654cff15d02edcac6fa12817618af97f73.tar.gz
xen-5d3c70654cff15d02edcac6fa12817618af97f73.tar.bz2
xen-5d3c70654cff15d02edcac6fa12817618af97f73.zip
hvm: Fix mistake in timer cleanup.
Spotted by Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/hvm/vpt.c')
-rw-r--r--xen/arch/x86/hvm/vpt.c4
1 files changed, 2 insertions, 2 deletions
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;