From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 03/13] linux-user: protect fcntl64 with an #ifdef
Date: Tue, 7 Apr 2020 16:51:08 +0100 [thread overview]
Message-ID: <20200407155118.20139-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200407155118.20139-1-alex.bennee@linaro.org>
Checking TARGET_ABI_BITS is sketchy - we should check for the presence
of the define to be sure. Also clean up the white space while we are
there.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200403191150.863-3-alex.bennee@linaro.org>
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5af55fca781..b679bc6b136 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11331,11 +11331,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
This is a hint, so ignoring and returning success is ok. */
return 0;
#endif
-#if TARGET_ABI_BITS == 32
+#ifdef TARGET_NR_fcntl64
case TARGET_NR_fcntl64:
{
- int cmd;
- struct flock64 fl;
+ int cmd;
+ struct flock64 fl;
from_flock64_fn *copyfrom = copy_from_user_flock64;
to_flock64_fn *copyto = copy_to_user_flock64;
@@ -11346,7 +11346,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
}
#endif
- cmd = target_to_host_fcntl_cmd(arg2);
+ cmd = target_to_host_fcntl_cmd(arg2);
if (cmd == -TARGET_EINVAL) {
return cmd;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-07 15:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 15:51 [PULL for 5.0-rc2 00/13] various fixes Alex Bennée
2020-04-07 15:51 ` [PULL 01/13] .github: Enable repo-lockdown bot to refuse GitHub pull requests Alex Bennée
2020-04-07 15:51 ` [PULL 02/13] elf-ops: bail out if we have no function symbols Alex Bennée
2020-04-07 15:51 ` Alex Bennée [this message]
2020-04-07 15:51 ` [PULL 04/13] tests/tcg: remove extraneous pasting macros Alex Bennée
2020-04-07 15:51 ` [PULL 05/13] linux-user: more debug for init_guest_space Alex Bennée
2020-04-07 15:51 ` [PULL 06/13] target/xtensa: add FIXME for translation memory leak Alex Bennée
2020-04-07 15:51 ` [PULL 07/13] gdbstub: fix compiler complaining Alex Bennée
2020-04-07 15:51 ` [PULL 08/13] softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal Alex Bennée
2020-04-10 9:38 ` Aleksandar Markovic
2020-04-10 15:17 ` Richard Henderson
2020-04-10 15:54 ` Aleksandar Markovic
2020-04-10 16:13 ` Peter Maydell
2020-04-10 18:33 ` Aleksandar Markovic
2020-04-11 12:55 ` Alex Bennée
2020-04-07 15:51 ` [PULL 09/13] linux-user: factor out reading of /proc/self/maps Alex Bennée
2020-04-07 15:51 ` [PULL 10/13] linux-user: clean-up padding on /proc/self/maps Alex Bennée
2020-04-07 15:51 ` [PULL 11/13] hw/core: properly terminate loading .hex on EOF record Alex Bennée
2020-04-07 15:51 ` [PULL 12/13] configure: Add -Werror to PIE probe Alex Bennée
2020-04-07 16:08 ` Mark Cave-Ayland
2020-04-07 16:25 ` Richard Henderson
2020-04-07 15:51 ` [PULL 13/13] tcg/i386: Fix %r12 guest_base initialization Alex Bennée
2020-04-07 22:13 ` [PULL for 5.0-rc2 00/13] various fixes Peter Maydell
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=20200407155118.20139-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
/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).