x86/mm: use is_..._vcpu() instead of open coding it Signed-off-by: Jan Beulich --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1851,9 +1851,7 @@ unsigned long paging_gva_to_gfn(struct v struct p2m_domain *hostp2m = p2m_get_hostp2m(v->domain); const struct paging_mode *hostmode = paging_get_hostmode(v); - if ( is_hvm_domain(v->domain) - && paging_mode_hap(v->domain) - && nestedhvm_is_n2(v) ) + if ( is_hvm_vcpu(v) && paging_mode_hap(v->domain) && nestedhvm_is_n2(v) ) { unsigned long gfn; struct p2m_domain *p2m; --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -971,7 +971,7 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn if ( pg->shadow_flags & ((SHF_page_type_mask & ~SHF_L1_ANY) | SHF_out_of_sync) || sh_page_has_multiple_shadows(pg) - || is_pv_domain(v->domain) + || is_pv_vcpu(v) || !v->domain->arch.paging.shadow.oos_active ) return 0; --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -73,6 +73,6 @@ static const struct paging_mode sh_pagin void shadow_vcpu_init(struct vcpu *v) { - ASSERT(is_pv_domain(v->domain)); + ASSERT(is_pv_vcpu(v)); v->arch.paging.mode = &sh_paging_none; }