X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=a20399babca460e7ec59de36bf4cf38ba1dd6d71;hb=37c18b2c2335a41c68c2f0b779fd2b7d51ab216d;hp=4a71a118bfe20f5a5e541f1d1283e0176b8a82d3;hpb=1316eb77b6d89245583446dab3345f749c415764;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 4a71a11..a20399b 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -19,7 +19,7 @@
 
 #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>
@@ -49,24 +49,24 @@ 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
 
-    if (v3_is_svm_capable()) {
-
-	PrintDebug("Machine is SVM Capable\n");
-	vmm_ops->allocate_guest = &allocate_guest;
-	v3_init_SVM(vmm_ops);
+    vmm_ops->allocate_guest = &allocate_guest;
 
-	/*
-	  } else if (is_vmx_capable()) {
-	  vmm_cpu_type = VMM_VMX_CPU;
-	  PrintDebug("Machine is VMX Capable\n");
-	  //Init_VMX();*/
+    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");
+        PrintDebug("CPU has no virtualization Extensions\n");
     }
 }