From 1e50b51dc5e9594975ccc060dd58bc35873911bc Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 22 Apr 2014 12:30:33 +0100 Subject: [PATCH] x86/HAP: drop pointless assertions Just like for shadow code, hap_map_domain_page() is just a thin wrapper around map_domain_page(), which cannot fail. Asserting its success is redundant. hap_unmap_domain_page() should also not be used for something not mapped through hap_map_domain_page(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 60806bbbe7..7694e517d1 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -233,9 +233,8 @@ static struct page_info *hap_alloc(struct domain *d) d->arch.paging.hap.free_pages--; p = __map_domain_page(pg); - ASSERT(p != NULL); clear_page(p); - hap_unmap_domain_page(p); + unmap_domain_page(p); return pg; } @@ -375,7 +374,6 @@ static void hap_install_xen_entries_in_l4(struct vcpu *v, mfn_t l4mfn) l4_pgentry_t *l4e; l4e = hap_map_domain_page(l4mfn); - ASSERT(l4e != NULL); /* Copy the common Xen mappings from the idle domain */ memcpy(&l4e[ROOT_PAGETABLE_FIRST_XEN_SLOT], -- 2.30.2