From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PATCH v3 02/12] linux-user: protect fcntl64 with an #ifdef
Date: Fri, 3 Apr 2020 20:11:40 +0100 [thread overview]
Message-ID: <20200403191150.863-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200403191150.863-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>
---
linux-user/syscall.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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-03 19:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 19:11 [PATCH v3 for 5.0-rc2 00/12] a selection of random fixes Alex Bennée
2020-04-03 19:11 ` [PATCH v3 01/12] elf-ops: bail out if we have no function symbols Alex Bennée
2020-04-03 19:11 ` Alex Bennée [this message]
2020-04-03 19:11 ` [PATCH v3 03/12] tests/tcg: remove extraneous pasting macros Alex Bennée
2020-04-03 19:11 ` [PATCH v3 04/12] linux-user: more debug for init_guest_space Alex Bennée
2020-04-03 20:39 ` Philippe Mathieu-Daudé
2020-04-03 19:11 ` [PATCH v3 05/12] target/xtensa: add FIXME for translation memory leak Alex Bennée
2020-04-03 19:11 ` [PATCH v3 06/12] gdbstub: fix compiler complaining Alex Bennée
2020-04-06 10:21 ` Chenqun (kuhn)
2020-04-03 19:11 ` [PATCH v3 07/12] softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal Alex Bennée
2020-04-03 19:11 ` [PATCH v3 08/12] linux-user: factor out reading of /proc/self/maps Alex Bennée
2020-04-04 0:33 ` Richard Henderson
2020-04-06 9:09 ` Alex Bennée
2020-04-03 19:11 ` [PATCH v3 09/12] linux-user: clean-up padding on /proc/self/maps Alex Bennée
2020-04-03 19:11 ` [PATCH v3 10/12] target/arm: don't expose "ieee_half" via gdbstub Alex Bennée
2020-04-03 19:11 ` [PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record Alex Bennée
2020-04-03 19:11 ` [PATCH v3 12/12] configure: Add -Werror to PIE probe Alex Bennée
2020-04-06 21:32 ` Philippe Mathieu-Daudé
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=20200403191150.863-3-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--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).