X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=c7376d9da3f1210bca114c22da37ca6b82a824ef;hb=2201970a66ded078c9228c9e4053189a00f0a882;hp=1203427da7881cc8a5a96d2245512375e51ed8a5;hpb=b90e3373d07b92968b28aef77f4dc68e6a264f12;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 1203427..c7376d9 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -59,14 +59,22 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) {
 
     vmm_ops->allocate_guest = &allocate_guest;
 
+#ifdef CONFIG_SVM
     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");
+
+    } else 
+#endif
+#ifdef CONFIG_VMX
+    if (v3_is_vmx_capable()) {
+	PrintDebug("Machine is VMX Capable\n");
+	v3_init_vmx(vmm_ops);
+	
+    } else 
+#endif
+    {
+       PrintDebug("CPU has no virtualization Extensions\n");
     }
 }