X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=1bd489b3bad1321b059858c73fc981b950bc5dda;hb=4d17b20a86eb8102a287263372458fcb9019c232;hp=cef9ff56a94e3625434ce02044900c3f4ce6ba6d;hpb=a2b48dd0c4f8ccfa633139bc2b9aa4ddf59eda5c;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index cef9ff5..1bd489b 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -679,13 +679,6 @@ v3_cpu_mode_t v3_get_host_cpu_mode() {
 #endif 
 
 
-#define V3_Yield(addr)					\
-    do {						\
-	extern struct v3_os_hooks * os_hooks;		\
-	if ((os_hooks) && (os_hooks)->yield_cpu) {	\
-	    (os_hooks)->yield_cpu();			\
-	}						\
-    } while (0)						\
 
 
 
@@ -698,8 +691,8 @@ void v3_yield_cond(struct guest_info * info) {
 	//           (void *)cur_cycle, (void *)info->yield_start_cycle, 
 	//	   (void *)info->yield_cycle_period);
 	
-	info->yield_start_cycle += info->vm_info->yield_cycle_period;
 	V3_Yield();
+        info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
     }
 }
 
@@ -713,11 +706,23 @@ void v3_yield(struct guest_info * info) {
     V3_Yield();
 
     if (info) {
-	info->yield_start_cycle = v3_get_host_time(&info->time_state);
+        info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
     }
 }
 
 
+/*
+ * unconditional cpu yield for a period of time
+ * Otherwise identical to v3_yield
+ */
+void v3_yield_timed(struct guest_info *info, unsigned int usec)
+{
+    V3_Yield_Timed(usec);
+    
+    if (info) { 
+	info->yield_start_cycle += info->vm_info->yield_cycle_period;
+    }
+}
 
 
 void v3_print_cond(const char * fmt, ...) {