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

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 299421c..68261c3 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -1,25 +1,69 @@
-#include <palacios/svm_halt.h>
+/* 
+ * 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".
+ */
 
-// From GeekOS
-void Yield(void);
 
 
-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();
+#include <palacios/svm_halt.h>
+#include <palacios/vmm_intr.h>
 
-  PrintDebug("GeekOS Yield Done\n");
 
-  info->rip+=1;
 
+//
+// 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);
+    V3_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;
 
 }