X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_sprintf.c;h=dbc700f63429fa6f3aeb81f45f99ed6d14e97a95;hb=a5d2c00cc461b4a60a1360a2a0bba55cef467bab;hp=c1ca717909dac77765d614c827de9b71fe88b5e2;hpb=051d39a706ccd24493cc3a0a1558a071f5673ab5;p=palacios.git

diff --git a/palacios/src/palacios/vmm_sprintf.c b/palacios/src/palacios/vmm_sprintf.c
index c1ca717..dbc700f 100644
--- a/palacios/src/palacios/vmm_sprintf.c
+++ b/palacios/src/palacios/vmm_sprintf.c
@@ -87,19 +87,18 @@ struct snprintf_arg {
 
 
 
-#if defined(CONFIG_BUILT_IN_STDIO) &&		      \
-    ( defined(CONFIG_BUILT_IN_SPRINTF) ||	      \
-      defined(CONFIG_BUILT_IN_SNPRINTF) ||	      \
-      defined(CONFIG_BUILT_IN_VSPRINTF) ||	      \
-      defined(CONFIG_BUILT_IN_VSNPRINTF) ||	      \
-      defined(CONFIG_BUILT_IN_VSNRPRINTF ))
+#if defined(V3_CONFIG_BUILT_IN_STDIO) &&		      \
+    ( defined(V3_CONFIG_BUILT_IN_SPRINTF) ||	      \
+      defined(V3_CONFIG_BUILT_IN_SNPRINTF) ||	      \
+      defined(V3_CONFIG_BUILT_IN_VSPRINTF) ||	      \
+      defined(V3_CONFIG_BUILT_IN_VSNRPRINTF ))
 
 static char * ksprintn(char * nbuf, uint64_t num, int base, int *len, int upper);
 static void snprintf_func(int ch, void * arg);
 static int kvprintf(char const * fmt, void (*func)(int, void *), void * arg, int radix, va_list ap);
 
 
-#ifdef CONFIG_BUILT_IN_SPRINTF
+#ifdef V3_CONFIG_BUILT_IN_SPRINTF
 /*
  * Scaled down version of sprintf(3).
  */
@@ -116,7 +115,7 @@ int sprintf(char * buf, const char * cfmt, ...) {
 #endif 
 
 
-#ifdef CONFIG_BUILT_IN_VSPRINTF
+#ifdef V3_CONFIG_BUILT_IN_VSPRINTF
 /*
  * Scaled down version of vsprintf(3).
  */
@@ -130,7 +129,7 @@ int vsprintf(char * buf, const char * cfmt, va_list ap) {
 #endif
 
 
-#ifdef CONFIG_BUILT_IN_SNPRINTF
+#ifdef V3_CONFIG_BUILT_IN_SNPRINTF
 /*
  * Scaled down version of snprintf(3).
  */
@@ -146,7 +145,7 @@ int snprintf(char * str, size_t size, const char * format, ...) {
 #endif
 
 
-#ifdef CONFIG_BUILT_IN_VSNPRINTF 
+
 /*
  * Scaled down version of vsnprintf(3).
  */
@@ -162,10 +161,10 @@ int vsnprintf(char * str, size_t size, const char * format, va_list ap) {
     }
     return (retval);
 }
-#endif 
 
 
-#ifdef CONFIG_BUILT_IN_VSNRPRINTF
+
+#ifdef V3_CONFIG_BUILT_IN_VSNRPRINTF
 /*
  * Kernel version which takes radix argument vsnprintf(3).
  */
@@ -553,7 +552,7 @@ number:
 }
 
 
-#endif // CONFIG_BUILT_IN_STDIO
+#endif // V3_CONFIG_BUILT_IN_STDIO
 
 
 
@@ -576,35 +575,35 @@ void v3_hexdump(const void * ptr, int length, const char * hdr, int flags) {
     cp = ptr;
     for (i = 0; i < length; i+= cols) {
 	if (hdr != NULL)
-	    PrintDebug("%s", hdr);
+	    V3_Print(VM_NONE, VCORE_NONE, "%s", hdr);
 
 	if ((flags & HD_OMIT_COUNT) == 0)
-	    PrintDebug("%04x  ", i);
+	    V3_Print(VM_NONE, VCORE_NONE, "%04x  ", i);
 
 	if ((flags & HD_OMIT_HEX) == 0) {
 	    for (j = 0; j < cols; j++) {
 		k = i + j;
 		if (k < length)
-		    PrintDebug("%c%02x", delim, cp[k]);
+		    V3_Print(VM_NONE, VCORE_NONE, "%c%02x", delim, cp[k]);
 		else
-		    PrintDebug("   ");
+		    V3_Print(VM_NONE, VCORE_NONE, "   ");
 	    }
 	}
 
 	if ((flags & HD_OMIT_CHARS) == 0) {
-	    PrintDebug("  |");
+	    V3_Print(VM_NONE, VCORE_NONE, "  |");
 	    for (j = 0; j < cols; j++) {
 		k = i + j;
 		if (k >= length)
-		    PrintDebug(" ");
+		    V3_Print(VM_NONE, VCORE_NONE, " ");
 		else if (cp[k] >= ' ' && cp[k] <= '~')
-		    PrintDebug("%c", cp[k]);
+		    V3_Print(VM_NONE, VCORE_NONE, "%c", cp[k]);
 		else
-		    PrintDebug(".");
+		    V3_Print(VM_NONE, VCORE_NONE, ".");
 	    }
-	    PrintDebug("|");
+	    V3_Print(VM_NONE, VCORE_NONE, "|");
 	}
-	PrintDebug("\n");
+	V3_Print(VM_NONE, VCORE_NONE, "\n");
     }
 }