From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsqY-0001lm-Ih for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:06:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXsqU-0006Gn-8v for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:06:02 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:33810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXsqU-0006Gh-10 for qemu-devel@nongnu.org; Tue, 06 Dec 2011 06:05:58 -0500 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Dec 2011 11:05:57 -0000 Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB6B5sf21818852 for ; Tue, 6 Dec 2011 11:05:54 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB6B5sqj032614 for ; Tue, 6 Dec 2011 04:05:54 -0700 From: Stefan Hajnoczi Date: Tue, 6 Dec 2011 11:01:12 +0000 Message-Id: <1323169274-31657-18-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1323169274-31657-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1323169274-31657-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 17/19] linux-user/syscall.c: Don't skip stracing for fcntl64 failure case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Stefan Hajnoczi From: Peter Maydell In an fcntl64 failure path, we were returning directly rather than simply breaking out of the switch statement. This skips the strace code for printing the syscall return value, so don't do that. Acked-by: Alexander Graf Signed-off-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- linux-user/syscall.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c84cc65..2bf9e7e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7521,8 +7521,10 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #endif cmd = target_to_host_fcntl_cmd(arg2); - if (cmd == -TARGET_EINVAL) - return cmd; + if (cmd == -TARGET_EINVAL) { + ret = cmd; + break; + } switch(arg2) { case TARGET_F_GETLK64: -- 1.7.7.3