[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards |
Date: |
Sun, 5 Jun 2016 10:43:12 +0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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)
{
--
2.1.4
- [Qemu-trivial] [PULL 50/52] pc-bios/s390-ccw: Use DIV_ROUND_UP, (continued)
- [Qemu-trivial] [PULL 50/52] pc-bios/s390-ccw: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 29/52] tests: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 52/52] hbitmap: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 13/52] ppc: Remove a potential overflow in muldiv64(), Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 43/52] xen: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 30/52] qga: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 23/52] hw: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 04/52] qga: spelling fix, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards,
Michael Tokarev <=
- [Qemu-trivial] [PULL 51/52] qemu-timer: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 12/52] replace muldiv64(a, b, c) by (uint64_t)a * b / c, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 21/52] fw_cfg: follow CODING_STYLE, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 02/52] hw/ipmi: fix spelling, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 16/52] configure: Use $(..) instead of deprecated `..`, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 41/52] block: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 22/52] replay: Clean up includes, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 45/52] SPICE: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 39/52] qcow/qcow2: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-trivial] [PULL 03/52] docs: "specify" spell fix, Michael Tokarev, 2016/06/05