From patchwork Thu Dec 20 20:56:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: linux-user: add string type in rtentry struct Date: Thu, 20 Dec 2012 10:56:13 -0000 From: Laurent Vivier X-Patchwork-Id: 207706 Message-Id: <1356036973-19376-1-git-send-email-laurent@vivier.eu> To: qemu-devel@nongnu.org Cc: Riku Voipio , Laurent Vivier This allows to pass the device name. You can test this with the "route" command. WITHOUT this patch: $ sudo route add -net default gw 10.0.3.1 eth0 SIOCADDRT: Bad address $ netstat -nr Kernel IP routing table Destination Gateway Genmask Flags MSS Window irtt Iface 10.0.3.0 0.0.0.0 255.255.255.0 U 0 0 0 eth0 WITH this patch: $ sudo route add -net default gw 10.0.3.1 eth0 $ netstat -nr Kernel IP routing table Destination Gateway Genmask Flags MSS Window irtt Iface 0.0.0.0 10.0.3.1 0.0.0.0 UG 0 0 0 eth0 10.0.3.0 0.0.0.0 255.255.255.0 U 0 0 0 eth0 Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ linux-user/syscall_types.h | 4 ++- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 501002b..c2a2343 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3691,6 +3691,70 @@ static IOCTLEntry ioctl_entries[] = { { 0, 0, }, }; +static void target_to_host_string (void *dst, const void *src) +{ +#if HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 32 + if (*(uint32_t*)src == 0) { + *(uint32_t*)dst = 0; + return; + } + *(uint32_t *)dst = (uint32_t)g2h(tswap32(*(uint32_t *)src)); +#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 32 + if (*(uint32_t*)src == 0) { + *(uint64_t*)dst = 0; + return; + } + *(uint64_t *)dst = (uint64_t)g2h(tswap32(*(uint32_t *)src)); +#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64 + if (*(uint64_t*)src == 0) { + *(uint64_t*)dst = 0; + return; + } + *(uint64_t *)dst = (uint64_t)g2h(tswap64(*(uint64_t *)src)); +#elif HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 64 + if (*(uint64_t*)src == 0) { + *(uint32_t*)dst = 0; + return; + } + *(uint32_t *)dst = (uint32_t)g2h(tswap64(*(uint64_t *)src)); +#endif +} + +static void host_to_target_string (void *dst, const void *src) +{ +#if HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 32 + if (*(uint32_t*)src == 0) { + *(uint32_t*)dst = 0; + return; + } + *(uint32_t *)dst = tswap32(h2g(*(uint32_t *)src)); +#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 32 + if (*(uint64_t*)src == 0) { + *(uint32_t*)dst = 0; + return; + } + *(uint32_t *)dst = tswap32(h2g(*(uint64_t *)src)); +#elif HOST_LONG_BITS == 64 && TARGET_ABI_BITS == 64 + if (*(uint64_t*)src == 0) { + *(uint64_t*)dst = 0; + return; + } + *(uint64_t *)dst = tswap64(h2g(*(uint64_t *)src)); +#elif HOST_LONG_BITS == 32 && TARGET_ABI_BITS == 64 + if (*(uint32_t*)src == 0) { + *(uint64_t*)dst = 0; + return; + } + *(uint64_t *)dst = tswap64(h2g(*(uint32_t *)src)); +#endif +} + +static const StructEntry struct_string_def = { + .convert = { host_to_target_string, target_to_host_string }, + .size = { sizeof(target_long), sizeof(long) }, + .align = { __alignof__(target_long), __alignof__(long) }, +}; + /* ??? Implement proper locking for ioctls. */ /* do_ioctl() Must return target values and target errnos. */ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg) diff --git a/linux-user/syscall_types.h b/linux-user/syscall_types.h index 44b6a58..51fc023 100644 --- a/linux-user/syscall_types.h +++ b/linux-user/syscall_types.h @@ -14,9 +14,11 @@ STRUCT(serial_icounter_struct, STRUCT(sockaddr, TYPE_SHORT, MK_ARRAY(TYPE_CHAR, 14)) +STRUCT_SPECIAL(string) + STRUCT(rtentry, TYPE_ULONG, MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), MK_STRUCT(STRUCT_sockaddr), - TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, TYPE_PTRVOID, + TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, MK_STRUCT(STRUCT_string), TYPE_ULONG, TYPE_ULONG, TYPE_SHORT) STRUCT(ifmap,