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

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
diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index bd5deca..95bb586 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -313,7 +313,7 @@ static int start_svm_guest(struct guest_info *info) {
     v3_clgi();
 
 
-    PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
+    //PrintDebug("SVM Entry to rip=%p...\n", (void *)info->rip);
 
     v3_get_msr(0xc0000101, &vm_cr_high, &vm_cr_low);
 
@@ -325,7 +325,7 @@ static int start_svm_guest(struct guest_info *info) {
     rdtscll(tmp_tsc);
 
     v3_set_msr(0xc0000101, vm_cr_high, vm_cr_low);
-    PrintDebug("SVM Returned\n");
+    //PrintDebug("SVM Returned\n");
 
 
 #if PrintDebug
@@ -339,11 +339,11 @@ static int start_svm_guest(struct guest_info *info) {
     v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
     num_exits++;
 
-    PrintDebug("Turning on global interrupts\n");
+    //PrintDebug("Turning on global interrupts\n");
     v3_stgi();
 
 
-    PrintDebug("SVM Exit number %d\n", num_exits);
+    //PrintDebug("SVM Exit number %d\n", num_exits);