From f17f08672f21fa65c25250c19f76c021f7aa0523 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 5 Jun 2015 12:09:18 +0200 Subject: [PATCH] x86/paging: remove pointless current domain checks Checking that the subject domain is not the current one is pointless when already having paused that domain: domain_pause() already ASSERT()s this to be the case. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 7 ------- xen/arch/x86/mm/shadow/common.c | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index cea7990fe9..d0d3f1e645 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -464,13 +464,6 @@ int hap_enable(struct domain *d, u32 mode) domain_pause(d); - /* error check */ - if ( (d == current->domain) ) - { - rv = -EINVAL; - goto out; - } - old_pages = d->arch.paging.hap.total_pages; if ( old_pages == 0 ) { diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 654bacc72f..919b15b777 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2972,8 +2972,7 @@ int shadow_enable(struct domain *d, u32 mode) domain_pause(d); /* Sanity check the arguments */ - if ( (d == current->domain) || - shadow_mode_enabled(d) || + if ( shadow_mode_enabled(d) || ((mode & PG_translate) && !(mode & PG_refcounts)) || ((mode & PG_external) && !(mode & PG_translate)) ) { -- 2.39.5