x86, hvm: Fix 'no_missed_tick_accoutning' timer mode.

From: Haitao Shan <haitao.shan@intel.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 05fc461ca79efeb54012f147b2e4060f2441fc92..42dd16c72ff62e126bf0d04cc06a497b53e195e5 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1849,7 +1849,8 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg)
             case HVM_PARAM_TIMER_MODE:
                 rc = -EINVAL;
                 if ( (a.value != HVMPTM_delay_for_missed_ticks) &&
-                     (a.value != HVMPTM_no_delay_for_missed_ticks) )
+                     (a.value != HVMPTM_no_delay_for_missed_ticks) &&
+                     (a.value != HVMPTM_no_missed_tick_accounting) )
                     goto param_fail;
                 break;
             }

diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c
index 605a5722833083f5c5b1c8e955399e6ee6c898c4..75f64b26b90cccb3fb4aaf7fa9d7863edc355201 100644 (file)
--- a/xen/arch/x86/hvm/vpt.c
+++ b/xen/arch/x86/hvm/vpt.c
@@ -118,7 +118,14 @@ void pt_restore_timer(struct vcpu *v)
     list_for_each_entry ( pt, head, list )
     {
         if ( !mode_is(v->domain, no_missed_tick_accounting) )
+        {
             pt_process_missed_ticks(pt);
+        }
+        else if ( (NOW() - pt->scheduled) >= 0 )
+        {
+            pt->pending_intr_nr++;
+            pt->scheduled = NOW() + pt->period;
+        }
         set_timer(&pt->timer, pt->scheduled);
     }
 
@@ -139,14 +146,7 @@ static void pt_timer_fn(void *data)
     {
         pt->scheduled += pt->period;
         if ( !mode_is(pt->vcpu->domain, no_missed_tick_accounting) )
-        {
             pt_process_missed_ticks(pt);
-        }
-        else if ( (NOW() - pt->scheduled) >= 0 )
-        {
-            pt->pending_intr_nr++;
-            pt->scheduled = NOW() + pt->period;
-        }
         set_timer(&pt->timer, pt->scheduled);
     }