From patchwork Thu Feb 16 14:22:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 9577347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 44068600C5 for ; Thu, 16 Feb 2017 14:52:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 300A02040D for ; Thu, 16 Feb 2017 14:52:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23CE228600; Thu, 16 Feb 2017 14:52:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A8CCF2040D for ; Thu, 16 Feb 2017 14:52:48 +0000 (UTC) Received: from localhost ([::1]:47135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceNQN-0000w5-Oa for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Feb 2017 09:52:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceMxd-00035X-59 for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:23:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceMxZ-0002TG-C2 for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:23:05 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:59359) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ceMxZ-0002Sc-0s for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:23:01 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MMF5h-1cja1H1vY5-007zKH; Thu, 16 Feb 2017 15:22:34 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 16 Feb 2017 15:22:18 +0100 Message-Id: <20170216142227.27448-6-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170216142227.27448-1-laurent@vivier.eu> References: <20170216142227.27448-1-laurent@vivier.eu> X-Provags-ID: V03:K0:THR7vrkWeYbDs7Wp/9+rfg3XI5a5BFuDr06SZiGJ0IeLu7EzjH+ H2JTjL+KcvaQJVZrGZXcLj9gpZk80eyWbGQfL4LukbcxkjvVwNUblUlWovwxFY1wmtx7mYf Xo3HPztNGur10lciYEXePcGWYsX0tn0oWiQJ6rfMgciDIsfdGSLO31vtir+sHYgiejLb1uO 4JuiHCU5ECTrM0NWW5UfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cZ2zA4/U2Ag=:jtoR9/Z4e5M2cfObZryIiC Vq1fclJMEHBcC8p1H2ubJ9h5q6AhHFVdzZfZhxM+HbrKJCuW9Ip6K1BxiGWws+bXljiSMNOum Y2DZW188/JKfTTTSZS8Hg++vyk+gMjMPGlaXY8aFNHj6QxxNF5EM8puIUtlm/kB4r41Ck/JEj dSDzN2TtAxPqUM7U7V6VV3KlAEVr63CUkN7VAUhsqz9DxA8vxoOTzNaHHE1XtrsrHdhCj9fm6 2tRFEFXIbmdxWX3w2zkyDBqGrXtwS7MCICG206PYbSKVV5KTjzKTh7Asr19+fQDEaoMjDdIfg aG3AM5d1jrt1xMmGkHxvhoLqbxfyYAzCb+QfMLXmqp0zEJuFeLCdhBmv73y+ZzQFk/3/c5bTg FBoVYy024jrnDvoItxpt6K2PL+f/z/lpNLFsp5Lx1zRFhvvfvbi2pixFJLlLdRJSa5bVEgoAo rPgAbWExhuIatV8d1kARCjW0oQtThzTHrEsq3K2i6H+ETkNs8gaeWyki2aVvvQbF2PS008T/M Km9UD0HSM3j1YzuUOrLtvvG7nODXy5kDPf3YJfWonoYgp/utxnMYfdFcrlEZdZ8cFbimK6c3U 5/+ZaOuF4BwAZQ50weFI8NINH1GXLqYnc5Ft6z9EUieEctqrl0yaSU843rR7+PGO+Rva1n0xg ygps/FS0pOE1uL8cfcF52feVlOA0CjKPfGE56LZi6exKzhZpRjDZXtsF9pieWOdbn1ig= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 05/14] linux-user: Fix readahead 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: Lena Djokic , Riku Voipio , Riku Voipio Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Lena Djokic Calculation of 64-bit offset was not correct for all cases. Signed-off-by: Lena Djokic Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index fccd631..3e88dd1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11228,7 +11228,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, arg3 = arg4; arg4 = arg5; } - ret = get_errno(readahead(arg1, ((off64_t)arg3 << 32) | arg2, arg4)); + ret = get_errno(readahead(arg1, target_offset64(arg2, arg3) , arg4)); #else ret = get_errno(readahead(arg1, arg2, arg3)); #endif