Update to the device framework.

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c07476f..a20399b 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -24,6 +24,8 @@
 #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 */
@@ -47,23 +49,55 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
     os_hooks = hooks;
     v3_cpu_type = V3_INVALID_CPU;
 
+    // Register all the possible device types
+    v3_init_devices();
+
 
 #ifdef INSTRUMENT_VMM
     v3_init_instrumentation();
 #endif
 
+    vmm_ops->allocate_guest = &allocate_guest;
+
     if (v3_is_svm_capable()) {
+        PrintDebug("Machine is SVM Capable\n");
+        v3_init_SVM(vmm_ops);
+    } 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");
+    }
+}
+
+
+
+#ifdef __V3_32BIT__
 
-       PrintDebug("Machine is SVM Capable\n");
-       vmm_ops->allocate_guest = &allocate_guest;
-       v3_init_SVM(vmm_ops);
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    uint32_t cr4_val;
+    struct cr4_32 * cr4;
 
-       /*
-         } else if (is_vmx_capable()) {
-         vmm_cpu_type = VMM_VMX_CPU;
-         PrintDebug("Machine is VMX Capable\n");
-         //Init_VMX();*/
+    __asm__ (
+            "movl %%cr4, %0; "
+            : "=r"(cr4_val) 
+            );
+
+    
+    cr4 = (struct cr4_32 *)&(cr4_val);
+
+    if (cr4->pae == 1) {
+       return PROTECTED_PAE;
     } else {
-       PrintDebug("CPU has no virtualization Extensions\n");
+       return PROTECTED;
     }
 }
+
+#elif __V3_64BIT__
+
+v3_cpu_mode_t v3_get_host_cpu_mode() {
+    return LONG;
+}
+
+#endif 
+