From patchwork Tue Jan 31 09:29:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 138738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30CC9B6EFE for ; Tue, 31 Jan 2012 21:03:41 +1100 (EST) Received: from localhost ([::1]:48836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsA2f-0005sT-TC for incoming@patchwork.ozlabs.org; Tue, 31 Jan 2012 04:30:21 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsA1w-0004Fs-5P for qemu-devel@nongnu.org; Tue, 31 Jan 2012 04:29:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RsA1r-0002cH-81 for qemu-devel@nongnu.org; Tue, 31 Jan 2012 04:29:36 -0500 Received: from afflict.kos.to ([92.243.29.197]:37252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsA1r-0002bQ-1y for qemu-devel@nongnu.org; Tue, 31 Jan 2012 04:29:31 -0500 Received: by afflict.kos.to (Postfix, from userid 1000) id AE93D26537; Tue, 31 Jan 2012 09:29:28 +0000 (UTC) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Tue, 31 Jan 2012 11:29:19 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 92.243.29.197 Cc: Peter Maydell Subject: [Qemu-devel] [PATCH 10/19] linux-user/strace.c: Correct errno printing for mmap etc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Maydell Correct the printing of errnos for syscalls which are handled via print_syscall_ret_addr (mmap, mmap2, brk, shmat): errnos are returned as negative returned values at this level, not via the host 'errno' variable. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/strace.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 269481e..05a0d3e 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -286,11 +285,11 @@ print_syscall_ret_addr(const struct syscallname *name, abi_long ret) { char *errstr = NULL; - if (ret == -1) { - errstr = target_strerror(errno); + if (ret < 0) { + errstr = target_strerror(-ret); } - if ((ret == -1) && errstr) { - gemu_log(" = -1 errno=%d (%s)\n", errno, errstr); + if (errstr) { + gemu_log(" = -1 errno=%d (%s)\n", (int)-ret, errstr); } else { gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); }