From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LCKZY-0005e5-Ls for qemu-devel@nongnu.org; Mon, 15 Dec 2008 16:01:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LCKZX-0005cS-7J for qemu-devel@nongnu.org; Mon, 15 Dec 2008 16:01:48 -0500 Received: from [199.232.76.173] (port=46240 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LCKZW-0005cB-L0 for qemu-devel@nongnu.org; Mon, 15 Dec 2008 16:01:46 -0500 Received: from soufre.accelance.net ([213.162.48.15]:64184) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LCKZV-0006Tl-RT for qemu-devel@nongnu.org; Mon, 15 Dec 2008 16:01:46 -0500 Received: from [192.168.0.3] (potipota.net [88.168.176.51]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by soufre.accelance.net (Postfix) with ESMTP id 3353D45050 for ; Mon, 15 Dec 2008 22:01:43 +0100 (CET) Subject: Re: [Qemu-devel] [linux-user] Added posix message queue syscalls except mq_notify From: Lionel Landwerlin In-Reply-To: <20081214181152.GC7343@epbyminw8406h.minsk.epam.com> References: <1229171967.3898.59.camel@cocoduo.atr> <20081214181152.GC7343@epbyminw8406h.minsk.epam.com> Content-Type: text/plain; charset=UTF-8 Date: Mon, 15 Dec 2008 22:01:41 +0100 Message-Id: <1229374901.4966.3.camel@cocoduo.atr> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Le dimanche 14 d=C3=A9cembre 2008 =C3=A0 20:11 +0200, Kirill A. Shutemov = a =C3=A9crit : > On Sat, Dec 13, 2008 at 01:39:27PM +0100, Lionel Landwerlin wrote: Here is a second version of my patch for mq_open, mq_getsetattr, mq_timedsend, mq_timedreceive and mq_unlink syscalls. >>From 2aaa1d66232da3bee0fcdac93bbab09f12ce4b19 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 1 Dec 2008 02:42:24 +0100 Subject: [PATCH] Added posix message queue syscalls except mq_notify Signed-off-by: Lionel Landwerlin --- linux-user/syscall.c | 147 +++++++++++++++++++++++++++++++++++++++= ----- linux-user/syscall_defs.h | 9 +++- 2 files changed, 138 insertions(+), 18 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 73427ab..39f26b5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -629,6 +630,43 @@ static inline abi_long copy_to_user_timeval(abi_ulon= g target_tv_addr, return 0; } =20 +static inline abi_long copy_from_user_mq_attr(struct mq_attr *attr, + abi_ulong target_mq_attr_a= ddr) +{ + struct target_mq_attr *target_mq_attr; + + if (!lock_user_struct(VERIFY_READ, target_mq_attr, + target_mq_attr_addr, 1)) + return -TARGET_EFAULT; + + __get_user(attr->mq_flags, &target_mq_attr->mq_flags); + __get_user(attr->mq_maxmsg, &target_mq_attr->mq_maxmsg); + __get_user(attr->mq_msgsize, &target_mq_attr->mq_msgsize); + __get_user(attr->mq_curmsgs, &target_mq_attr->mq_curmsgs); + + unlock_user_struct(target_mq_attr, target_mq_attr_addr, 0); + + return 0; +} + +static inline abi_long copy_to_user_mq_attr(abi_ulong target_mq_attr_add= r, + const struct mq_attr *attr) +{ + struct target_mq_attr *target_mq_attr; + + if (!lock_user_struct(VERIFY_WRITE, target_mq_attr, + target_mq_attr_addr, 0)) + return -TARGET_EFAULT; + + __put_user(attr->mq_flags, &target_mq_attr->mq_flags); + __put_user(attr->mq_maxmsg, &target_mq_attr->mq_maxmsg); + __put_user(attr->mq_msgsize, &target_mq_attr->mq_msgsize); + __put_user(attr->mq_curmsgs, &target_mq_attr->mq_curmsgs); + + unlock_user_struct(target_mq_attr, target_mq_attr_addr, 1); + + return 0; +} =20 /* do_select() must return target values and target errnos. */ static abi_long do_select(int n, @@ -6035,6 +6073,81 @@ abi_long do_syscall(void *cpu_env, int num, abi_lo= ng arg1, break; #endif =20 +#ifdef TARGET_NR_mq_open + case TARGET_NR_mq_open: + { + struct mq_attr posix_mq_attr; + + p =3D lock_user_string(arg1 - 1); + if (arg4 !=3D 0) + copy_from_user_mq_attr (&posix_mq_attr, arg4); + ret =3D get_errno(mq_open(p, arg2, arg3, &posix_mq_attr)); + unlock_user (p, arg1, 0); + break; + } + + case TARGET_NR_mq_unlink: + p =3D lock_user_string(arg1 - 1); + ret =3D get_errno(mq_unlink(p)); + unlock_user (p, arg1, 0); + break; + + case TARGET_NR_mq_timedsend: + { + struct timespec ts; + + p =3D lock_user (VERIFY_READ, arg2, arg3, 1); + if (arg5 !=3D 0) { + target_to_host_timespec(&ts, arg5); + ret =3D get_errno(mq_timedsend(arg1, p, arg3, arg4, &ts)); + host_to_target_timespec(arg5, &ts); + } + else + ret =3D get_errno(mq_send(arg1, p, arg3, arg4)); + unlock_user (p, arg2, arg3); + break; + } + + case TARGET_NR_mq_timedreceive: + { + struct timespec ts; + unsigned int prio; + + p =3D lock_user (VERIFY_READ, arg2, arg3, 1); + if (arg5 !=3D 0) { + target_to_host_timespec(&ts, arg5); + ret =3D get_errno(mq_timedreceive(arg1, p, arg3, &prio, &ts)= ); + host_to_target_timespec(arg5, &ts); + } + else + ret =3D get_errno(mq_receive(arg1, p, arg3, &prio)); + unlock_user (p, arg2, arg3); + if (arg4 !=3D 0) + put_user_u32(prio, arg4); + break; + } + + /* Not implemented for now... */ +/* case TARGET_NR_mq_notify: */ +/* break; */ + + case TARGET_NR_mq_getsetattr: + { + struct mq_attr posix_mq_attr_in, posix_mq_attr_out; + + if (arg3 !=3D 0) { + ret =3D mq_getattr(arg1, &posix_mq_attr_out); + copy_to_user_mq_attr(arg3, &posix_mq_attr_out); + } + if (arg2 !=3D 0) { + copy_from_user_mq_attr(&posix_mq_attr_in, arg2); + ret |=3D mq_setattr(arg1, &posix_mq_attr_in, &posix_mq_attr_= out); + } + + break; + } +#endif + default: unimplemented: gemu_log("qemu: Unsupported syscall: %d\n", num); diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 86c9d82..728fedb 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1997,6 +1997,13 @@ struct linux_dirent64 { char d_name[256]; }; =20 +struct target_mq_attr { + abi_long mq_flags; + abi_long mq_maxmsg; + abi_long mq_msgsize; + abi_long mq_curmsgs; +}; + #include "socket.h" =20 #include "errno_defs.h" --=20 1.5.6.5