From patchwork Thu Mar 2 00:11:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 734403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vYXnZ0gYLz9s7j for ; Thu, 2 Mar 2017 11:12:33 +1100 (AEDT) Received: from localhost ([::1]:49417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjEMA-0007QP-Ev for incoming@patchwork.ozlabs.org; Wed, 01 Mar 2017 19:12:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjELn-0007Q6-V8 for qemu-devel@nongnu.org; Wed, 01 Mar 2017 19:12:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjELk-0001NL-PD for qemu-devel@nongnu.org; Wed, 01 Mar 2017 19:12:07 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:63511) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cjELk-0001Mc-E3 for qemu-devel@nongnu.org; Wed, 01 Mar 2017 19:12:04 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue004 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MP3ch-1ccvML3oMJ-006RL1; Thu, 02 Mar 2017 01:11:55 +0100 From: Laurent Vivier To: Riku Voipio Date: Thu, 2 Mar 2017 01:11:45 +0100 Message-Id: <20170302001145.6879-1-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 X-Provags-ID: V03:K0:ZDhN9FJgSWfmS3/Qyf3ZGmRI5PeEDaAbDbbp1q1aJv+TtCmCONv 2q4h7N2uong2IbRb5c83HoOpXG1svYMLPqyE1g3gg3CUpI21/cty8MBjKGgB6BkUvy7hDBj AszEgjArM674rcKdZiP4F7wz1WKmO0pa8dqcismszI9I7ytAMxvDVEl1is+ZDuq9mpPJW83 Aeo16C+PiIoYFuGShEMcg== X-UI-Out-Filterresults: notjunk:1; V01:K0:+IKn2NuOP5Q=:+HGxOwe/wf1hcgHgHXTMMt UJ33oGWHDJmd7Kd3d2JLEujnAUOT2Uns944XE1vvaeerCTUqMUZ07RXGVLDUh+SK8CiI11oVT iEThQbmX1zWbgV7wHzw6y8HIeDT+iJQBNWwA99XbiygGw/ol6LnSzibWwS5jY3FIWWxGosIFX fVVhCP01NhmPgbgzzo5zScC680ksFviGAuwse0nLnSLjk0lPc0/+xmog9kjHJLrArggrRah8X B0mz7o4Nn7jvFMnIYElQcSjGJtCaxGWClZ5F3Dk08l6AWCrcdlOquW/PszjzmMk+t8IT/Xqlr iPpJdvoOysRKz85kfeyJBRKxjec6UhhydnPHYYE2ydcuJnBqKwGSddI76frs1aOFUg/yHqteX MAe9Du1F+Zdrj3Jo498WH1+eMQX70SpNscKSjXxUA0AJB41PJYCKhr+Se4loVARZEiGXBpKOh 06iVubUshsREhi2vdZDjIrbqQ7Smz82RgCEjbuQfEx+hWnSNN+M69F14xJUjVeOBDfj53idlN TIjMuM1DmMaxP35RdroWvJB2epoGEMfvZ9CWY6zyHwT828RobSuf9kuCjrRQZY4BTWmlhtmPK 3YIYc267H9fyNg2h1Djqx+IgJNCB4iC4odX9ofTpfma0TOzVu9o4nRb+KST/EiuE2sH0Jlg4e +tQOVGuUEyLgTusffpKEAa2v/TtDpNuIyZ9gelxf2z+EA3VJNTw70c3oPD12qJ1gOnzw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH] linux-user: fix fadvise64_64() on ppc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On ppc, advice is arg2, not arg6: long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low, u32 len_high, u32 len_low) Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 2da8426..671b13a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11261,6 +11261,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR_fadvise64_64 case TARGET_NR_fadvise64_64: +#if defined(TARGET_PPC) + /* 6 args: fd, advice, offset (high, low), len (high, low) */ + ret = arg2; + arg2 = arg3; + arg3 = arg4; + arg4 = arg5; + arg5 = arg6; + arg6 = ret; +#else /* 6 args: fd, offset (high, low), len (high, low), advice */ if (regpairs_aligned(cpu_env)) { /* offset is in (3,4), len in (5,6) and advice in 7 */ @@ -11270,6 +11279,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, arg5 = arg6; arg6 = arg7; } +#endif ret = -host_to_target_errno(posix_fadvise(arg1, target_offset64(arg2, arg3), target_offset64(arg4, arg5),