Fix to the HLT exit handler

[palacios.git] / palacios / include / palacios / vmm_time.h

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index be23fb2..d805db9 100644 (file)
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -36,6 +36,13 @@ struct vm_time {
     // Cache value to help calculate the guest_tsc
     ullong_t cached_host_tsc;
 
+       
+    /* The total num of numcycles spent in the halt handler 
+         that the halt handler has already updated to the 
+         timer infrastructure about.   That is, "update_time" has been
+     */
+    ullong_t cached_hlt_tsc;
+
     // The number of cycles pending for notification to the timers
     //ullong_t pending_cycles;
 
@@ -49,7 +56,7 @@ struct vm_time {
 
 struct vm_timer_ops {
     void (*update_time)(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
-    void (*advance_timer)(struct guest_info * info);
+    void (*advance_timer)(struct guest_info * info, void * private_data);
 };
 
 struct vm_timer {