X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvmm.c;h=ab9a5f6ce9efcd016decd2eedef9774d7ccb9db4;hb=c7e3f043b6458083162e23e1a8adb7703fd06559;hp=b1ff42a222d0beeed4318196baa1f4eab4c75375;hpb=01e2bfdc462dbbe8d62b71c7e99e198c27844f0f;p=palacios.git diff --git a/palacios/src/geekos/vmm.c b/palacios/src/geekos/vmm.c index b1ff42a..ab9a5f6 100644 --- a/palacios/src/geekos/vmm.c +++ b/palacios/src/geekos/vmm.c @@ -11,17 +11,20 @@ uint_t vmm_cpu_type; struct vmm_os_hooks * os_hooks = NULL; -void Init_VMM(struct vmm_os_hooks * hooks) { + +void Init_VMM(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) { vmm_cpu_type = VMM_INVALID_CPU; os_hooks = hooks; - PrintDebug("sizeof ullong_t: %d\n", sizeof(ullong_t)); + if (is_svm_capable()) { vmm_cpu_type = VMM_SVM_CPU; PrintDebug("Machine is SVM Capable\n"); - Init_SVM(); + + Init_SVM(vmm_ops); + } else if (is_vmx_capable()) { vmm_cpu_type = VMM_VMX_CPU; PrintDebug("Machine is VMX Capable\n");