X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_halt.c;h=5316edc965437f1aa6edcde1c5b701f4430139c1;hb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;hp=2f5157b1ef28b06aeccf3fe6c5d8007d71cc07a1;hpb=101529b6eae500272347287df43ec51aa003d0aa;p=palacios.git

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 2f5157b..5316edc 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -1,19 +1,44 @@
-/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Peter Dinda <pdinda@northwestern.edu>
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Peter Dinda <pdinda@northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+
+
+
 
 
 #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);
@@ -32,7 +57,7 @@ int handle_svm_halt(struct guest_info * info)
     PrintDebug("GeekOS Yield\n");
     
     rdtscll(yield_start);
-    Yield();
+    V3_Yield();
     rdtscll(yield_stop);