From patchwork Thu Feb 16 14:38:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 728801 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 3vPLhl4Z3Hz9s8V for ; Fri, 17 Feb 2017 03:09:59 +1100 (AEDT) Received: from localhost ([::1]:47567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceOd2-0006SP-Vi for incoming@patchwork.ozlabs.org; Thu, 16 Feb 2017 11:09:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceNCo-0000kr-Ba for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceNCl-0002OF-JE for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:46 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:55069) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ceNCl-0002NC-9P for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:43 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LbrfA-1bv6pW0pBk-00jHF0; Thu, 16 Feb 2017 15:38:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 16 Feb 2017 15:38:06 +0100 Message-Id: <20170216143816.2384-5-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170216143816.2384-1-laurent@vivier.eu> References: <20170216143816.2384-1-laurent@vivier.eu> X-Provags-ID: V03:K0:rNnkzzgGZ9a/iKw+XLpCPFjIlG5DpvQsyNnh7w4HtJidwG1/Apm N0Ud83jIP5nMDH3Esf2JGY5yYGuzTqBB9dCdsjN+9KJhQy/bwJigyFyUZXelLNJC77y+Zz8 h0t1jFgmv8QFeDcpJwlIpA/CbXMpD9+e02ZJ4LU4HdB+Oevph4ryS7sOCXUd2otjVpH74Za viNv5mQen+q/SRsuKRIgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+w3qdrtLiB8=:GNwPzGmBYZoNemdR2i+ATl TdCYjZ3GuXsLFGD5pKJXen1jsLUFdnZ/B7RaCGVYu8l+MfUzFMa8BLh/oVi+KGxEca/Dn8cmS TDIdAhFncbjQwy951w2ZlmEieBBn7YfB6JkiFRKhDxNtO5DUo+w3Wz9rbSB0PKEBXarkgToNg ITM0UM4PgX5FXoZs9S0g3FpkklMG3/kt2iSNVy5e6L0NpFJmM513gncrgw0DIP6F4AfwoQlhQ PWEd54TNpNOfS5xPiRUDF0zCr1iXFmxiWOAMJlzBcclNRXPN1B1Kqw3n6tdWHeGTAQeuWj1ge yAWGX/5ZMFGD77dyVEjKA0heac8H08qoHE5F+5MSr1ARWLWxgqUrY9+EcNG/MmzYUW9oS7MxB yJLrz2OIlKtcqX415WJPvJIypT/18uJJ9FXoCNRKERlWh2sOMph5rIUQd/jn6xxZ2NDoLkd3m tXYYrefqe1Xngqy2kpQuAJiYqEYp/WXnBhIYbHWG4aw5MhHAh4kYA5RUJIPXw2U25EKnJg1DZ eMA1Kj3j0UVk08E0t5JmRwRrlB6F9MY13gaB3c1r9y9sJmfsI79eMCH4Q4HC4FuTo3oaweECh ggljk3+rkiPoMlLo2KhGzhSD9hZ/VvOI4uiK3iwJlqtNQjGHovhYKe41AZzasC3Kwe5wY+a0a OnCgrU+MtMzcnJxHAhHUrJXRnA+JU31IOGZ4voiQgP8mmVdOU/6/3s/a09V5kvazhIx0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL v2 04/14] linux-user: Fix inotify_init1 support 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Lena Djokic This commit adds necessary conversion of argument passed to inotify_init1. inotify_init1 flags can be IN_NONBLOCK and IN_CLOEXEC which rely on O_NONBLOCK and O_CLOEXEC and those can have different values on different platforms. Signed-off-by: Lena Djokic Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9be8e95..fccd631 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11561,7 +11561,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef CONFIG_INOTIFY1 #if defined(TARGET_NR_inotify_init1) && defined(__NR_inotify_init1) case TARGET_NR_inotify_init1: - ret = get_errno(sys_inotify_init1(arg1)); + ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1, + fcntl_flags_tbl))); break; #endif #endif