X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=d6dfb91994f985b19a13d169e1fe213f2e465006;hp=c0101670fac22476b5afd50f7e032b985e6183ed;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hpb=1c46db5ec8d086d76f7120a638199564947694d3 diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index c010167..d6dfb91 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(); - 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()) {