X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=kitten%2Finit%2Fmain.c;h=cf8ada0c8daef9b12fe29ea5de408c9c26e4b725;hb=07c81e9a7c58c1b7f4adce4e3db04d5aa65993d6;hp=790ef1ed0e5fc0cfbe7bfb72f75f268038282393;hpb=160530e310bb5ea55b2a248e23ff38abf7bb5f47;p=palacios.git

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 790ef1e..cf8ada0 100644
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -13,6 +13,8 @@
 #include <lwk/sched.h>
 #include <lwk/timer.h>
 
+#include <palacios/vmm.h>
+
 /**
  * Pristine copy of the LWK boot command line.
  */
@@ -116,19 +118,25 @@ start_kernel()
 			panic("Failed to boot CPU %d.\n", cpu);
 	}
 
-#ifdef CONFIG_V3VEE
-	/*
-	 * Start up the V3Vee subsystem
-	 */
-	Init_V3( 0, 0 );
-#else
+        {
+  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);
+        }
+
 	/*
 	 * Start up user-space...
 	 */
 	printk(KERN_INFO "Loading initial user-level task (init_task)...\n");
 	if ((status = create_init_task()) != 0)
 		panic("Failed to create init_task (status=%d).", status);
-#endif
 
 	schedule();  /* This should not return */
 	BUG();