type fix

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 48df285..ff5a55c 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -100,9 +100,10 @@ static void deinit_cpu(void * arg) {
 }
 
 
-
-void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
-    int i;
+void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus) {
+    int i = 0;
+    int minor = 0;
+    int major = 0;
 
     V3_Print("V3 Print statement to fix a Kitten page fault bug\n");
 
@@ -134,26 +135,26 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     V3_init_checkpoint();
 #endif
 
-
-
-
     if ((hooks) && (hooks->call_on_cpu)) {
-       for (i = 0; i < num_cpus; i++) {
 
-           V3_Print("Initializing VMM extensions on cpu %d\n", i);
-           hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
+        for (i = 0; i < num_cpus; i++) {
+            major = i / 8;
+            minor = i % 8;
 
-           if (v3_mach_type == V3_INVALID_CPU) {
-               v3_mach_type = v3_cpu_types[i];
-           }
+            if ((cpu_mask == NULL) || (*(cpu_mask + major) & (0x1 << minor))) {
+                V3_Print("Initializing VMM extensions on cpu %d\n", i);
+                hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
 
-       }
+               if (v3_mach_type == V3_INVALID_CPU) {
+                   v3_mach_type = v3_cpu_types[i];
+               }   
+            }
+        }
     }
-
-
 }
 
 
+
 void Shutdown_V3() {
     int i;
 
@@ -452,6 +453,11 @@ int v3_stop_vm(struct v3_vm_info * vm) {
 
     vm->run_state = VM_STOPPED;
 
+    // Sanity check to catch any weird execution states
+    if (v3_wait_for_barrier(vm, NULL) == 0) {
+       v3_lower_barrier(vm);
+    }
+    
     // XXX force exit all cores via a cross call/IPI XXX
 
     while (1) {
@@ -693,7 +699,7 @@ void v3_yield_cond(struct guest_info * info) {
        //         (void *)info->yield_cycle_period);
        
        V3_Yield();
-       info->yield_start_cycle = v3_get_host_time(&info->time_state);
+        info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
     }
 }
 
@@ -707,7 +713,7 @@ void v3_yield(struct guest_info * info) {
     V3_Yield();
 
     if (info) {
-       info->yield_start_cycle = v3_get_host_time(&info->time_state);
+        info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
     }
 }