X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_halt.c;h=9dda4fd3187706645c102e3f63316db542158029;hb=851cedf7660970f7af19bffb63b1ba1d70f77e3e;hp=3c893d3d848149b82144e53165e11d21d8bb426a;hpb=a32563c70ad5a49b3b7fb23f07b13d2c6710c03f;p=palacios.git

diff --git a/palacios/src/palacios/svm_halt.c b/palacios/src/palacios/svm_halt.c
index 3c893d3..9dda4fd 100644
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -4,33 +4,42 @@
 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
-
-  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;
-
+  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;
 
 }