From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThMCX-0006aF-T9 for qemu-devel@nongnu.org; Sat, 08 Dec 2012 10:20:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ThMCW-0007M4-H6 for qemu-devel@nongnu.org; Sat, 08 Dec 2012 10:20:25 -0500 Received: from smtp6-g21.free.fr ([2a01:e0c:1:1599::15]:36981) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ThMCV-0007Lj-UI for qemu-devel@nongnu.org; Sat, 08 Dec 2012 10:20:24 -0500 From: Laurent Vivier Date: Sat, 8 Dec 2012 16:20:16 +0100 Message-Id: <1354980016-19116-1-git-send-email-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] =?utf-8?q?=5BPATCH=5D_linux-user=3A_add_string_type_?= =?utf-8?b?aW4gcnRlbnRyeSBzdHJ1Y3QgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB0?= =?utf-8?q?o_be_able_to_pass_the_device_name?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Riku Voipio , Laurent Vivier 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 0415135..849fc7a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3691,6 +3691,70 @@ static IOCTLEntry ioctl_entries[] =3D { { 0, 0, }, }; =20 +static void target_to_host_string (void *dst, const void *src) +{ +#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 + if (*(uint32_t*)src =3D=3D 0) { + *(uint32_t*)dst =3D 0; + return; + } + *(uint32_t *)dst =3D (uint32_t)g2h(tswap32(*(uint32_t *)src)); +#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 + if (*(uint32_t*)src =3D=3D 0) { + *(uint64_t*)dst =3D 0; + return; + } + *(uint64_t *)dst =3D (uint64_t)g2h(tswap32(*(uint32_t *)src)); +#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 + if (*(uint64_t*)src =3D=3D 0) { + *(uint64_t*)dst =3D 0; + return; + } + *(uint64_t *)dst =3D (uint64_t)g2h(tswap64(*(uint64_t *)src)); +#elif HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 64 + if (*(uint64_t*)src =3D=3D 0) { + *(uint32_t*)dst =3D 0; + return; + } + *(uint32_t *)dst =3D (uint32_t)g2h(tswap64(*(uint64_t *)src)); +#endif +} + +static void host_to_target_string (void *dst, const void *src) +{ +#if HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 32 + if (*(uint32_t*)src =3D=3D 0) { + *(uint32_t*)dst =3D 0; + return; + } + *(uint32_t *)dst =3D tswap32(h2g(*(uint32_t *)src)); +#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 32 + if (*(uint64_t*)src =3D=3D 0) { + *(uint32_t*)dst =3D 0; + return; + } + *(uint32_t *)dst =3D tswap32(h2g(*(uint64_t *)src)); +#elif HOST_LONG_BITS =3D=3D 64 && TARGET_ABI_BITS =3D=3D 64 + if (*(uint64_t*)src =3D=3D 0) { + *(uint64_t*)dst =3D 0; + return; + } + *(uint64_t *)dst =3D tswap64(h2g(*(uint64_t *)src)); +#elif HOST_LONG_BITS =3D=3D 32 && TARGET_ABI_BITS =3D=3D 64 + if (*(uint32_t*)src =3D=3D 0) { + *(uint64_t*)dst =3D 0; + return; + } + *(uint64_t *)dst =3D tswap64(h2g(*(uint32_t *)src)); +#endif +} + +static const StructEntry struct_string_def =3D { + .convert =3D { host_to_target_string, target_to_host_string }, + .size =3D { sizeof(target_long), sizeof(long) }, + .align =3D { __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)) =20 +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, TYP= E_PTRVOID, + TYPE_SHORT, TYPE_SHORT, TYPE_ULONG, TYPE_PTRVOID, TYPE_SHORT, MK_= STRUCT(STRUCT_string), TYPE_ULONG, TYPE_ULONG, TYPE_SHORT) =20 STRUCT(ifmap, --=20 1.7.10.4