Working on debugging time management/apic timer code.

[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 6513e30..33ffa2c 100644 (file)
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -42,7 +42,8 @@ struct vm_time {
                                // timers were updated
 
     uint64_t initial_time;     // Time when VMM started. 
-    uint64_t pause_time;       // Host time when VM entered and paused.
+    uint64_t enter_time;       // Host time the guest was last entered
+    uint64_t exit_time;        // Host time the the VM was exited to
     struct v3_msr tsc_aux;     // Auxilliary MSR for RDTSCP
 
     // Installed Timers slaved off of the guest monotonic TSC
@@ -71,10 +72,11 @@ void v3_deinit_time_vm(struct v3_vm_info * vm);
 
 int v3_start_time(struct guest_info * core);
 
+int v3_time_enter_vm(struct guest_info * core);
+int v3_time_exit_vm(struct guest_info * core);
+
 int v3_adjust_time(struct guest_info * core);
-int v3_pause_time(struct guest_info * core);
 int v3_offset_time(struct guest_info * core, sint64_t offset);
-int v3_restart_time(struct guest_info * core);
 
 // Basic functions for attaching timers to the passage of time
 struct v3_timer * v3_add_timer(struct guest_info * info, struct v3_timer_ops * ops, void * private_data);
@@ -89,17 +91,26 @@ static inline uint64_t v3_get_host_time(struct vm_time *t) {
 }
 
 // Returns *monotonic* guest time.
+static inline uint64_t v3_compute_guest_time(struct vm_time *t, uint64_t ht) {
+#ifdef V3_CONFIG_TIME_HIDE_VM_COST
+    V3_ASSERT(t->exit_time);
+    return t->exit_time + t->guest_host_offset;
+#else
+    return v3_get_host_time(t) + t->guest_host_offset;
+#endif
+}
+
 static inline uint64_t v3_get_guest_time(struct vm_time *t) {
-    if (t->pause_time) {
-        return t->pause_time + t->guest_host_offset;
-    } else {
-        return v3_get_host_time(t) + t->guest_host_offset;
-    }
+    return v3_compute_guest_time(t, v3_get_host_time(t));
 }
 
 // Returns the TSC value seen by the guest
+static inline uint64_t v3_compute_guest_tsc(struct vm_time *t, uint64_t ht) {
+    return v3_compute_guest_time(t, ht) + t->tsc_guest_offset;
+}
+
 static inline uint64_t v3_get_guest_tsc(struct vm_time *t) {
-    return v3_get_guest_time(t) + t->tsc_guest_offset;
+    return v3_compute_guest_tsc(t, v3_get_host_time(t));
 }
 
 // Returns offset of guest TSC from host TSC