Basic HRT startup for HVM, plus assorted cleanup

[palacios.git] / palacios / src / palacios / vmm_sprintf.c

diff --git a/palacios/src/palacios/vmm_sprintf.c b/palacios/src/palacios/vmm_sprintf.c
index cc8b79e..dbc700f 100644 (file)
--- a/palacios/src/palacios/vmm_sprintf.c
+++ b/palacios/src/palacios/vmm_sprintf.c
@@ -86,12 +86,19 @@ struct snprintf_arg {
 };
 
 
+
+#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).
  */
@@ -108,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).
  */
@@ -122,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).
  */
@@ -138,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).
  */
@@ -154,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).
  */
@@ -545,6 +552,8 @@ number:
 }
 
 
+#endif // V3_CONFIG_BUILT_IN_STDIO
+
 
 
 void v3_hexdump(const void * ptr, int length, const char * hdr, int flags) {
@@ -566,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");
     }
 }