X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_hw_info.c;h=da0009332861b025c0027cea9651144c5558c12b;hb=28cd2d6deca639fe40256c4d3f2c8f9491ec777a;hp=d5fe49454b3587b772bf2fc29866b06536b24743;hpb=d0629f43f3f4714eea680f6715e114a6e514739b;p=palacios.git diff --git a/palacios/src/palacios/vmx_hw_info.c b/palacios/src/palacios/vmx_hw_info.c index d5fe494..da00093 100644 --- a/palacios/src/palacios/vmx_hw_info.c +++ b/palacios/src/palacios/vmx_hw_info.c @@ -102,7 +102,7 @@ int v3_init_vmx_hw(struct vmx_hw_info * hw_info) { v3_get_msr(VMX_MISC_MSR, &(hw_info->misc_info.hi), &(hw_info->misc_info.lo)); - PrintError("BASIC_MSR: Lo: %x, Hi: %x\n", hw_info->basic_info.lo, hw_info->basic_info.hi); + PrintError(VM_NONE, VCORE_NONE, "BASIC_MSR: Lo: %x, Hi: %x\n", hw_info->basic_info.lo, hw_info->basic_info.hi); get_ex_ctrl_caps(hw_info, &(hw_info->pin_ctrls), VMX_PINBASED_CTLS_MSR, VMX_TRUE_PINBASED_CTLS_MSR); get_ex_ctrl_caps(hw_info, &(hw_info->proc_ctrls), VMX_PROCBASED_CTLS_MSR, VMX_TRUE_PROCBASED_CTLS_MSR); @@ -112,8 +112,8 @@ int v3_init_vmx_hw(struct vmx_hw_info * hw_info) { /* Get secondary PROCBASED controls if secondary controls are available (optional or required) */ /* Intel Manual 3B. Sect. G.3.3 */ - if ( ((hw_info->proc_ctrls.req_mask & 0x80000000) == 0) || - ((hw_info->proc_ctrls.req_val & 0x80000000) == 1) ) { + if ( (!(hw_info->proc_ctrls.req_mask & 0x80000000)) || + (hw_info->proc_ctrls.req_val & 0x80000000) ) { get_ctrl_caps(&(hw_info->sec_proc_ctrls), VMX_PROCBASED_CTLS2_MSR);