From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Tue, 21 Oct 2008 20:15:23 +0000 (-0500)
Subject: Merged changes and added CONFIG_V3VEE wrappers
X-Git-Tag: 1.0^2~34^2
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios-OLD.git;a=commitdiff_plain;h=7235237afb1e85066f6a7dee965128eb5b442640

Merged changes and added CONFIG_V3VEE wrappers
---

7235237afb1e85066f6a7dee965128eb5b442640
diff --cc kitten/init/main.c
index 790ef1e,953c456..49a2c04
--- a/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...
  	 */