X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=d254a7f2d7954d7a751d230596023a01937bc8a1;hb=de6084de2145f3889a16d8498e5e7d44e96e0162;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..d254a7f 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -1,6 +1,26 @@
+/*
+ * 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
 
+#ifdef __V3VEE__
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
@@ -8,45 +28,49 @@
 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
+    ullong_t guest_tsc;
 
-  // Cache value to help calculate the guest_tsc
-  ullong_t cached_host_tsc;
+    // Cache value to help calculate the guest_tsc
+    ullong_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)(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_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;
 };
 
 
-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);
+
+
+void v3_init_time(struct guest_info * info);
+
+#endif // !__V3VEE__
 
 #endif