X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=25ed9244d921e6bed4c1a1881d224302acf1bb69;hb=c4e343e346404fcc7674dcfa32e588a282be0f86;hp=3cbd2edb08462f6c82bbfe4b5b23ad3bc4930b16;hpb=f4b074d9bf5c28dfd6e5fd616805ade2e9473b01;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 3cbd2ed..25ed924 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -1,5 +1,21 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #ifndef __VMM_TIME_H
 #define __VMM_TIME_H
@@ -12,35 +28,35 @@
 struct guest_info;
 
 struct vm_time {
-  uint32_t cpu_freq; // in kHZ
+    uint32_t cpu_freq; // in kHZ
 
-  // Total number of guest run time cycles
-  ullong_t guest_tsc;
+    // Total number of guest run time cycles
+    uint64_t_t guest_tsc;
 
-  // Cache value to help calculate the guest_tsc
-  ullong_t cached_host_tsc;
+    // Cache value to help calculate the guest_tsc
+    uint64_t_t cached_host_tsc;
 
-  // The number of cycles pending for notification to the timers
-  //ullong_t pending_cycles;
+    // The number of cycles pending for notification to the timers
+    //ullong_t pending_cycles;
 
-  // Installed Timers 
-  uint_t num_timers;
-  struct list_head timers;
+    // Installed Timers 
+    uint_t num_timers;
+    struct list_head timers;
 };
 
 
 
 
 struct vm_timer_ops {
- void (*update_time)(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
-
+    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 * private_data);
 };
 
 struct vm_timer {
-  void * private_data;
-  struct vm_timer_ops * ops;
+    void * private_data;
+    struct vm_timer_ops * ops;
 
-  struct list_head timer_link;
+    struct list_head timer_link;
 };
 
 
@@ -49,14 +65,13 @@ struct vm_timer {
 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_advance_time(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 // !__V3VEE__
 
 #endif