X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_halt.c;h=a8bf0b982ac28daa2db406b6dad29888e13c5cd7;hb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;hp=0975cc3643aa4aeb6988d50370d3f69715f93149;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 0975cc3..a8bf0b9 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -18,53 +18,59 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
+#include <palacios/svm_halt.h>
+#include <palacios/vmm_intr.h>
 
 
+#ifndef CONFIG_DEBUG_HALT
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
 
 
-#include <palacios/svm_halt.h>
-#include <palacios/vmm_intr.h>
-// From GeekOS
-void Yield(void);
-
-
 //
-// This should trigger a #GP if cpl!=0, otherwise, yield to host
+// This should trigger a #GP if cpl != 0, otherwise, yield to host
 //
 
-int handle_svm_halt(struct guest_info * info)
-{
-  if (info->cpl!=0) { 
-    v3_raise_exception(info, GPF_EXCEPTION);
-  } else {
-    
-    // What we should do is starting waiting on an OS event that will
-    // result in an injection of an interrupt.
-    
-    // What we will hackishly do instead is resume on any event
-    // Plus is this totally GeekOS specific
-    
-    ullong_t yield_start = 0;
-    ullong_t yield_stop = 0;
-    uint32_t gap = 0;
-    
-    PrintDebug("GeekOS Yield\n");
-    
-    rdtscll(yield_start);
-    Yield();
-    rdtscll(yield_stop);
-    
-    
-    //v3_update_time(info, yield_stop - yield_start);
-    gap = yield_stop - yield_start;
-    v3_raise_irq(info, 0);
+int v3_handle_svm_halt(struct guest_info * info) {
+
+    if (info->cpl != 0) { 
+	v3_raise_exception(info, GPF_EXCEPTION);
+    } else {
     
-    PrintDebug("GeekOS Yield Done (%d cycles)\n", gap);
+	uint64_t yield_start = 0;
+	uint64_t yield_stop = 0;
+	uint32_t gap = 0;
+	
+	PrintDebug("CPU Yield\n");
+	
+	rdtscll(yield_start);
+	v3_yield(info);
+	rdtscll(yield_stop);
     
-    info->rip+=1;
-  }
     
-  return 0;
+	//v3_update_time(info, yield_stop - yield_start);
+	gap = yield_stop - yield_start;
+
+	/*  WARNING!!! WARNING!!!
+	 *  
+	 * DO NOT REMOVE THIS CONDITIONAL!!!
+	 *
+	 * It is common for an OS to issue an IO op, and then sit in a halt loop
+	 * waiting for the device to complete and raise an irq.
+	 * If you remove this then the timer interrupt will ALWAYS subvert the completion 
+	 * interrupt and stall the guest.
+	 */
+	if (!v3_intr_pending(info)) {
+	    v3_raise_irq(info, 0);
+	}
+
+	
+	PrintDebug("CPU Yield Done (%d cycles)\n", gap);
+	
+	info->rip+=1;
+    }
 
+    return 0;
 }