X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=a2faab0dcf64dcf118a2db4bb6c5bad31b22f6bd;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=2411187bd2f266ee578ad35c7b1145de0d5bead3;hpb=d8fc6aa4bc2a5d9cec50923e9d2bd30f867dd50a;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 2411187..a2faab0 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -1,3 +1,6 @@
+/* Northwestern University */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+
 #ifndef __VMM_TIME_H
 #define __VMM_TIME_H
 
@@ -17,7 +20,7 @@ struct vm_time {
   ullong_t cached_host_tsc;
 
   // The number of cycles pending for notification to the timers
-  ullong_t pending_cycles;
+  //ullong_t pending_cycles;
 
   // Installed Timers 
   uint_t num_timers;
@@ -25,6 +28,8 @@ struct vm_time {
 };
 
 
+#ifdef __V3VEE__
+
 struct vm_timer_ops {
  void (*update_time)(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
 
@@ -32,21 +37,25 @@ struct vm_timer_ops {
 
 struct vm_timer {
   void * private_data;
-  struct vm_timer_ops ops;
+  struct vm_timer_ops * ops;
 
   struct list_head timer_link;
 };
 
 
-void v3_init_time(struct vm_time * time_state);
-
-
 
 
 int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops, void * private_data);
 int v3_remove_timer(struct guest_info * info, struct vm_timer * timer);
 
 
-void v3_update_timers(struct guest_info * info);
+void v3_update_time(struct guest_info * info, ullong_t cycles);
+
+#endif // !__V3VEE__
+
+
+void v3_init_time(struct guest_info * info);
+
+
 
 #endif