From f3d7d1b2c5124d88d27a70a5f02a3c14fd169d42 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Tue, 7 May 2013 16:50:28 +0200 Subject: [PATCH] common: remove rcu_lock_target_domain_by_id This function (and rcu_lock_remote_target_domain_by_id) has no remaining users, having been replaced with XSM hooks and the other rcu_lock_* functions. Remove it. Signed-off-by: Daniel De Graaf Acked-by: George Dunlap (for 4.3 release) Acked-by: Keir Fraser --- xen/common/domain.c | 34 ---------------------------------- xen/include/xen/sched.h | 14 -------------- 2 files changed, 48 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index b5d44d466b..8adf00a67b 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -481,40 +481,6 @@ struct domain *rcu_lock_domain_by_any_id(domid_t dom) return rcu_lock_domain_by_id(dom); } -int rcu_lock_target_domain_by_id(domid_t dom, struct domain **d) -{ - if ( dom == DOMID_SELF ) - { - *d = rcu_lock_current_domain(); - return 0; - } - - if ( (*d = rcu_lock_domain_by_id(dom)) == NULL ) - return -ESRCH; - - if ( !IS_PRIV_FOR(current->domain, *d) ) - { - rcu_unlock_domain(*d); - return -EPERM; - } - - return 0; -} - -int rcu_lock_remote_target_domain_by_id(domid_t dom, struct domain **d) -{ - if ( (*d = rcu_lock_domain_by_id(dom)) == NULL ) - return -ESRCH; - - if ( (*d == current->domain) || !IS_PRIV_FOR(current->domain, *d) ) - { - rcu_unlock_domain(*d); - return -EPERM; - } - - return 0; -} - int rcu_lock_remote_domain_by_id(domid_t dom, struct domain **d) { if ( (*d = rcu_lock_domain_by_id(dom)) == NULL ) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 41f749e19e..cb3baed344 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -476,20 +476,6 @@ struct domain *rcu_lock_domain_by_id(domid_t dom); */ struct domain *rcu_lock_domain_by_any_id(domid_t dom); -/* - * As above function, but accounts for current domain context: - * - Translates target DOMID_SELF into caller's domain id; and - * - Checks that caller has permission to act on the target domain. - */ -int rcu_lock_target_domain_by_id(domid_t dom, struct domain **d); - -/* - * As rcu_lock_target_domain_by_id(), but will fail EPERM rather than resolve - * to local domain. Successful return always resolves to a remote domain that - * the local domain is privileged to control. - */ -int rcu_lock_remote_target_domain_by_id(domid_t dom, struct domain **d); - /* * As rcu_lock_domain_by_id(), but will fail EPERM or ESRCH rather than resolve * to local domain. -- 2.39.5