The host PAT value is a compile time constant, and doesn't need to be read out of hardware. Merge this if block into the previous block, which has an identical condition.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com> --- CC: Jan Beulich <jbeul...@suse.com> CC: Jun Nakajima <jun.nakaj...@intel.com> CC: Kevin Tian <kevin.t...@intel.com> CC: Wei Liu <wei.l...@citrix.com> CC: Roger Pau Monné <roger....@citrix.com> --- xen/arch/x86/hvm/vmx/vmcs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 70c2fb7..be02be1 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1246,17 +1246,9 @@ static int construct_vmcs(struct vcpu *v) ept->mfn = pagetable_get_pfn(p2m_get_pagetable(p2m)); __vmwrite(EPT_POINTER, ept->eptp); - } - - if ( paging_mode_hap(d) ) - { - u64 host_pat, guest_pat; - - rdmsrl(MSR_IA32_CR_PAT, host_pat); - guest_pat = MSR_IA32_CR_PAT_RESET; - __vmwrite(HOST_PAT, host_pat); - __vmwrite(GUEST_PAT, guest_pat); + __vmwrite(HOST_PAT, XEN_MSR_PAT); + __vmwrite(GUEST_PAT, MSR_IA32_CR_PAT_RESET); } if ( cpu_has_vmx_mpx ) __vmwrite(GUEST_BNDCFGS, 0); -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel