Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / palacios / src / palacios / vmm.c

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 9e53b34..de6ee04 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -269,16 +269,29 @@ int v3_stop_vm(struct v3_vm_info * vm) {
 
     vm->run_state = VM_STOPPED;
 
-    while (vm->cores[0].core_run_state != CORE_STOPPED) {
-       v3_yield(NULL);
-    }
+    // force exit all cores via a cross call/IPI
 
 
-    // force exit all cores via a cross call/IPI
+    while (1) {
+       int i = 0;
+       int still_running = 0;
+
+       for (i = 0; i < vm->num_cores; i++) {
+           if (vm->cores[i].core_run_state != CORE_STOPPED) {
+               still_running = 1;
+           }
+       }
 
-    // Wait for all cores to enter CORE_STOPPED state
+       if (still_running == 0) {
+           break;
+       }
 
+       V3_Print("Yielding\n");
 
+       v3_yield(NULL);
+    }
+    
+    V3_Print("VM stopped. Returning\n");
 
     return 0;
 }