Implemented (but not yet tested) time interface changes for consistency

[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 a2faab0..3f1ad95 100644 (file)
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -1,9 +1,26 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/*
+ * 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>
@@ -11,35 +28,35 @@
 struct guest_info;
 
 struct vm_time {
-  uint32_t cpu_freq; // in kHZ
-
-  // Total number of guest run time cycles
-  ullong_t guest_tsc;
+    uint32_t cpu_freq; // in kHZ
 
-  // Cache value to help calculate the guest_tsc
-  ullong_t cached_host_tsc;
+    // Last time (in guest time) the timers were updated
+    uint64_t last_update;
+    
+    // Cache value to help calculate the guest_tsc
+    uint64_t pause_time;
 
-  // The number of cycles pending for notification to the timers
-  //ullong_t pending_cycles;
+    // Offset of guest time from host time.
+    sint64_t host_offset;
 
-  // Installed Timers 
-  uint_t num_timers;
-  struct list_head timers;
+    // Installed Timers 
+    uint_t num_timers;
+    struct list_head timers;
 };
 
 
-#ifdef __V3VEE__
 
-struct vm_timer_ops {
- void (*update_time)(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
 
+struct vm_timer_ops {
+    void (*update_timer)(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;
 };
 
 
@@ -47,15 +64,15 @@ 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_update_time(struct guest_info * info, ullong_t cycles);
-
-#endif // !__V3VEE__
+void v3_update_timers(struct guest_info * info);
 
 
 void v3_init_time(struct guest_info * info);
-
-
+int v3_start_time(struct guest_info * info);
+int v3_pause_time(struct guest_info * info);
+int v3_resume_time(struct guest_info * info);
+uint64_t v3_get_host_time(struct guest_info * info);
+uint64_t v3_get_guest_time(struct guest_info * info);
+#endif // !__V3VEE__
 
 #endif