From: Trammell Hudson <thudson@newskysaw.eecs.northwestern.edu>
Date: Wed, 22 Oct 2008 16:10:42 +0000 (-0500)
Subject: Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
X-Git-Tag: 1.0^2~4^2~8
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b9ac4d8eebc50949193bff288623e07be22a283;hp=8c767ddb04d3ac42d080d9f9f5f40196d6f8f217;p=palacios.git

Merge branch 'kitten' of ssh://sharedev@localhost/home/sharedev/palacios into kitten
---

diff --git a/kitten/init/main.c b/kitten/init/main.c
index 070f67c..9b8c086 100644
--- a/kitten/init/main.c
+++ b/kitten/init/main.c
@@ -118,6 +118,8 @@ start_kernel()
 
 #ifdef CONFIG_V3VEE
 	v3vee_run_vmm();
+	printk( "%s: VMM returned.  We're spinning\n", __func__ );
+	while(1) { asm( "hlt" ); }
 #else
 	/*
 	 * Start up user-space...
@@ -128,6 +130,6 @@ start_kernel()
 		panic("Failed to create init_task (status=%d).", status);
 
 	schedule();  /* This should not return */
-#endif
 	BUG();
+#endif
 }
diff --git a/kitten/kernel/printk.c b/kitten/kernel/printk.c
index b410ec6..772c872 100644
--- a/kitten/kernel/printk.c
+++ b/kitten/kernel/printk.c
@@ -15,6 +15,9 @@ int printk(const char *fmt, ...)
 }
 
 
+int printk_print_cpu_number;
+
+
 int
 vprintk(
 	const char *		fmt,
@@ -30,9 +33,12 @@ vprintk(
 	*p = '\0';
 
 	/* Tack on the logical CPU ID */
-	len = sprintf(p, "[%u]:", this_cpu);
-	p      += len;
-	remain -= len;
+	if( printk_print_cpu_number )
+	{
+		len = sprintf(p, "[%u]:", this_cpu);
+		p      += len;
+		remain -= len;
+	}
 
 	/* Construct the string... */
 	len = vscnprintf(p, remain, fmt, args);
diff --git a/kitten/palacios-glue/vmm_stubs.c b/kitten/palacios-glue/vmm_stubs.c
index 0721a1e..bf41dd9 100644
--- a/kitten/palacios-glue/vmm_stubs.c
+++ b/kitten/palacios-glue/vmm_stubs.c
@@ -228,7 +228,7 @@ v3vee_printk(
 
 
 struct v3_os_hooks v3vee_os_hooks = {
-	.print_debug		= 0, // printk,  // serial print ideally
+	.print_debug		= v3vee_printk,  // serial print ideally
 	.print_info		= v3vee_printk,   // serial print ideally
 	.print_trace		= v3vee_printk,  // serial print ideally
 	.allocate_pages		= Allocate_VMM_Pages, // defined in vmm_stubs