From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/8] xen/misc: Remove or annotate possibly-unused functions Date: Tue, 9 Feb 2016 20:01:42 +0000 Message-ID: <1455048108-5045-3-git-send-email-andrew.cooper3@citrix.com> References: <1455048108-5045-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1455048108-5045-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Tim Deegan , Ian Campbell , Jan Beulich List-Id: xen-devel@lists.xenproject.org Clang notices more unused functions than GCC. * sh_next_page() is only used at GUEST_PAGING_LEVELS=2, so remove it from the other guest level translation units * rcu_batch_after() is completely unused. * Various of the COMPAT() generated functions are used only for their BUILD_BUG_ON() properties. Annotate them all as __maybe_used. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Tim Deegan CC: Ian Campbell --- xen/arch/x86/mm/shadow/multi.c | 2 ++ xen/common/rcupdate.c | 6 ------ xen/include/xen/compat.h | 14 ++++++++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 4d0b317..aaf8db7 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -436,6 +436,7 @@ sh_cmpxchg_guest_entry(struct vcpu *v, intpte_t *p, intpte_t *old, * space.) */ +#if GUEST_PAGING_LEVELS == 2 /* From one page of a multi-page shadow, find the next one */ static inline mfn_t sh_next_page(mfn_t smfn) { @@ -454,6 +455,7 @@ static inline mfn_t sh_next_page(mfn_t smfn) ASSERT(!next->u.sh.head); return page_to_mfn(next); } +#endif static inline u32 guest_index(void *ptr) diff --git a/xen/common/rcupdate.c b/xen/common/rcupdate.c index f13b87b..8cc5a82 100644 --- a/xen/common/rcupdate.c +++ b/xen/common/rcupdate.c @@ -141,12 +141,6 @@ static inline int rcu_batch_before(long a, long b) return (a - b) < 0; } -/* Is batch a after batch b ? */ -static inline int rcu_batch_after(long a, long b) -{ - return (a - b) > 0; -} - static void force_quiescent_state(struct rcu_data *rdp, struct rcu_ctrlblk *rcp) { diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index e5c23e2..3f4cef6 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -134,14 +134,16 @@ #define CHECK_NAME_(k, n, tag) __check ## tag ## k ## _ ## n #define CHECK_TYPE(name) \ -static inline int CHECK_NAME(name, T)(xen_ ## name ## _t *x, \ - compat_ ## name ## _t *c) \ +static inline int __maybe_unused \ +CHECK_NAME(name, T)(xen_ ## name ## _t *x, \ + compat_ ## name ## _t *c) \ { \ return x == c; \ } #define CHECK_TYPE_(k, n) \ -static inline int CHECK_NAME_(k, n, T)(k xen_ ## n *x, \ - k compat_ ## n *c) \ +static inline int __maybe_unused \ +CHECK_NAME_(k, n, T)(k xen_ ## n *x, \ + k compat_ ## n *c) \ { \ return x == c; \ } @@ -154,14 +156,14 @@ static inline int CHECK_NAME_(k, n, T)(k xen_ ## n *x, \ sizeof(k compat_ ## n)) * 2] #define CHECK_FIELD_COMMON(name, t, f) \ -static inline int name(xen_ ## t ## _t *x, compat_ ## t ## _t *c) \ +static inline int __maybe_unused name(xen_ ## t ## _t *x, compat_ ## t ## _t *c) \ { \ BUILD_BUG_ON(offsetof(xen_ ## t ## _t, f) != \ offsetof(compat_ ## t ## _t, f)); \ return &x->f == &c->f; \ } #define CHECK_FIELD_COMMON_(k, name, n, f) \ -static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ +static inline int __maybe_unused name(k xen_ ## n *x, k compat_ ## n *c) \ { \ BUILD_BUG_ON(offsetof(k xen_ ## n, f) != \ offsetof(k compat_ ## n, f)); \ -- 2.1.4