Re: [PATCH RESEND 3/4] xen/common: remove rcu_lock_target_domain_by_id

[Keir Fraser <keir.xen@gmail.com>]

On 03/05/2013 15:09, "Daniel De Graaf" <dgdegra@tycho.nsa.gov> wrote:

> 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 <dgdegra@tycho.nsa.gov>
> Acked-by: George Dunlap <george.dunlap@eu.citrix.com> (for 4.3 release)
> Cc: Keir Fraser <keir@xen.org>

Acked-by: Keir Fraser <keir@xen.org>

> ---
>  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 b5d44d4..8adf00a 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 41f749e..cb3baed 100644
> --- a/xen/include/xen/sched.h
> +++ b/xen/include/xen/sched.h
> @@ -477,20 +477,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.
>   */