X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_symbiotic.c;h=8fda86e703dc051be77907f2c5cc7fd09d6ae238;hb=bcab692b40b809c628eb365c199ffd3c757a6cc7;hp=3b41305564beb1a377ecfaf068980b4129049c19;hpb=d54fc24e6cfb62cc2fedfb63d3ae68ff636e3a01;p=palacios.git diff --git a/palacios/src/palacios/vmm_symbiotic.c b/palacios/src/palacios/vmm_symbiotic.c index 3b41305..8fda86e 100644 --- a/palacios/src/palacios/vmm_symbiotic.c +++ b/palacios/src/palacios/vmm_symbiotic.c @@ -32,11 +32,11 @@ static int cpuid_fn(struct guest_info * core, uint32_t cpuid, *eax = *(uint32_t *)"V3V"; - if ((v3_cpu_types[core->host_cpu_id] == V3_SVM_CPU) || - (v3_cpu_types[core->host_cpu_id] == V3_SVM_REV3_CPU)) { + if ((v3_cpu_types[0] == V3_SVM_CPU) || + (v3_cpu_types[0] == V3_SVM_REV3_CPU)) { *ebx = *(uint32_t *)"SVM"; - } else if ((v3_cpu_types[core->host_cpu_id] == V3_VMX_CPU) || - (v3_cpu_types[core->host_cpu_id] == V3_VMX_EPT_CPU)) { + } else if ((v3_cpu_types[0] == V3_VMX_CPU) || + (v3_cpu_types[0] == V3_VMX_EPT_CPU)) { *ebx = *(uint32_t *)"VMX"; } @@ -56,14 +56,14 @@ int v3_init_symbiotic_vm(struct v3_vm_info * vm) { return -1; } -#ifdef CONFIG_SYMCALL +#ifdef V3_CONFIG_SYMCALL if (v3_init_symcall_vm(vm) == -1) { PrintError("Error intializing global SymCall state\n"); return -1; } #endif -#ifdef CONFIG_SYMMOD +#ifdef V3_CONFIG_SYMMOD if (v3_init_symmod_vm(vm, vm->cfg_data->cfg) == -1) { PrintError("Error initializing global SymMod state\n"); return -1; @@ -77,7 +77,7 @@ int v3_init_symbiotic_vm(struct v3_vm_info * vm) { int v3_deinit_symbiotic_vm(struct v3_vm_info * vm) { -#ifdef CONFIG_SYMMOD +#ifdef V3_CONFIG_SYMMOD if (v3_deinit_symmod_vm(vm) == -1) { PrintError("Error deinitializing global SymMod state\n"); return -1;