From: Alex Bennée <alex.bennee@linaro.org>
Date: Fri, 3 Apr 2020 19:11:40 +0000 (+0100)
Subject: linux-user: protect fcntl64 with an #ifdef
X-Git-Tag: qemu-xen-4.14.0~25^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bbf5f2a1aa39fcab01000a0f3b566f1e6b788a23;p=qemu-xen.git

linux-user: protect fcntl64 with an #ifdef

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 5af55fca78..b679bc6b13 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;
         }