X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=1b191d00a6c93f2af20951d49b6936b50b0848dc;hb=77e8a14a182c25a46ace02ba8eda7722c0ff6d83;hp=77c654ed17d4e1b1c2e79404de5b018485a4ead9;hpb=0e1c2f1eb7e964848d43824328205d5557bc7639;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 77c654e..1b191d0 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -24,47 +24,77 @@ #include #include #include +#include +#include +/* These should be the only global variables in Palacios */ +/* They are architecture specific variables */ v3_cpu_arch_t v3_cpu_type; struct v3_os_hooks * os_hooks = NULL; static struct guest_info * allocate_guest() { - void * info = V3_Malloc(sizeof(struct guest_info)); - memset(info, 0, sizeof(struct guest_info)); - return info; + void * info = V3_Malloc(sizeof(struct guest_info)); + memset(info, 0, sizeof(struct guest_info)); + return info; } void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) { - os_hooks = hooks; + + // Set global variables. + os_hooks = hooks; + v3_cpu_type = V3_INVALID_CPU; - v3_cpu_type = V3_INVALID_CPU; #ifdef INSTRUMENT_VMM - v3_init_instrumentation(); + v3_init_instrumentation(); #endif - if (v3_is_svm_capable()) { - - PrintDebug("Machine is SVM Capable\n"); vmm_ops->allocate_guest = &allocate_guest; - vmm_ops->config_guest = &v3_config_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 { - PrintDebug("CPU has no virtualization Extensions\n"); - } + + 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__ + +v3_cpu_mode_t v3_get_host_cpu_mode() { + uint32_t cr4_val; + struct cr4_32 * cr4; + + __asm__ ( + "movl %%cr4, %0; " + : "=r"(cr4_val) + ); + + + cr4 = (struct cr4_32 *)&(cr4_val); + + if (cr4->pae == 1) { + return PROTECTED_PAE; + } else { + return PROTECTED; + } } +#elif __V3_64BIT__ + +v3_cpu_mode_t v3_get_host_cpu_mode() { + return LONG; +} -// Get CPU Type.. +#endif