X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=kitten%2Finit%2Fmain.c;fp=kitten%2Finit%2Fmain.c;h=16369d3ddb75bb4d01b35f001d06501a0a89a88a;hb=3aefb820e651c67fb0654fe1df301c8828dbb35d;hp=34ab6f9566efdfb9c98f4a8649f3e5c8e2ebeff1;hpb=d9c9ebf22b8d633909c7583b64c779b5dc57a80e;p=palacios.git diff --git a/kitten/init/main.c b/kitten/init/main.c index 34ab6f9..16369d3 100644 --- a/kitten/init/main.c +++ b/kitten/init/main.c @@ -118,30 +118,8 @@ start_kernel() } #ifdef CONFIG_V3VEE - { - 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)); - - printk( KERN_INFO "Calling Init_V3\n" ); - Init_V3(&os_hooks, &v3_ops); - printk( KERN_INFO "Rombios: %p @ %lu\n", - &rombios_start, - &rombios_end - &rombios_start - ); - - printk( KERN_INFO "VGA Bios: %p @ %lu\n", - &vgabios_start, - &vgabios_end - &vgabios_start - ); - } -#endif - + RunVMM(); +#else /* * Start up user-space... */ @@ -150,5 +128,6 @@ start_kernel() panic("Failed to create init_task (status=%d).", status); schedule(); /* This should not return */ +#endif BUG(); }