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=fea77ba87381e142d1a8f3be682b4862cfa7abb8;hpb=7fdd83a34becb3abf0f2b88e16eb85a106aa9db2;p=palacios.git

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index fea77ba..a8bf0b9 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -22,7 +22,7 @@
 #include <palacios/vmm_intr.h>
 
 
-#ifndef DEBUG_HALT
+#ifndef CONFIG_DEBUG_HALT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -30,35 +30,47 @@
 
 
 //
-// 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 v3_handle_svm_halt(struct guest_info * info)
-{
-    if (info->cpl!=0) { 
+int v3_handle_svm_halt(struct guest_info * info) {
+
+    if (info->cpl != 0) { 
 	v3_raise_exception(info, GPF_EXCEPTION);
     } else {
     
-	ullong_t yield_start = 0;
-	ullong_t yield_stop = 0;
+	uint64_t yield_start = 0;
+	uint64_t yield_stop = 0;
 	uint32_t gap = 0;
 	
 	PrintDebug("CPU Yield\n");
 	
 	rdtscll(yield_start);
-	V3_Yield();
+	v3_yield(info);
 	rdtscll(yield_stop);
     
     
 	//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;
 }