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

Merge branch 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k into staging

Browse Source 
* 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k:
  linux-user: correct reboot()
  linux-user: correct setsockopt()
  linux-user: correct print_timeval() swap tv_sec and tv_usec
  linux-user: correct msgrcv()

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-02-06 16:39:04 -06:00
commit bd4bd24ed3
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/strace.c
View File

@ -682,7 +682,7 @@ print_timeval(abi_ulong tv_addr, int last)
if (!tv) if (!tv)
return; return;
gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s",
tv->tv_sec, tv->tv_usec, get_comma(last)); tswapal(tv->tv_sec), tswapal(tv->tv_usec), get_comma(last));
unlock_user(tv, tv_addr, 0); unlock_user(tv, tv_addr, 0);
} else } else
gemu_log("NULL%s", get_comma(last)); gemu_log("NULL%s", get_comma(last));

48
linux-user/syscall.c
View File

@ -101,6 +101,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/vt.h> #include <linux/vt.h>
#include <linux/dm-ioctl.h> #include <linux/dm-ioctl.h>
#include <linux/reboot.h>
#include "linux_loop.h" #include "linux_loop.h"
#include "cpu-uname.h" #include "cpu-uname.h"
@ -1489,6 +1490,28 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
break; break;
case TARGET_SOL_SOCKET: case TARGET_SOL_SOCKET:
switch (optname) { switch (optname) {
case TARGET_SO_RCVTIMEO:
{
struct timeval tv;
optname = SO_RCVTIMEO;
set_timeout:
if (optlen != sizeof(struct target_timeval)) {
return -TARGET_EINVAL;
}
if (copy_from_user_timeval(&tv, optval_addr)) {
return -TARGET_EFAULT;
}
ret = get_errno(setsockopt(sockfd, SOL_SOCKET, optname,
&tv, sizeof(tv)));
return ret;
}
case TARGET_SO_SNDTIMEO:
optname = SO_SNDTIMEO;
goto set_timeout;
/* Options with 'int' argument. */ /* Options with 'int' argument. */
case TARGET_SO_DEBUG: case TARGET_SO_DEBUG:
optname = SO_DEBUG; optname = SO_DEBUG;
@ -1540,12 +1563,6 @@ static abi_long do_setsockopt(int sockfd, int level, int optname,
case TARGET_SO_RCVLOWAT: case TARGET_SO_RCVLOWAT:
optname = SO_RCVLOWAT; optname = SO_RCVLOWAT;
break; break;
case TARGET_SO_RCVTIMEO:
optname = SO_RCVTIMEO;
break;
case TARGET_SO_SNDTIMEO:
optname = SO_SNDTIMEO;
break;
break; break;
default: default:
goto unimplemented; goto unimplemented;
@ -2897,7 +2914,7 @@ static inline abi_long do_msgrcv(int msqid, abi_long msgp,
return -TARGET_EFAULT; return -TARGET_EFAULT;
host_mb = g_malloc(msgsz+sizeof(long)); host_mb = g_malloc(msgsz+sizeof(long));
ret = get_errno(msgrcv(msqid, host_mb, msgsz, tswapal(msgtyp), msgflg)); ret = get_errno(msgrcv(msqid, host_mb, msgsz, msgtyp, msgflg));
if (ret > 0) { if (ret > 0) {
abi_ulong target_mtext_addr = msgp + sizeof(abi_ulong); abi_ulong target_mtext_addr = msgp + sizeof(abi_ulong);
@ -3189,7 +3206,7 @@ static abi_long do_ipc(unsigned int call, int first,
break; break;
} }
ret = do_msgrcv(first, tmp->msgp, second, tmp->msgtyp, third); ret = do_msgrcv(first, tswapal(tmp->msgp), second, tswapal(tmp->msgtyp), third);
unlock_user_struct(tmp, ptr, 0); unlock_user_struct(tmp, ptr, 0);
break; break;
@ -6435,10 +6452,17 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
break; break;
#endif #endif
case TARGET_NR_reboot: case TARGET_NR_reboot:
if (!(p = lock_user_string(arg4))) if (arg3 == LINUX_REBOOT_CMD_RESTART2) {
goto efault; /* arg4 must be ignored in all other cases */
ret = reboot(arg1, arg2, arg3, p); p = lock_user_string(arg4);
unlock_user(p, arg4, 0); if (!p) {
goto efault;
}
ret = get_errno(reboot(arg1, arg2, arg3, p));
unlock_user(p, arg4, 0);
} else {
ret = get_errno(reboot(arg1, arg2, arg3, NULL));
}
break; break;
#ifdef TARGET_NR_readdir #ifdef TARGET_NR_readdir
case TARGET_NR_readdir: case TARGET_NR_readdir: