[Qemu-commits] [qemu/qemu] eb9d35: bsd-user/signal.c: Only copy the _capsicum for Fre...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: eb9d35f686ed1279d57463d9e6f289988f594c19
      
https://github.com/qemu/qemu/commit/eb9d35f686ed1279d57463d9e6f289988f594c19
  Author: Warner Losh <imp@bsdimp.com>
  Date:   2022-02-01 (Tue, 01 Feb 2022)

  Changed paths:
    M bsd-user/signal-common.h
    M bsd-user/signal.c

  Log Message:
  -----------
  bsd-user/signal.c: Only copy the _capsicum for FreeBSD_version > 1400026

The capsicum signal stuff is new with FreeBSD 14, rev 1400026, so only
define QEMU_SI_CAPSICUM there. Only copy _capsicum when QEMU_SI_CAPSICUM
is defined. Default to no info being passed for signals we make no guess
about.

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: f7c0e223acd5021d03736644cc0abf3501003820
      
https://github.com/qemu/qemu/commit/f7c0e223acd5021d03736644cc0abf3501003820
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-02-02 (Wed, 02 Feb 2022)

  Changed paths:
    M bsd-user/signal-common.h
    M bsd-user/signal.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bsdimp/tags/bsd-user-fix-pull-request' 
into staging

Pull request

Fix FreeBSD 12 and 13 builds.

# gpg: Signature made Tue 01 Feb 2022 21:58:37 GMT
# gpg:                using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100
# gpg: Good signature from "Warner Losh <wlosh@netflix.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@bsdimp.com>" [unknown]
# gpg:                 aka "Warner Losh <imp@freebsd.org>" [unknown]
# gpg:                 aka "Warner Losh <imp@village.org>" [unknown]
# gpg:                 aka "Warner Losh <wlosh@bsdimp.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2035 F894 B00A A3CF 7CCD  E1B7 6C1C D128 7DB0 1100

* remotes/bsdimp/tags/bsd-user-fix-pull-request:
  bsd-user/signal.c: Only copy the _capsicum for FreeBSD_version > 1400026

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/47cc1a365513...f7c0e223acd5