[Qemu-commits] [qemu/qemu] c6cda6: linux-user: Add host_signal_set_pc to set pc in mc...

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c6cda6a44a8adaeb30bd6dc185f021809625433d
      
https://github.com/qemu/qemu/commit/c6cda6a44a8adaeb30bd6dc185f021809625433d
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-11-23 (Tue, 23 Nov 2021)

  Changed paths:
    M linux-user/host/aarch64/host-signal.h
    M linux-user/host/alpha/host-signal.h
    M linux-user/host/arm/host-signal.h
    M linux-user/host/i386/host-signal.h
    M linux-user/host/mips/host-signal.h
    M linux-user/host/ppc/host-signal.h
    M linux-user/host/riscv/host-signal.h
    M linux-user/host/s390/host-signal.h
    M linux-user/host/sparc/host-signal.h
    M linux-user/host/x86_64/host-signal.h

  Log Message:
  -----------
  linux-user: Add host_signal_set_pc to set pc in mcontext

Add a new function host_signal_set_pc to set the next pc in an
mcontext. The caller should ensure this is a valid PC for execution.

Acked-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211113045603.60391-2-imp@bsdimp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 07637888687bfecf3c0cc8351c5c24f29a611691
      
https://github.com/qemu/qemu/commit/07637888687bfecf3c0cc8351c5c24f29a611691
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2021-11-23 (Tue, 23 Nov 2021)

  Changed paths:
    M linux-user/host/aarch64/hostdep.h
    M linux-user/host/arm/hostdep.h
    M linux-user/host/i386/hostdep.h
    M linux-user/host/ppc64/hostdep.h
    M linux-user/host/riscv/hostdep.h
    M linux-user/host/s390x/hostdep.h
    M linux-user/host/x86_64/hostdep.h
    M linux-user/safe-syscall.h
    M linux-user/signal.c

  Log Message:
  -----------
  linux-user/signal.c: Create a common rewind_if_in_safe_syscall

All instances of rewind_if_in_safe_syscall are the same, differing only
in how the instruction point is fetched from the ucontext and the size
of the registers. Use host_signal_pc and new host_signal_set_pc
interfaces to fetch the pointer to the PC and adjust if needed. Delete
all the old copies of rewind_if_in_safe_syscall.

Acked-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211113045603.60391-3-imp@bsdimp.com>
[rth: include safe-syscall.h, simplify ifdefs]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 73e0f70e097b7c92a5ce16ee35b53afe119b20d7
      
https://github.com/qemu/qemu/commit/73e0f70e097b7c92a5ce16ee35b53afe119b20d7
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-11-23 (Tue, 23 Nov 2021)

  Changed paths:
    M linux-user/host/aarch64/host-signal.h
    M linux-user/host/aarch64/hostdep.h
    M linux-user/host/alpha/host-signal.h
    M linux-user/host/arm/host-signal.h
    M linux-user/host/arm/hostdep.h
    M linux-user/host/i386/host-signal.h
    M linux-user/host/i386/hostdep.h
    M linux-user/host/mips/host-signal.h
    M linux-user/host/ppc/host-signal.h
    M linux-user/host/ppc64/hostdep.h
    M linux-user/host/riscv/host-signal.h
    M linux-user/host/riscv/hostdep.h
    M linux-user/host/s390/host-signal.h
    M linux-user/host/s390x/hostdep.h
    M linux-user/host/sparc/host-signal.h
    M linux-user/host/x86_64/host-signal.h
    M linux-user/host/x86_64/hostdep.h
    M linux-user/safe-syscall.h
    M linux-user/signal.c

  Log Message:
  -----------
  Merge tag 'pull-lu-20211123' of https://gitlab.com/rth7680/qemu into staging

Create common rewind_if_in_safe_syscall function.
Resolves pointer type issues with uc_mcontext.pc
on aarch64 between glibc and musl.

# gpg: Signature made Tue 23 Nov 2021 09:47:07 AM CET
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" 
[ultimate]

* tag 'pull-lu-20211123' of https://gitlab.com/rth7680/qemu:
  linux-user/signal.c: Create a common rewind_if_in_safe_syscall
  linux-user: Add host_signal_set_pc to set pc in mcontext

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/3c2a46d5286b...73e0f70e097b