X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=kitten%2Finit%2Fmain.c;h=9b8c086ef6fb88588344c6341f7f468ea8a37505;hb=165560d91368d638b177022f883d3723d7618944;hp=953c4563a23ce486a0bfd2280ff249d85e93413d;hpb=1bb5fea153e1c481b48a5e657a517f80db98d066;p=palacios.git

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 953c456..9b8c086 100644
--- 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.
@@ -31,7 +32,6 @@ start_kernel()
 {
 	unsigned int cpu;
 	unsigned int timeout;
-	int status;
 
 	/*
  	 * Parse the kernel boot command line.
@@ -116,31 +116,20 @@ 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();
+	printk( "%s: VMM returned.  We're spinning\n", __func__ );
+	while(1) { asm( "hlt" ); }
+#else
 	/*
 	 * Start up user-space...
 	 */
 	printk(KERN_INFO "Loading initial user-level task (init_task)...\n");
+	int status;
 	if ((status = create_init_task()) != 0)
 		panic("Failed to create init_task (status=%d).", status);
 
 	schedule();  /* This should not return */
 	BUG();
+#endif
 }