Merge branch 'devel'

[palacios.git] / palacios / src / palacios / svm_halt.c

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 0975cc3..5316edc 100644 (file)
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -25,15 +25,20 @@
 
 #include <palacios/svm_halt.h>
 #include <palacios/vmm_intr.h>
-// From GeekOS
-void Yield(void);
+
+
+#ifndef DEBUG_HALT
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 
 //
 // This should trigger a #GP if cpl!=0, otherwise, yield to host
 //
 
-int handle_svm_halt(struct guest_info * info)
+int v3_handle_svm_halt(struct guest_info * info)
 {
   if (info->cpl!=0) { 
     v3_raise_exception(info, GPF_EXCEPTION);
@@ -52,7 +57,7 @@ int handle_svm_halt(struct guest_info * info)
     PrintDebug("GeekOS Yield\n");
     
     rdtscll(yield_start);
-    Yield();
+    V3_Yield();
     rdtscll(yield_stop);