qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 13/16] linux-user, ppc: fix clock_nanosleep() for linux-user-ppc
Date: Mon, 27 Jul 2020 13:23:54 +0100	[thread overview]
Message-ID: <20200727122357.31263-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200727122357.31263-1-alex.bennee@linaro.org>

From: Laurent Vivier <laurent@vivier.eu>

Our safe_clock_nanosleep() returns -1 and updates errno.

We don't need to update the CRF bit in syscall.c because it will
be updated in ppc/cpu_loop.c as the return value is negative.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200722174612.2917566-3-laurent@vivier.eu>
Message-Id: <20200724064509.331-14-alex.bennee@linaro.org>

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 43a6e283961..f5c4f6b95db 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11840,13 +11840,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
             host_to_target_timespec(arg4, &ts);
         }
 
-#if defined(TARGET_PPC)
-        /* clock_nanosleep is odd in that it returns positive errno values.
-         * On PPC, CR0 bit 3 should be set in such a situation. */
-        if (ret && ret != -TARGET_ERESTARTSYS) {
-            ((CPUPPCState *)cpu_env)->crf[0] |= 1;
-        }
-#endif
         return ret;
     }
 #endif
-- 
2.20.1



  parent reply	other threads:[~2020-07-27 12:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27 12:23 [PULL 00/16] various fixes for rc2 (semihosting, tcg, docker, tests/vm) Alex Bennée
2020-07-27 12:23 ` [PULL 01/16] shippable: add one more qemu to registry url Alex Bennée
2020-07-27 12:23 ` [PULL 02/16] semihosting: defer connect_chardevs a little more to use serialx Alex Bennée
2020-07-27 12:23 ` [PULL 03/16] semihosting: don't send the trailing '\0' Alex Bennée
2020-07-27 12:23 ` [PULL 04/16] util: add qemu_get_host_physmem utility function Alex Bennée
2020-07-27 12:23 ` [PULL 05/16] util/oslib-win32: add qemu_get_host_physmem implementation Alex Bennée
2020-07-27 12:23 ` [PULL 06/16] accel/tcg: better handle memory constrained systems Alex Bennée
2020-07-28 15:35   ` Christian Ehrhardt
2020-07-27 12:23 ` [PULL 07/16] target/i386: floatx80: avoid compound literals in static initializers Alex Bennée
2020-07-27 12:23 ` [PULL 08/16] linux-user: don't use MAP_FIXED in pgd_find_hole_fallback Alex Bennée
2020-07-28 13:44   ` Peter Maydell
2020-07-28 16:04     ` Alex Bennée
2020-07-28 16:18       ` Peter Maydell
2020-07-27 12:23 ` [PULL 09/16] tests/docker: fix update command due to python3 str/bytes distinction Alex Bennée
2020-07-27 12:23 ` [PULL 10/16] tests/docker: fix binfmt_misc image building Alex Bennée
2020-07-27 12:23 ` [PULL 11/16] tests/docker: add support for DEB_KEYRING Alex Bennée
2020-07-27 12:23 ` [PULL 12/16] linux-user: fix clock_nanosleep() Alex Bennée
2020-07-27 12:23 ` Alex Bennée [this message]
2020-07-27 12:23 ` [PULL 14/16] python/qemu: Cleanup changes to ConsoleSocket Alex Bennée
2020-07-27 12:23 ` [PULL 15/16] python/qemu: Change ConsoleSocket to optionally drain socket Alex Bennée
2020-07-27 12:23 ` [PULL 16/16] tests/vm: add shutdown timeout in basevm.py Alex Bennée
2020-07-27 16:24 ` [PULL 00/16] various fixes for rc2 (semihosting, tcg, docker, tests/vm) Peter Maydell

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=20200727122357.31263-14-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=laurent@vivier.eu \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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).