X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=329fce63d96b0b42575b084dff770c95fa98d421;hb=382829fe58cb541af371547325c5502e37032ecd;hp=9f1c432138a38dda5cfa14f96ad49f43ddc90698;hpb=a405b0fca40b6215154e1ccb36a14fb5e7e767d4;p=palacios.git diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h index 9f1c432..329fce6 100644 --- a/palacios/include/palacios/vmm_time.h +++ b/palacios/include/palacios/vmm_time.h @@ -7,11 +7,13 @@ * and the University of New Mexico. You can find out more at * http://www.v3vee.org * + * Copyright (c) 2010, Patrick Bridges * Copyright (c) 2008, Jack Lange * Copyright (c) 2008, The V3VEE Project * All rights reserved. * * Author: Jack Lange + * Patrick Bridges * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "V3VEE_LICENSE". @@ -32,15 +34,16 @@ struct guest_info; struct vm_time { uint32_t host_cpu_freq; // in kHZ uint32_t guest_cpu_freq; // can be lower than host CPU freq! - + sint64_t guest_host_offset;// Offset of monotonic guest time from host time sint64_t tsc_guest_offset; // Offset of guest TSC from monotonic guest time - + uint64_t last_update; // Last time (in monotonic guest time) the // timers were updated uint64_t initial_time; // 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 struct v3_msr tsc_aux; // Auxilliary MSR for RDTSCP // Installed Timers slaved off of the guest monotonic TSC @@ -67,9 +70,13 @@ int v3_init_time_vm(struct v3_vm_info * vm); void v3_deinit_time_core(struct guest_info * core); 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_offset_time(struct guest_info * core, sint64_t offset); // 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); @@ -85,7 +92,12 @@ static inline uint64_t v3_get_host_time(struct vm_time *t) { // Returns *monotonic* guest time. static inline uint64_t v3_get_guest_time(struct vm_time *t) { +#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 } // Returns the TSC value seen by the guest