Merged changes and added CONFIG_V3VEE wrappers

diff --cc kitten/init/main.c
index 790ef1e,953c456..49a2c04
--- 1/kitten/init/main.c
--- 2/kitten/init/main.c
+++ b/kitten/init/main.c
@@@ -116,12 -116,24 +116,6 @@@ 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...
         */