proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-16 08:13:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Perform target->host signal mapping for *kill syscalls.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4625 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2008-05-30 18:05:19 +00:00
parent f8ed7070ea
commit 4cb05961c2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux-user/qemu.h
View File

@ -187,6 +187,7 @@ void signal_init(void);
int queue_signal(int sig, target_siginfo_t *info); int queue_signal(int sig, target_siginfo_t *info);
void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info); void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info);
void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo); void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo);
int target_to_host_signal(int sig);
long do_sigreturn(CPUState *env); long do_sigreturn(CPUState *env);
long do_rt_sigreturn(CPUState *env); long do_rt_sigreturn(CPUState *env);
abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp); abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp);

6
linux-user/signal.c
View File

@ -113,11 +113,15 @@ static inline int sas_ss_flags(unsigned long sp)
static inline int host_to_target_signal(int sig) static inline int host_to_target_signal(int sig)
{ {
if (sig > 64)
return sig;
return host_to_target_signal_table[sig]; return host_to_target_signal_table[sig];
} }
static inline int target_to_host_signal(int sig) int target_to_host_signal(int sig)
{ {
if (sig > 64)
return sig;
return target_to_host_signal_table[sig]; return target_to_host_signal_table[sig];
} }

7
linux-user/syscall.c
View File

@ -3488,7 +3488,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ret = 0; ret = 0;
break; break;
case TARGET_NR_kill: case TARGET_NR_kill:
ret = get_errno(kill(arg1, arg2)); ret = get_errno(kill(arg1, target_to_host_signal(arg2)));
break; break;
case TARGET_NR_rename: case TARGET_NR_rename:
{ {
@ -5583,13 +5583,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_tkill) && defined(__NR_tkill) #if defined(TARGET_NR_tkill) && defined(__NR_tkill)
case TARGET_NR_tkill: case TARGET_NR_tkill:
ret = get_errno(sys_tkill((int)arg1, (int)arg2)); ret = get_errno(sys_tkill((int)arg1, target_to_host_signal(arg2)));
break; break;
#endif #endif
#if defined(TARGET_NR_tgkill) && defined(__NR_tgkill) #if defined(TARGET_NR_tgkill) && defined(__NR_tgkill)
case TARGET_NR_tgkill: case TARGET_NR_tgkill:
ret = get_errno(sys_tgkill((int)arg1, (int)arg2, (int)arg3)); ret = get_errno(sys_tgkill((int)arg1, (int)arg2,
target_to_host_signal(arg3)));
break; break;
#endif #endif