Merge branch 'devel' into timer_control

diff --combined Kconfig
index ec9fe60,9d3cbb9..0910a5f
--- 1/Kconfig
--- 2/Kconfig
+++ b/Kconfig
@@@ -188,6 -188,7 +188,6 @@@ endmen
  source "Kconfig.stdlibs"
  
  
 -
  menu "Virtual Paging"
  
  config SHADOW_PAGING
@@@ -212,21 -213,17 +212,29 @@@ config DEBUG_SHDW_PG_VTL
        help
          Enables debugging messages for VTLB implementation
  
+ config SHADOW_PAGING_CACHE1
+       bool "Shadow Page Cache (1)"
+       default y
+       depends on SHADOW_PAGING
+       help 
+          Enables caching implemenation for shadow paging
+ 
+ 
  endmenu
  
  
 +menu "Time Management"
 +
 +config TIME_VIRTUALIZE_TSC
 +      bool "Virtualize guest TSC"
 +      default n
 +      help
 +          Virtualize the processor time stamp counter in the guest, 
 +          generally increasing consistency between various time sources 
 +          but also potentially making guest time run slower than real time.
 +
 +endmenu
 +
  menu "Symbiotic Functions"
  
  config SYMBIOTIC
@@@ -334,12 -331,7 +342,12 @@@ config DEBUG_INTERRUPT
        help 
          This turns on debugging for the interrupt system
  
 -
 +config DEBUG_TIME
 +      bool "Timing"
 +      default n
 +      depends on DEBUG_ON
 +      help
 +        This turns on debugging of system time virtualization
  
  config DEBUG_IO
        bool "IO"

diff --combined palacios/src/palacios/vmm_config.c
index 26943c8,738d2ee..ebad8b7
--- 1/palacios/src/palacios/vmm_config.c
--- 2/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@@ -327,11 -327,12 +327,12 @@@ static int determine_paging_mode(struc
        return -1;
      }
  
-     if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) {
-       info->use_large_pages = 1;
-       PrintDebug("Use of large pages in memory virtualization enabled.\n");
+     if (v3_cfg_val(pg_tree, "large_pages") != NULL) {
+       if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) {
+           info->use_large_pages = 1;
+           PrintDebug("Use of large pages in memory virtualization enabled.\n");
+       }
      }
- 
      return 0;
  }
  
@@@ -496,7 -497,6 +497,7 @@@ struct v3_vm_info * v3_config_guest(voi
  
        info->cpu_id = i;
        info->vm_info = vm;
 +      info->core_cfg_data = per_core_cfg;
  
        if (pre_config_core(info, per_core_cfg) == -1) {
            PrintError("Error in core %d preconfiguration\n", i);