From: Patrick G. Bridges <pgbridg@sandia.gov>
Date: Thu, 26 Aug 2010 20:07:06 +0000 (-0600)
Subject: Minor warning/error prints corrected.
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=ae0d9f72adc43c791ac13037285385fd8bb3c206

Minor warning/error prints corrected.
---

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 0f0b117..c437c63 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -309,7 +309,7 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) {
 #if 1
 
     if (irq_num <= 15) {
-	PrintError("apic %u: core ?: Attempting to raise an invalid interrupt: %d\n", apic->lapic_id.val,irq_num);
+//	PrintError("apic %u: core ?: Attempting to raise an invalid interrupt: %d\n", apic->lapic_id.val,irq_num);
 	return -1;
     }
 
diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 4a33825..a795f58 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -433,7 +433,7 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t fault_addr, uint3
 		return -1;
     }
 
-    PrintDebug("%s: page   [%p,%p) contains address\n", __FUNCTION__, (void *)pg_start, (void *)pg_end);
+    //PrintDebug("%s: page   [%p,%p) contains address\n", __FUNCTION__, (void *)pg_start, (void *)pg_end);
 
     pg_next_reg = v3_get_next_mem_region(core->vm_info, core->cpu_id, pg_start);
 
@@ -444,8 +444,8 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t fault_addr, uint3
 
     if (pg_next_reg->flags.base == 1) {
 	page_size = req_size; // State A
-	PrintDebug("%s: base region [%p,%p) contains page.\n", __FUNCTION__,
-		   (void *)pg_next_reg->guest_start, (void *)pg_next_reg->guest_end);
+	//PrintDebug("%s: base region [%p,%p) contains page.\n", __FUNCTION__,
+	//	   (void *)pg_next_reg->guest_start, (void *)pg_next_reg->guest_end);
     } else {
 #if 0       // State B/C and D optimization
 	if ((pg_next_reg->guest_end >= pg_end) &&
diff --git a/palacios/src/palacios/vmx_assist.c b/palacios/src/palacios/vmx_assist.c
index 4880f45..d836ad2 100644
--- a/palacios/src/palacios/vmx_assist.c
+++ b/palacios/src/palacios/vmx_assist.c
@@ -22,6 +22,11 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vmx.h>
 
+#ifndef CONFIG_DEBUG_VMX
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 static void vmx_save_world_ctx(struct guest_info * info, struct vmx_assist_context * ctx);
 static void vmx_restore_world_ctx(struct guest_info * info, struct vmx_assist_context * ctx);
 
diff --git a/palacios/src/palacios/vmx_ctrl_regs.c b/palacios/src/palacios/vmx_ctrl_regs.c
index eb12760..afa0fb8 100644
--- a/palacios/src/palacios/vmx_ctrl_regs.c
+++ b/palacios/src/palacios/vmx_ctrl_regs.c
@@ -27,6 +27,11 @@
 #include <palacios/vmm_direct_paging.h>
 #include <palacios/vmm_ctrl_regs.h>
 
+#ifndef CONFIG_DEBUG_VMX
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 static v3_reg_t * get_reg_ptr(struct guest_info * info, struct vmx_exit_cr_qual * cr_qual);
 static int handle_mov_to_cr0(struct guest_info * info, v3_reg_t * new_val, struct vmx_exit_info * exit_info);
 static int handle_mov_to_cr3(struct guest_info * info, v3_reg_t * cr3_reg);