[Qemu-devel] [PATCH] thunk: Drop unused NO_THUNK_TYPE_SIZE guards

[Qemu-devel] [PATCH] thunk: Drop unused NO_THUNK_TYPE_SIZE guards

[Peter Maydell]

The thunk_type_size_array() and thunk_type_align_array() functions
are only provided if NO_THUNK_TYPE_SIZE is not defined. However
nothing in the codebase defines that, and so in fact these functions
are always present. Drop the unnecessary #ifdefs.

(Over a decade ago thunk.h used to be included by some softmmu
files, which defined NO_THUNK_TYPE_SIZE, but these includes are
long gone; see for instance commit f193c7979c2f7.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 include/exec/user/thunk.h | 3 ---
 thunk.c                   | 2 --
 2 files changed, 5 deletions(-)

diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index ad1d602..57eb358 100644
--- a/include/exec/user/thunk.h
+++ b/include/exec/user/thunk.h
@@ -71,7 +71,6 @@ void thunk_register_struct_direct(int id, const char *name,
                                   const StructEntry *se1);
 const argtype *thunk_convert(void *dst, const void *src,
                              const argtype *type_ptr, int to_host);
-#ifndef NO_THUNK_TYPE_SIZE
 
 extern StructEntry *struct_entries;
 
@@ -178,8 +177,6 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
     }
 }
 
-#endif /* NO_THUNK_TYPE_SIZE */
-
 unsigned int target_to_host_bitmask(unsigned int x86_mask,
                                     const bitmask_transtbl * trans_tbl);
 unsigned int host_to_target_bitmask(unsigned int alpha_mask,
diff --git a/thunk.c b/thunk.c
index f057d86..8aee299 100644
--- a/thunk.c
+++ b/thunk.c
@@ -303,7 +303,6 @@ unsigned int host_to_target_bitmask(unsigned int alpha_mask,
     return(x86_mask);
 }
 
-#ifndef NO_THUNK_TYPE_SIZE
 int thunk_type_size_array(const argtype *type_ptr, int is_host)
 {
     return thunk_type_size(type_ptr, is_host);
@@ -313,7 +312,6 @@ int thunk_type_align_array(const argtype *type_ptr, int is_host)
 {
     return thunk_type_align(type_ptr, is_host);
 }
-#endif /* ndef NO_THUNK_TYPE_SIZE */
 
 void thunk_init(unsigned int max_structs)
 {
-- 
1.9.1

Re: [Qemu-devel] [PATCH] thunk: Drop unused NO_THUNK_TYPE_SIZE guards

[Michael Tokarev]

02.06.2016 18:28, Peter Maydell wrote:
> The thunk_type_size_array() and thunk_type_align_array() functions
> are only provided if NO_THUNK_TYPE_SIZE is not defined. However
> nothing in the codebase defines that, and so in fact these functions
> are always present. Drop the unnecessary #ifdefs.

Applied to -trivial, thanks!

/mjt