From: Jan Beulich Date: Tue, 13 Apr 2021 08:18:08 +0000 (+0200) Subject: x86/EPT: minor local variable adjustment in ept_set_entry() X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~702 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0faa6ef54af330867d836e99d34e8dc1e622b54f;p=xen.git x86/EPT: minor local variable adjustment in ept_set_entry() Not having direct_mmio (used only once anyway) as a local variable gets the epte_get_entry_emt() invocation here in better sync with the other ones. While at it also reduce ipat's scope. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Kevin Tian --- diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 23d411f01d..a3beaf91e2 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -677,8 +677,6 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, unsigned long fn_mask = !mfn_eq(mfn, INVALID_MFN) ? (gfn | mfn_x(mfn)) : gfn; int ret, rc = 0; bool_t entry_written = 0; - bool_t direct_mmio = (p2mt == p2m_mmio_direct); - uint8_t ipat = 0; bool_t need_modify_vtd_table = 1; bool_t vtd_pte_present = 0; unsigned int iommu_flags = p2m_get_iommu_flags(p2mt, mfn); @@ -790,8 +788,10 @@ ept_set_entry(struct p2m_domain *p2m, gfn_t gfn_, mfn_t mfn, if ( mfn_valid(mfn) || p2m_allows_invalid_mfn(p2mt) ) { + uint8_t ipat = 0; int emt = epte_get_entry_emt(p2m->domain, gfn, mfn, - i * EPT_TABLE_ORDER, &ipat, direct_mmio); + i * EPT_TABLE_ORDER, &ipat, + p2mt == p2m_mmio_direct); if ( emt >= 0 ) new_entry.emt = emt;