qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Anthony Liguori <aliguori@us.ibm.com>,
	Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 17/19] linux-user/syscall.c: Don't skip stracing for fcntl64 failure case
Date: Tue,  6 Dec 2011 11:01:12 +0000	[thread overview]
Message-ID: <1323169274-31657-18-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1323169274-31657-1-git-send-email-stefanha@linux.vnet.ibm.com>

From: Peter Maydell <peter.maydell@linaro.org>

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 <agraf@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 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

  parent reply	other threads:[~2011-12-06 11:06 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-06 11:00 [Qemu-devel] [PULL 00/19] Trivial patches for 3 to 6 December 2011 Stefan Hajnoczi
2011-12-06 11:00 ` [Qemu-devel] [PATCH 01/19] console: Clean up confusing indentation in console_putchar() Stefan Hajnoczi
2011-12-06 11:00 ` [Qemu-devel] [PATCH 02/19] console: Fix console_putchar() for CSI J Stefan Hajnoczi
2011-12-06 11:00 ` [Qemu-devel] [PATCH 03/19] console: Fix qemu_default_pixelformat() for 24 bpp Stefan Hajnoczi
2011-12-06 11:00 ` [Qemu-devel] [PATCH 04/19] configure: Include #define name in check_define compiler error Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 05/19] configure: Print a banner comment at the top of config.log Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 06/19] net/socket.c : fix memory leak Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 07/19] win32: " Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 08/19] fix typo: delete redundant semicolon Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 09/19] fix spelling in hw sub directory Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 10/19] pcie_aer: adjust do_pcie_aer_inejct_error -> do_pcie_aer_inject_error Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 11/19] configure: Pull linux-headers/asm symlink creation out of loop Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 12/19] Convert source files to UTF-8 encoding Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 13/19] Convert keymap file " Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 14/19] linux-user/cpu-uname.c: Convert to UTF-8 Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 15/19] linux-user/arm/nwfpe/fpopcode.h: Fix non-UTF-8 characters Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 16/19] Rename get_tls to tls_var Stefan Hajnoczi
2011-12-06 11:43   ` Andreas Färber
2011-12-06 11:47     ` Jan Kiszka
2011-12-06 12:04     ` Paolo Bonzini
2011-12-06 11:01 ` Stefan Hajnoczi [this message]
2011-12-06 11:01 ` [Qemu-devel] [PATCH 18/19] memory: minor documentation fixes/enhancements Stefan Hajnoczi
2011-12-06 11:01 ` [Qemu-devel] [PATCH 19/19] mips_malta: resolve endless loop when loading bios Stefan Hajnoczi
2011-12-14 10:38 ` [Qemu-devel] [PULL 00/19] Trivial patches for 3 to 6 December 2011 Stefan Hajnoczi
2011-12-14 14:53   ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323169274-31657-18-git-send-email-stefanha@linux.vnet.ibm.com \
    --to=stefanha@linux.vnet.ibm.com \
    --cc=aliguori@us.ibm.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).