From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Andreas Schwab <schwab@suse.de>, Riku Voipio <riku.voipio@iki.fi>,
Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 06/19] linux-user: implement OFD locks
Date: Fri, 5 Jun 2020 13:46:47 +0200 [thread overview]
Message-ID: <20200605114700.1052050-7-laurent@vivier.eu> (raw)
In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu>
From: Andreas Schwab <schwab@suse.de>
Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <mvm7dx0cun3.fsf@suse.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/generic/fcntl.h | 4 ++++
linux-user/syscall.c | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h
index 9f727d4df2c8..c85c5b9fed65 100644
--- a/linux-user/generic/fcntl.h
+++ b/linux-user/generic/fcntl.h
@@ -99,6 +99,10 @@
#define TARGET_F_SETLKW64 14
#endif
+#define TARGET_F_OFD_GETLK 36
+#define TARGET_F_OFD_SETLK 37
+#define TARGET_F_OFD_SETLKW 38
+
#ifndef TARGET_F_SETOWN_EX
#define TARGET_F_SETOWN_EX 15
#define TARGET_F_GETOWN_EX 16
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 63c40c48e31f..1cf638208201 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6098,6 +6098,9 @@ static int target_to_host_fcntl_cmd(int cmd)
case TARGET_F_SETFD:
case TARGET_F_GETFL:
case TARGET_F_SETFL:
+ case TARGET_F_OFD_GETLK:
+ case TARGET_F_OFD_SETLK:
+ case TARGET_F_OFD_SETLKW:
ret = cmd;
break;
case TARGET_F_GETLK:
@@ -6383,6 +6386,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
break;
case TARGET_F_GETLK64:
+ case TARGET_F_OFD_GETLK:
ret = copy_from_user_flock64(&fl64, arg);
if (ret) {
return ret;
@@ -6394,6 +6398,8 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
break;
case TARGET_F_SETLK64:
case TARGET_F_SETLKW64:
+ case TARGET_F_OFD_SETLK:
+ case TARGET_F_OFD_SETLKW:
ret = copy_from_user_flock64(&fl64, arg);
if (ret) {
return ret;
--
2.26.2
next prev parent reply other threads:[~2020-06-05 11:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 11:46 [PULL 00/19] Linux user for 5.1 patches Laurent Vivier
2020-06-05 11:46 ` [PULL 01/19] linux-user, alpha: fix oldumount syscall Laurent Vivier
2020-06-05 11:46 ` [PULL 02/19] linux-user: return target error codes for socket() and prctl() Laurent Vivier
2020-06-05 11:46 ` [PULL 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Laurent Vivier
2020-06-05 11:46 ` [PULL 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output Laurent Vivier
2020-06-05 11:46 ` [PULL 05/19] linux-user/mmap.c: fix integer underflow in target_mremap Laurent Vivier
2020-06-05 11:46 ` Laurent Vivier [this message]
2020-06-05 11:46 ` [PULL 07/19] Makefile: Only build virtiofsd if system-mode is enabled Laurent Vivier
2020-06-05 11:46 ` [PULL 08/19] configure: Avoid building TCG when not needed Laurent Vivier
2020-06-05 11:46 ` [PULL 09/19] tests/Makefile: Only display TCG-related tests when TCG is available Laurent Vivier
2020-06-05 11:46 ` [PULL 10/19] tests/Makefile: Restrict some softmmu-only tests Laurent Vivier
2020-06-05 11:46 ` [PULL 11/19] util/Makefile: Reduce the user-mode object list Laurent Vivier
2020-06-05 11:46 ` [PULL 12/19] stubs/Makefile: " Laurent Vivier
2020-06-05 11:46 ` [PULL 13/19] target/riscv/cpu: Restrict CPU migration to system-mode Laurent Vivier
2020-06-05 11:46 ` [PULL 14/19] exec: Assert CPU migration is not used on user-only build Laurent Vivier
2020-06-05 11:46 ` [PULL 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include Laurent Vivier
2020-06-05 11:46 ` [PULL 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode Laurent Vivier
2020-06-05 11:46 ` [PULL 17/19] target/s390x: " Laurent Vivier
2020-06-05 11:46 ` [PULL 18/19] hw/core: " Laurent Vivier
2020-06-05 11:47 ` [PULL 19/19] stubs: Restrict ui/win32-kbd-hook " Laurent Vivier
2020-06-05 16:45 ` [PULL 00/19] Linux user for 5.1 patches Peter Maydell
2020-06-05 19:20 ` Laurent Vivier
2020-06-05 20:32 ` Peter Maydell
2020-06-05 21:48 ` Richard Henderson
2020-06-08 5:05 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605114700.1052050-7-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
--cc=schwab@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).