X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=4a71a118bfe20f5a5e541f1d1283e0176b8a82d3;hb=ddd8ed1df60f75104096a8b6a9996ef5f462f594;hp=8459e4c298560b0a980bf8b95dd6b496c7cd4c50;hpb=3496b5b5469fe691a6847eb76d973019bb769318;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 8459e4c..4a71a11 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -19,52 +19,85 @@
 
 #include <palacios/vmm.h>
 #include <palacios/svm.h>
-#include <palacios/vmx.h>
+//#include <palacios/vmx.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
 #include <palacios/vmm_instrument.h>
+#include <palacios/vmm_ctrl_regs.h>
+#include <palacios/vmm_lowlevel.h>
 
 
+/* These should be the only global variables in Palacios */
+/* They are architecture specific variables */
 v3_cpu_arch_t v3_cpu_type;
 struct v3_os_hooks * os_hooks = NULL;
 
 
 
 static struct guest_info * allocate_guest() {
-  void * info = V3_Malloc(sizeof(struct guest_info));
-  memset(info, 0, sizeof(struct guest_info));
-  return info;
+    void * info = V3_Malloc(sizeof(struct guest_info));
+    memset(info, 0, sizeof(struct guest_info));
+    return info;
 }
 
 
 
 void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
-  os_hooks = hooks;
+    
+    // Set global variables. 
+    os_hooks = hooks;
+    v3_cpu_type = V3_INVALID_CPU;
+
+
+#ifdef INSTRUMENT_VMM
+    v3_init_instrumentation();
+#endif
+
+    if (v3_is_svm_capable()) {
+
+	PrintDebug("Machine is SVM Capable\n");
+	vmm_ops->allocate_guest = &allocate_guest;
+	v3_init_SVM(vmm_ops);
+
+	/*
+	  } else if (is_vmx_capable()) {
+	  vmm_cpu_type = VMM_VMX_CPU;
+	  PrintDebug("Machine is VMX Capable\n");
+	  //Init_VMX();*/
+    } else {
+	PrintDebug("CPU has no virtualization Extensions\n");
+    }
+}
+
+
 
-  v3_cpu_type = V3_INVALID_CPU;
+#ifdef __V3_32BIT__
 
-	#ifdef INSTRUMENT_VMM
-	    v3_init_cyg_profiler();
-	#endif
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    uint32_t cr4_val;
+    struct cr4_32 * cr4;
 
-  if (v3_is_svm_capable()) {
+    __asm__ (
+	     "movl %%cr4, %0; "
+	     : "=r"(cr4_val) 
+	     );
 
-    PrintDebug("Machine is SVM Capable\n");
-    vmm_ops->allocate_guest = &allocate_guest;
-    vmm_ops->config_guest = &v3_config_guest;
-    v3_init_SVM(vmm_ops);
+    
+    cr4 = (struct cr4_32 *)&(cr4_val);
 
-    /*
-  } else if (is_vmx_capable()) {
-    vmm_cpu_type = VMM_VMX_CPU;
-    PrintDebug("Machine is VMX Capable\n");
-    //Init_VMX();*/
-  } else {
-    PrintDebug("CPU has no virtualization Extensions\n");
-  }
+    if (cr4->pae == 1) {
+	return PROTECTED_PAE;
+    } else {
+	return PROTECTED;
+    }
 }
 
+#elif __V3_64BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    return LONG;
+}
 
-// Get CPU Type..
+#endif