X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_time.c;h=48a15796bcdae939e778ed6c956ad6e03b30dfcc;hb=d962f2be029772be3f21d9bd206ddf2a9f6a1d20;hp=44affe42f5513b2560ca3ae73cda813c7c528fed;hpb=99335f2927daf2c522ecb9ea246fbd68dd2000bb;p=palacios.git

diff --git a/palacios/src/palacios/vmm_time.c b/palacios/src/palacios/vmm_time.c
index 44affe4..48a1579 100644
--- a/palacios/src/palacios/vmm_time.c
+++ b/palacios/src/palacios/vmm_time.c
@@ -122,10 +122,11 @@ int v3_adjust_time(struct guest_info * info) {
     return 0;
 }
 
-int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops, 
-	     void * private_data) {
-    struct vm_timer * timer = NULL;
-    timer = (struct vm_timer *)V3_Malloc(sizeof(struct vm_timer));
+struct v3_timer * v3_add_timer(struct guest_info * info, 
+			       struct v3_timer_ops * ops, 
+			       void * private_data) {
+    struct v3_timer * timer = NULL;
+    timer = (struct v3_timer *)V3_Malloc(sizeof(struct v3_timer));
     V3_ASSERT(timer != NULL);
 
     timer->ops = ops;
@@ -134,10 +135,10 @@ int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops,
     list_add(&(timer->timer_link), &(info->time_state.timers));
     info->time_state.num_timers++;
 
-    return 0;
+    return timer;
 }
 
-int v3_remove_timer(struct guest_info * info, struct vm_timer * timer) {
+int v3_remove_timer(struct guest_info * info, struct v3_timer * timer) {
     list_del(&(timer->timer_link));
     info->time_state.num_timers--;
 
@@ -146,7 +147,7 @@ int v3_remove_timer(struct guest_info * info, struct vm_timer * timer) {
 }
 
 void v3_update_timers(struct guest_info * info) {
-    struct vm_timer * tmp_timer;
+    struct v3_timer * tmp_timer;
     uint64_t old_time = info->time_state.last_update;
     uint64_t cycles;