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

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 8e45d5b..4ed2473 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -98,7 +98,7 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
 
 
 #ifdef CONFIG_VNET
-    V3_init_vnet();
+    v3_init_vnet();
 #endif
 
     if ((hooks) && (hooks->call_on_cpu)) {
@@ -225,10 +225,23 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
     // Finally launch the BSP on core 0
     sprintf(tname,"core%u",0);
+
+#if CONFIG_LINUX
+    if (vm->num_cores==1) { 
+       start_core(&(vm->cores[0]));
+       return -1;
+    } else {
+       if (!os_hooks->start_thread_on_cpu(0,start_core,&(vm->cores[0]),tname)) { 
+           PrintError("Thread launch failed\n");
+           return -1;
+       }
+    }
+#else
     if (!os_hooks->start_thread_on_cpu(0,start_core,&(vm->cores[0]),tname)) { 
        PrintError("Thread launch failed\n");
        return -1;
     }
+#endif
 
     return 0;