OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: rename TargetFdFunc to TargetFdDataFunc, and structure fields accordingly

Browse Source 
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>
This commit is contained in:
Laurent Vivier 2015-10-28 21:40:43 +01:00 committed by Riku Voipio
parent ff626f2d9e
commit 5d4d366585
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux-user/syscall.c
View File

@ -295,20 +295,20 @@ static bitmask_transtbl fcntl_flags_tbl[] = {
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
typedef abi_long (*TargetFdFunc)(void *, size_t); typedef abi_long (*TargetFdDataFunc)(void *, size_t);
typedef struct TargetFdTrans { typedef struct TargetFdTrans {
TargetFdFunc host_to_target; TargetFdDataFunc host_to_target_data;
TargetFdFunc target_to_host; TargetFdDataFunc target_to_host_data;
} TargetFdTrans; } TargetFdTrans;
static TargetFdTrans **target_fd_trans; static TargetFdTrans **target_fd_trans;
static unsigned int target_fd_max; 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]) { 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; return NULL;
} }
@ -5437,7 +5437,7 @@ host_to_target_signalfd_siginfo(struct signalfd_siginfo *tinfo,
tinfo->ssi_addr = tswap64(info->ssi_addr); 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; int i;
@ -5449,7 +5449,7 @@ static abi_long host_to_target_signalfd(void *buf, size_t len)
} }
static TargetFdTrans target_signalfd_trans = { 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) static abi_long do_signalfd4(int fd, abi_long mask, int flags)
@ -5866,8 +5866,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
goto efault; goto efault;
ret = get_errno(read(arg1, p, arg3)); ret = get_errno(read(arg1, p, arg3));
if (ret >= 0 && if (ret >= 0 &&
fd_trans_host_to_target(arg1)) { fd_trans_host_to_target_data(arg1)) {
ret = fd_trans_host_to_target(arg1)(p, ret); ret = fd_trans_host_to_target_data(arg1)(p, ret);
} }
unlock_user(p, arg2, ret); unlock_user(p, arg2, ret);
} }