diff mbox series

x86: don't open-code vmap_to_mfn()

Message ID d1aeb904-6ae1-2ca8-220a-920f2be5416d@suse.com (mailing list archive)
State New, archived
Headers show
Series x86: don't open-code vmap_to_mfn() | expand

Commit Message

Jan Beulich Oct. 26, 2020, 3:53 p.m. UTC 
Signed-off-by: Jan Beulich <jbeulich@suse.com>

Comments

Wei Liu Oct. 26, 2020, 3:59 p.m. UTC | #1 
On Mon, Oct 26, 2020 at 04:53:58PM +0100, Jan Beulich wrote:
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Wei Liu <wl@xen.org>
diff mbox series

Patch

--- a/xen/arch/x86/domain_page.c
+++ b/xen/arch/x86/domain_page.c
@@ -333,21 +333,14 @@  void unmap_domain_page_global(const void
 mfn_t domain_page_map_to_mfn(const void *ptr)
 {
     unsigned long va = (unsigned long)ptr;
-    const l1_pgentry_t *pl1e;
 
     if ( va >= DIRECTMAP_VIRT_START )
         return _mfn(virt_to_mfn(ptr));
 
     if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END )
-    {
-        pl1e = virt_to_xen_l1e(va);
-        BUG_ON(!pl1e);
-    }
-    else
-    {
-        ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END);
-        pl1e = &__linear_l1_table[l1_linear_offset(va)];
-    }
+        return vmap_to_mfn(va);
 
-    return l1e_get_mfn(*pl1e);
+    ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END);
+
+    return l1e_get_mfn(__linear_l1_table[l1_linear_offset(va)]);
 }