diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-10 16:49:05 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-10 16:49:05 +0000 |
| commit | d3361c48d3111565596690f638d113e7cf3df198 (patch) | |
| tree | 79399a29817deabc227a5b3006db1b7c1408b7d5 /xen/arch/x86/hvm/vlapic.c | |
| parent | 4000f53bc2751cca1a9bb868ab4b482cd28c8dc5 (diff) | |
| download | xen-d3361c48d3111565596690f638d113e7cf3df198.tar.gz xen-d3361c48d3111565596690f638d113e7cf3df198.tar.bz2 xen-d3361c48d3111565596690f638d113e7cf3df198.zip | |
hvm vlapic: Fix tmcct read logic when in periodic mode.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/hvm/vlapic.c')
| -rw-r--r-- | xen/arch/x86/hvm/vlapic.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index cf0ee21081..84dd4d24a5 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -435,12 +435,19 @@ int vlapic_ipi( static uint32_t vlapic_get_tmcct(struct vlapic *vlapic) { struct vcpu *v = current; - uint32_t tmcct, tmict = vlapic_get_reg(vlapic, APIC_TMICT); + uint32_t tmcct = 0, tmict = vlapic_get_reg(vlapic, APIC_TMICT); uint64_t counter_passed; counter_passed = ((hvm_get_guest_time(v) - vlapic->timer_last_update) - / APIC_BUS_CYCLE_NS / vlapic->hw.timer_divisor); - tmcct = (counter_passed < tmict) ? tmict - counter_passed : 0; + / (APIC_BUS_CYCLE_NS * vlapic->hw.timer_divisor)); + + if ( tmict != 0 ) + { + if ( vlapic_lvtt_period(vlapic) ) + counter_passed %= tmict; + if ( counter_passed < tmict ) + tmcct = tmict - counter_passed; + } HVM_DBG_LOG(DBG_LEVEL_VLAPIC_TIMER, "timer initial count %d, timer current count %d, " |