diff options
author | Laurent Vivier <laurent@vivier.eu> | 2015-10-28 21:40:43 +0100 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:28:22 -0600 |
commit | 607a7019b8cc9d08c683fdd53b6f29118ec3fea5 (patch) | |
tree | d12f92748adbc61a162c3d9615607c5f43baa619 /linux-user | |
parent | 5fd020c44d43cfb05201c74ef8a7ce1797326094 (diff) | |
download | hqemu-607a7019b8cc9d08c683fdd53b6f29118ec3fea5.zip hqemu-607a7019b8cc9d08c683fdd53b6f29118ec3fea5.tar.gz |
linux-user: rename TargetFdFunc to TargetFdDataFunc, and structure fields accordingly
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r-- | linux-user/syscall.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 49a0a2d..47a0007 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -296,20 +296,20 @@ static bitmask_transtbl fcntl_flags_tbl[] = { { 0, 0, 0, 0 } }; -typedef abi_long (*TargetFdFunc)(void *, size_t); +typedef abi_long (*TargetFdDataFunc)(void *, size_t); typedef struct TargetFdTrans { - TargetFdFunc host_to_target; - TargetFdFunc target_to_host; + TargetFdDataFunc host_to_target_data; + TargetFdDataFunc target_to_host_data; } TargetFdTrans; static TargetFdTrans **target_fd_trans; static unsigned int target_fd_max; -static TargetFdFunc fd_trans_host_to_target(int fd) +static TargetFdDataFunc fd_trans_host_to_target_data(int fd) { if (fd < target_fd_max && target_fd_trans[fd]) { - return target_fd_trans[fd]->host_to_target; + return target_fd_trans[fd]->host_to_target_data; } return NULL; } @@ -5438,7 +5438,7 @@ host_to_target_signalfd_siginfo(struct signalfd_siginfo *tinfo, tinfo->ssi_addr = tswap64(info->ssi_addr); } -static abi_long host_to_target_signalfd(void *buf, size_t len) +static abi_long host_to_target_data_signalfd(void *buf, size_t len) { int i; @@ -5450,7 +5450,7 @@ static abi_long host_to_target_signalfd(void *buf, size_t len) } static TargetFdTrans target_signalfd_trans = { - .host_to_target = host_to_target_signalfd, + .host_to_target_data = host_to_target_data_signalfd, }; static abi_long do_signalfd4(int fd, abi_long mask, int flags) @@ -5873,8 +5873,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, goto efault; ret = get_errno(read(arg1, p, arg3)); if (ret >= 0 && - fd_trans_host_to_target(arg1)) { - ret = fd_trans_host_to_target(arg1)(p, ret); + fd_trans_host_to_target_data(arg1)) { + ret = fd_trans_host_to_target_data(arg1)(p, ret); } unlock_user(p, arg2, ret); } |