Better reporting when vmm exits

[palacios-OLD.git] / kitten / init / main.c

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 16369d3..9b8c086 100644 (file)
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -32,7 +32,6 @@ start_kernel()
 {
        unsigned int cpu;
        unsigned int timeout;
-       int status;
 
        /*
         * Parse the kernel boot command line.
@@ -118,16 +117,19 @@ start_kernel()
        }
 
 #ifdef CONFIG_V3VEE
-       RunVMM();
+       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 */
-#endif
        BUG();
+#endif
 }