X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=9293329f7bae6a93bb6f60d87d7aa27332793e9b;hb=a20c07e3428f9aa55997befebca7a30721a71145;hp=1e3c7fded4dc0fc8776532dfcca54c1073c1da74;hpb=c445b653bb1fe979e7146fb6b15923bc99277784;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 1e3c7fd..9293329 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -31,33 +31,45 @@
 
 struct guest_info;
 
+
 /* Per-VM time information */
 struct v3_time {
-    uint32_t td_mult; 
+    int flags;
+    uint32_t td_num, td_denom; 
 };
+#define V3_TIME_SLAVE_HOST (1 << 0)
+#define V3_TIME_TSC_PASSTHROUGH (1 << 1)
 
 /* Per-core time information */
 struct vm_core_time {
     uint32_t host_cpu_freq;    // in kHZ 
     uint32_t guest_cpu_freq;   // can be lower than host CPU freq!
 
+    // Multipliers for TSC speed and performance speed
+    uint32_t clock_ratio_num, clock_ratio_denom;
+    uint32_t ipc_ratio_num, ipc_ratio_denom;
+
     uint64_t guest_cycles;
     sint64_t tsc_guest_offset; // Offset of guest TSC from guest cycles
 
     uint64_t last_update;      // Last time (in guest cycles) the 
                                // timers were updated
 
-    uint64_t initial_time;     // Host time when VMM started. 
-    uint64_t enter_time;       // Host time the guest was last entered
-    uint64_t exit_time;        // Host time the the VM was exited to
+    uint64_t initial_host_time;// Host time when VMM started. 
     struct v3_msr tsc_aux;     // Auxilliary MSR for RDTSCP
 
+    int flags;
+	
     // Installed Timers slaved off of the guest monotonic TSC
     uint_t num_timers;
     struct list_head timers;
 
 };
 
+#define VM_TIME_SLAVE_HOST (1 << 0)
+#define VM_TIME_TSC_PASSTHROUGH (1 << 1)
+#define VM_TIME_TRAP_RDTSC (1 << 2)
+
 struct v3_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);
@@ -83,14 +95,7 @@ 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, uint64_t * guest_cycles);
-
-int v3_pause_time(struct guest_info * core);
-int v3_resume_time(struct guest_info * core);
-int v3_offset_time(struct guest_info * core, sint64_t offset);
-
-int v3_adjust_time(struct guest_info * core);
+int v3_advance_time(struct guest_info * core, uint64_t * guest_cycles);
 
 // Basic functions for attaching timers to the passage of time - these timers 
 // should eventually specify their accuracy and resolution.
@@ -117,7 +122,7 @@ static inline uint64_t v3_get_guest_tsc(struct vm_core_time *t) {
 // Returns offset of guest TSC from host TSC
 static inline sint64_t v3_tsc_host_offset(struct vm_core_time *time_state) {
     uint64_t host_time = v3_get_host_time(time_state);
-    return ((sint64_t)host_time - (sint64_t)time_state->guest_cycles) + time_state->tsc_guest_offset;
+    return (sint64_t)v3_get_guest_tsc(time_state) - (sint64_t)host_time;
 }
 
 // Functions for handling exits on the TSC when fully virtualizing