X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=5525d65b4a1b031c3ce7af6b82d0dac4ecd9841d;hb=c163873b7b96544683030cafba0e73a7ed988171;hp=77c654ed17d4e1b1c2e79404de5b018485a4ead9;hpb=0e1c2f1eb7e964848d43824328205d5557bc7639;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 77c654e..5525d65 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -26,45 +26,45 @@ #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"); + 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"); + } } - - -// Get CPU Type.. -