X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;fp=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=4502a80bbd5fff6ab5d387a5726818da358da2f8;hb=66a1a4c7a9edcd7d8bc207aca093d694a6e6b5b2;hp=c0101670fac22476b5afd50f7e032b985e6183ed;hpb=f7cf9c19ecb0a589dd45ae0d2c91814bd3c2acc2;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index c010167..4502a80 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -26,11 +26,11 @@ #include v3_cpu_arch_t v3_cpu_type; -struct vmm_os_hooks * os_hooks = NULL; +struct v3_os_hooks * os_hooks = NULL; -struct guest_info * allocate_guest() { +static struct guest_info * allocate_guest() { void * info = V3_Malloc(sizeof(struct guest_info)); memset(info, 0, sizeof(struct guest_info)); return info; @@ -38,19 +38,19 @@ struct guest_info * allocate_guest() { -void Init_V3(struct vmm_os_hooks * hooks, struct vmm_ctrl_ops * vmm_ops) { +void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops) { os_hooks = hooks; v3_cpu_type = V3_INVALID_CPU; - init_decoder(); + v3_init_decoder(); - if (is_svm_capable()) { + if (v3_is_svm_capable()) { PrintDebug("Machine is SVM Capable\n"); vmm_ops->allocate_guest = &allocate_guest; - vmm_ops->config_guest = &config_guest; - Init_SVM(vmm_ops); + vmm_ops->config_guest = &v3_config_guest; + v3_init_SVM(vmm_ops); /* } else if (is_vmx_capable()) {