Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten

[palacios-OLD.git] / kitten / init / main.c

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 49a2c04..16369d3 100644 (file)
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -12,6 +12,7 @@
 #include <lwk/task.h>
 #include <lwk/sched.h>
 #include <lwk/timer.h>
+#include <lwk/palacios.h>
 
 /**
  * Pristine copy of the LWK boot command line.
@@ -116,6 +117,9 @@ start_kernel()
                        panic("Failed to boot CPU %d.\n", cpu);
        }
 
+#ifdef CONFIG_V3VEE
+       RunVMM();
+#else
        /*
         * Start up user-space...
         */
@@ -124,5 +128,6 @@ start_kernel()
                panic("Failed to create init_task (status=%d).", status);
 
        schedule();  /* This should not return */
+#endif
        BUG();
 }