diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2019-12-05 12:25:16 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2019-12-19 08:20:16 +0000 |
| commit | b7b18d2680ea148a4b5e17e935ef7a68b6d391c2 (patch) | |
| tree | 37b001a2653a374d9c966bf30a2947e6119180ef | |
| parent | 10d0d505de750590c21a78c0652bf5a9c142302a (diff) | |
| download | qemu-b7b18d2680ea148a4b5e17e935ef7a68b6d391c2.zip qemu-b7b18d2680ea148a4b5e17e935ef7a68b6d391c2.tar.gz qemu-b7b18d2680ea148a4b5e17e935ef7a68b6d391c2.tar.bz2 | |
linux-user: convert target_munmap debug to a tracepoint
Convert the final bit of DEBUG_MMAP to a tracepoint and remove the
last remanents of the #ifdef hackery.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20191205122518.10010-6-alex.bennee@linaro.org>
| -rw-r--r-- | linux-user/mmap.c | 9 | ||||
| -rw-r--r-- | linux-user/trace-events | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 3d90fa4..8685f02 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -21,8 +21,6 @@ #include "exec/log.h" #include "qemu.h" -//#define DEBUG_MMAP - static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER; static __thread int mmap_lock_count; @@ -597,11 +595,8 @@ int target_munmap(abi_ulong start, abi_ulong len) abi_ulong end, real_start, real_end, addr; int prot, ret; -#ifdef DEBUG_MMAP - printf("munmap: start=0x" TARGET_ABI_FMT_lx " len=0x" - TARGET_ABI_FMT_lx "\n", - start, len); -#endif + trace_target_munmap(start, len); + if (start & ~TARGET_PAGE_MASK) return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); diff --git a/linux-user/trace-events b/linux-user/trace-events index 6d6aeef..f6de1b8 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -16,3 +16,4 @@ user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_add target_mprotect(uint64_t start, uint64_t len, int flags) "start=0x%"PRIx64 " len=0x%"PRIx64 " prot=0x%x" target_mmap(uint64_t start, uint64_t len, int pflags, int mflags, int fd, uint64_t offset) "start=0x%"PRIx64 " len=0x%"PRIx64 " prot=0x%x flags=0x%x fd=%d offset=0x%"PRIx64 target_mmap_complete(uint64_t retaddr) "retaddr=0x%"PRIx64 +target_munmap(uint64_t start, uint64_t len) "start=0x%"PRIx64" len=0x%"PRIx64 |