Reflowed some files to conform to Kitten style guide and

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

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 953c456..709a0ab 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,24 +117,9 @@ start_kernel()
                        panic("Failed to boot CPU %d.\n", cpu);
        }
 
-        {
-  struct v3_os_hooks os_hooks;
-  struct v3_ctrl_ops v3_ops;
-  struct guest_info * vm_info = 0;
-  struct v3_vm_config vm_config;
-
-  memset(&os_hooks, 0, sizeof(struct v3_os_hooks));
-  memset(&v3_ops, 0, sizeof(struct v3_ctrl_ops));
-  memset(&vm_config, 0, sizeof(struct v3_vm_config));
-
-
-
-
-  Init_V3(&os_hooks, &v3_ops);
-
-        }
- 
-
+#ifdef CONFIG_V3VEE
+       v3vee_run_vmm();
+#else
        /*
         * Start up user-space...
         */
@@ -142,5 +128,6 @@ start_kernel()
                panic("Failed to create init_task (status=%d).", status);
 
        schedule();  /* This should not return */
+#endif
        BUG();
 }