X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=a0e2fc7ff4f870aa87c60b00109727cb341d5123;hb=5d0908c468453271f6de6bc786ee864b3308f9ef;hp=6ef7fa16bb6e25ab02dba0b8a6f630e077e362df;hpb=da0f0deecf22754656bad2a95640461ec3ac4f1d;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 6ef7fa1..a0e2fc7 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -23,45 +23,80 @@
 #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;
 
-  v3_cpu_type = V3_INVALID_CPU;
 
+#ifdef INSTRUMENT_VMM
+    v3_init_instrumentation();
+#endif
 
+    if (v3_is_svm_capable()) {
 
-  if (v3_is_svm_capable()) {
+        PrintDebug("Machine is SVM Capable\n");
+        vmm_ops->allocate_guest = &allocate_guest;
+        v3_init_SVM(vmm_ops);
 
-    PrintDebug("Machine is SVM Capable\n");
-    vmm_ops->allocate_guest = &allocate_guest;
-    vmm_ops->config_guest = &v3_config_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");
-  }
+    } else if (v3_is_vmx_capable()) {
+        PrintDebug("Machine is VMX Capable\n");
+        v3_init_vmx(vmm_ops);
+    } else {
+        PrintDebug("CPU has no virtualization Extensions\n");
+    }
 }
 
 
-// Get CPU Type..
+
+#ifdef __V3_32BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    uint32_t cr4_val;
+    struct cr4_32 * cr4;
+
+    __asm__ (
+	     "movl %%cr4, %0; "
+	     : "=r"(cr4_val) 
+	     );
+
+    
+    cr4 = (struct cr4_32 *)&(cr4_val);
+
+    if (cr4->pae == 1) {
+	return PROTECTED_PAE;
+    } else {
+	return PROTECTED;
+    }
+}
+
+#elif __V3_64BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    return LONG;
+}
+
+#endif