more configuration fixes

diff --git a/Kconfig b/Kconfig
index 254c64f..dd5a154 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -90,7 +90,6 @@ config BUILT_IN_STRNLEN
          This enables Palacios' internal implementation of strnlen
 
 
-
 config BUILT_IN_STRCMP
        bool "strcmp()"
        default n
@@ -170,6 +169,43 @@ config BUILT_IN_STRPBRK
          This enables Palacios' internal implementation of strpbrk
 
 
+config BUILT_IN_SPRINTF
+       bool "sprintf()"
+       default n
+       depends on BUILT_IN_STDLIB
+       help 
+         This enables Palacios' internal implementation of sprintf
+
+
+config BUILT_IN_SNPRINTF
+       bool "snprintf()"
+       default n
+       depends on BUILT_IN_STDLIB
+       help 
+         This enables Palacios' internal implementation of snprintf
+
+
+config BUILT_IN_VSPRINTF
+       bool "vsprintf()"
+       default n
+       depends on BUILT_IN_STDLIB
+       help 
+         This enables Palacios' internal implementation of vsprintf
+
+config BUILT_IN_VSNPRINTF
+       bool "vsnprintf()"
+       default n
+       depends on BUILT_IN_STDLIB
+       help 
+         This enables Palacios' internal implementation of vsnprintf
+
+config BUILT_IN_VSNRPRINTF
+       bool "vsnrprintf()"
+       default n
+       depends on BUILT_IN_STDLIB
+       help 
+         This enables Palacios' internal implementation of vsnrprintf
+
 endmenu
 
 
@@ -184,6 +220,13 @@ config SYMBIOTIC
          Enable Symbiotic components of the VMM
 
 
+config SYMBIOTIC_SWAP
+       bool "Symbiotic Swap"
+       default n
+       depends on SYMBIOTIC
+       help 
+         This enables the symbiotic swap architecture
+
 endmenu
 
 

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c7376d9..4beccea 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -18,8 +18,6 @@
  */
 
 #include <palacios/vmm.h>
-#include <palacios/svm.h>
-#include <palacios/vmx.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
@@ -27,7 +25,12 @@
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
 
-
+#ifdef CONFIG_SVM
+#include <palacios/svm.h>
+#endif
+#ifdef CONFIG_VMX
+#include <palacios/vmx.h>
+#endif
 
 
 v3_cpu_arch_t v3_cpu_type;
@@ -74,7 +77,7 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
     } else 
 #endif
     {
-       PrintDebug("CPU has no virtualization Extensions\n");
+       PrintError("CPU has no virtualization Extensions\n");
     }
 }
 

diff --git a/palacios/src/palacios/vmm_sprintf.c b/palacios/src/palacios/vmm_sprintf.c
index b48e657..cc8b79e 100644 (file)
--- a/palacios/src/palacios/vmm_sprintf.c
+++ b/palacios/src/palacios/vmm_sprintf.c
@@ -66,11 +66,6 @@
 #include <palacios/vmm_sprintf.h>
 
 
-#define NEED_SPRINTF 0
-#define NEED_SNPRINTF 0
-#define NEED_VSPRINTF 0
-#define NEED_VSNPRINTF 0
-#define NEED_VSNRPRINTF 1
 
 
 typedef addr_t ptrdiff_t;     /* ptr1 - ptr2 */
@@ -96,7 +91,7 @@ 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);
 
 
-#if NEED_SPRINTF
+#ifdef CONFIG_BUILT_IN_SPRINTF
 /*
  * Scaled down version of sprintf(3).
  */
@@ -113,7 +108,7 @@ int sprintf(char * buf, const char * cfmt, ...) {
 #endif 
 
 
-#if NEED_VSPRINTF
+#ifdef CONFIG_BUILT_IN_VSPRINTF
 /*
  * Scaled down version of vsprintf(3).
  */
@@ -127,7 +122,7 @@ int vsprintf(char * buf, const char * cfmt, va_list ap) {
 #endif
 
 
-#if NEED_SNPRINTF
+#ifdef CONFIG_BUILT_IN_SNPRINTF
 /*
  * Scaled down version of snprintf(3).
  */
@@ -143,7 +138,7 @@ int snprintf(char * str, size_t size, const char * format, ...) {
 #endif
 
 
-#if NEED_VSNPRINTF 
+#ifdef CONFIG_BUILT_IN_VSNPRINTF 
 /*
  * Scaled down version of vsnprintf(3).
  */
@@ -162,7 +157,7 @@ int vsnprintf(char * str, size_t size, const char * format, va_list ap) {
 #endif 
 
 
-#if NEED_VSNRPRINTF
+#ifdef CONFIG_BUILT_IN_VSNRPRINTF
 /*
  * Kernel version which takes radix argument vsnprintf(3).
  */