X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_halt.c;h=2f5157b1ef28b06aeccf3fe6c5d8007d71cc07a1;hb=56f8088296ee4116a4811a2f4f843edd80a7748d;hp=299421cffd32076f8a76ac1b4efeb2f6b4852713;hpb=c502aac6baf363d633aca6ec883b05476634e854;p=palacios.releases.git

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 299421c..2f5157b 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -1,25 +1,50 @@
-#include <palacios/svm_halt.h>
+/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 
+#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
+//
+
 int handle_svm_halt(struct guest_info * info)
 {
-  // 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
-
-  PrintDebug("GeekOS Yield\n");
-
-  Yield();
-
-  PrintDebug("GeekOS Yield Done\n");
-
-  info->rip+=1;
-
+  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);
+    
+    PrintDebug("GeekOS Yield Done (%d cycles)\n", gap);
+    
+    info->rip+=1;
+  }
+    
   return 0;
 
 }