[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] linux-user: Move if-elses to a switch statemen
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 03/14] linux-user: Move if-elses to a switch statement. |
Date: |
Fri, 2 May 2014 22:15:38 +0300 |
From: Huw Davies <address@hidden>
This makes adding more message types cleaner.
Signed-off-by: Huw Davies <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/syscall.c | 51 +++++++++++++++++++++++++++++++++------------------
1 file changed, 33 insertions(+), 18 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5203cc4..52bd000 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1242,25 +1242,40 @@ static inline abi_long host_to_target_cmsg(struct
target_msghdr *target_msgh,
target_cmsg->cmsg_type = tswap32(cmsg->cmsg_type);
target_cmsg->cmsg_len = tswapal(TARGET_CMSG_LEN(len));
- if ((cmsg->cmsg_level == SOL_SOCKET) &&
- (cmsg->cmsg_type == SCM_RIGHTS)) {
- int *fd = (int *)data;
- int *target_fd = (int *)target_data;
- int i, numfds = len / sizeof(int);
+ switch (cmsg->cmsg_level) {
+ case SOL_SOCKET:
+ switch (cmsg->cmsg_type) {
+ case SCM_RIGHTS:
+ {
+ int *fd = (int *)data;
+ int *target_fd = (int *)target_data;
+ int i, numfds = len / sizeof(int);
- for (i = 0; i < numfds; i++)
- target_fd[i] = tswap32(fd[i]);
- } else if ((cmsg->cmsg_level == SOL_SOCKET) &&
- (cmsg->cmsg_type == SO_TIMESTAMP) &&
- (len == sizeof(struct timeval))) {
- /* copy struct timeval to target */
- struct timeval *tv = (struct timeval *)data;
- struct target_timeval *target_tv =
- (struct target_timeval *)target_data;
-
- target_tv->tv_sec = tswapal(tv->tv_sec);
- target_tv->tv_usec = tswapal(tv->tv_usec);
- } else {
+ for (i = 0; i < numfds; i++)
+ target_fd[i] = tswap32(fd[i]);
+ break;
+ }
+ case SO_TIMESTAMP:
+ {
+ struct timeval *tv = (struct timeval *)data;
+ struct target_timeval *target_tv =
+ (struct target_timeval *)target_data;
+
+ if (len != sizeof(struct timeval))
+ goto unimplemented;
+
+ /* copy struct timeval to target */
+ target_tv->tv_sec = tswapal(tv->tv_sec);
+ target_tv->tv_usec = tswapal(tv->tv_usec);
+ break;
+ }
+ default:
+ goto unimplemented;
+ }
+ break;
+
+ default:
+ unimplemented:
gemu_log("Unsupported ancillary data: %d/%d\n",
cmsg->cmsg_level, cmsg->cmsg_type);
memcpy(target_data, data, len);
--
2.0.0.rc0
- [Qemu-devel] [PULL 00/14] linux-user update, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 01/14] linux-user: Add /proc/self/exe open forwarding, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 03/14] linux-user: Move if-elses to a switch statement.,
riku . voipio <=
- [Qemu-devel] [PULL 06/14] linux-user: avoid using glibc internals in _syscall5 and in definition of target_sigevent struct, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 02/14] linux-user: Assert stack used for auxvec, envp, argv, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 11/14] linux-user/elfload.c: Fix incorrect ARM HWCAP bits, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 08/14] linux-user: rename cpu- uname -> uname, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 05/14] linux-user: Handle arches with llseek instead of _llseek, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 04/14] linux-user: Add support for SCM_CREDENTIALS., riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 14/14] linux-user/elfload.c: Support ARM HWCAP2 flags, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 07/14] linux-user/signal.c: Set fault address in AArch64 signal info, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 13/14] linux-user/elfload.c: Fix A64 code which was incorrectly acting like A32, riku . voipio, 2014/05/02
- [Qemu-devel] [PULL 12/14] linux-user/elfload.c: Update ARM HWCAP bits, riku . voipio, 2014/05/02