From 2730650c9cd65c1cb2412b480ee1f51748bc1445 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 10 Jun 2022 10:23:31 +0200 Subject: [PATCH] x86/mm: further simplify cleanup_page_mappings() With the removal of update_xen_mappings() there's no need anymore for a 2nd error code variable to transiently hold the IOMMU unmap return value. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/mm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4f749fd888..ac74ae389c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2470,12 +2470,7 @@ static int cleanup_page_mappings(struct page_info *page) struct domain *d = page_get_owner(page); if ( d && unlikely(need_iommu_pt_sync(d)) && is_pv_domain(d) ) - { - int rc2 = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K); - - if ( !rc ) - rc = rc2; - } + rc = iommu_legacy_unmap(d, _dfn(mfn), 1u << PAGE_ORDER_4K); if ( likely(!is_special_page(page)) ) { -- 2.30.2