added yield functionality

[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 1a81bb8..16239e8 100644 (file)
--- a/palacios/src/palacios/svm_halt.c
+++ b/palacios/src/palacios/svm_halt.c
@@ -33,18 +33,12 @@
 // This should trigger a #GP if cpl!=0, otherwise, yield to host
 //
 
-int v3_handle_svm_halt(struct guest_info * info)
-{
-    if (info->cpl!=0) { 
+int v3_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;
@@ -52,19 +46,20 @@ int v3_handle_svm_halt(struct guest_info * info)
        PrintDebug("CPU Yield\n");
        
        rdtscll(yield_start);
-       V3_Yield();
+       v3_yield(info);
        rdtscll(yield_stop);
     
     
        //v3_update_time(info, yield_stop - yield_start);
        gap = yield_stop - yield_start;
-       if (!v3_intr_pending(info)) {
-           v3_raise_irq(info, 0);
-       }
+
+       v3_raise_irq(info, 0);
+
        
        PrintDebug("CPU Yield Done (%d cycles)\n", gap);
        
        info->rip+=1;
     }
+
     return 0;
 }