X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=a0e2fc7ff4f870aa87c60b00109727cb341d5123;hp=4a71a118bfe20f5a5e541f1d1283e0176b8a82d3;hb=1f5b9287e61b8a4164f81e52dccf3ddd59a891f8;hpb=50dd6f837443d6f5a8cfb2410f1f8d95e8367b6a

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 4a71a11..a0e2fc7 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>
@@ -56,17 +56,16 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 
     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;
+        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 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");
     }
 }