qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 1f2355: meson: Make DEBUG_REMAP a meson optio

From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 1f2355: meson: Make DEBUG_REMAP a meson option
Date: Wed, 24 Apr 2024 15:52:36 -0700 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 1f2355f53c752297789d431575c4ba975219599c
      
https://github.com/qemu/qemu/commit/1f2355f53c752297789d431575c4ba975219599c
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M bsd-user/qemu.h
    M linux-user/qemu.h
    M linux-user/uaccess.c
    M meson.build
    M meson_options.txt
    M scripts/meson-buildoptions.sh

  Log Message:
  -----------
  meson: Make DEBUG_REMAP a meson option

Currently DEBUG_REMAP is a macro that needs to be manually #defined to
be activated, which makes it hard to have separate build directories
dedicated to testing the code with it. Promote it to a meson option.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20240312002402.14344-1-iii@linux.ibm.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 04f6fb897a5aeb3e356a7b889869c9962f9c16c7
      
https://github.com/qemu/qemu/commit/04f6fb897a5aeb3e356a7b889869c9962f9c16c7
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY

This setsockopt accepts zero-lengh optlen (current qemu implementation
does not allow this).  Also, there's no need to make a copy of the key,
it is enough to use lock_user() (which accepts zero length already).

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2197
Fixes: f31dddd2fc "linux-user: Add support for setsockopt() option SOL_ALG"
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-2-mjt@tls.msk.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 124a1341a66287ab8f4ce3de3c98eed6747a639f
      
https://github.com/qemu/qemu/commit/124a1341a66287ab8f4ce3de3c98eed6747a639f
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: do_setsockopt: make ip_mreq local to the place it is used and 
inline target_to_host_ip_mreq()

ip_mreq is declared at the beginning of do_setsockopt(), while
it is used in only one place.  Move its declaration to that very
place and replace pointer to alloca()-allocated memory with the
structure itself.

target_to_host_ip_mreq() is used only once, inline it.

This change also properly handles TARGET_EFAULT when the address
is wrong.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-3-mjt@tls.msk.ru>
[rth: Fix braces, adjust optlen to match host structure size]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 166bd92e3b4dfcd058013453e4dd94ebe5e87819
      
https://github.com/qemu/qemu/commit/166bd92e3b4dfcd058013453e4dd94ebe5e87819
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: do_setsockopt: make ip_mreq_source local to the place where it is 
used

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-4-mjt@tls.msk.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 88a722b6ad59bf6ca42c01ac806c54bd94d98642
      
https://github.com/qemu/qemu/commit/88a722b6ad59bf6ca42c01ac806c54bd94d98642
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO

There's identical code for SO_SNDTIMEO and SO_RCVTIMEO, currently
implemented using an ugly goto into another switch case.  Eliminate
that using arithmetic if, making code flow more natural.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-5-mjt@tls.msk.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 7048fc59ef6a9f76693db3bafede6234a3897385
      
https://github.com/qemu/qemu/commit/7048fc59ef6a9f76693db3bafede6234a3897385
  Author: Michael Vogt <mvogt@redhat.com>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M linux-user/ioctls.h
    M linux-user/syscall_defs.h
    M linux-user/syscall_types.h

  Log Message:
  -----------
  linux-user: Add FITRIM ioctl

Tiny patch to add the missing FITRIM ioctl.

Signed-off-by: Michael Vogt <mvogt@redhat.com>
Message-Id: <20240403092048.16023-2-michael.vogt@gmail.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 5fae5110eedba1110605c88d96cd4a5f057bfca2
      
https://github.com/qemu/qemu/commit/5fae5110eedba1110605c88d96cd4a5f057bfca2
  Author: Keith Packard <keithp@keithp.com>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M target/m68k/m68k-semi.c

  Log Message:
  -----------
  target/m68k: Pass semihosting arg to exit

Instead of using d0 (the semihost function number), use d1 (the
provide exit status).

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20230802161914.395443-2-keithp@keithp.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: f161e723fdfddfc820c7f19eb6ac76ac6ba6d2a8
      
https://github.com/qemu/qemu/commit/f161e723fdfddfc820c7f19eb6ac76ac6ba6d2a8
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M target/m68k/cpu.h
    M target/m68k/op_helper.c
    M target/m68k/translate.c

  Log Message:
  -----------
  target/m68k: Perform the semihosting test during translate

Replace EXCP_HALT_INSN by EXCP_SEMIHOSTING.  Perform the pre-
and post-insn tests during translate, leaving only the actual
semihosting operation for the exception.

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


  Commit: 0815c228bd1e0c24ac064ce299807b32f8e05d83
      
https://github.com/qemu/qemu/commit/0815c228bd1e0c24ac064ce299807b32f8e05d83
  Author: Keith Packard <keithp@keithp.com>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M target/m68k/translate.c

  Log Message:
  -----------
  target/m68k: Support semihosting on non-ColdFire targets

According to the m68k semihosting spec:

"The instruction used to trigger a semihosting request depends on the
 m68k processor variant.  On ColdFire, "halt" is used; on other processors
 (which don't implement "halt"), "bkpt #0" may be used."

Add support for non-CodeFire processors by matching BKPT #0 instructions.

Signed-off-by: Keith Packard <keithp@keithp.com>
[rth: Use semihosting_test()]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 5da72194df36535d773c8bdc951529ecd5e31707
      
https://github.com/qemu/qemu/commit/5da72194df36535d773c8bdc951529ecd5e31707
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2024-04-24 (Wed, 24 Apr 2024)

  Changed paths:
    M bsd-user/qemu.h
    M linux-user/ioctls.h
    M linux-user/qemu.h
    M linux-user/syscall.c
    M linux-user/syscall_defs.h
    M linux-user/syscall_types.h
    M linux-user/uaccess.c
    M meson.build
    M meson_options.txt
    M scripts/meson-buildoptions.sh
    M target/m68k/cpu.h
    M target/m68k/m68k-semi.c
    M target/m68k/op_helper.c
    M target/m68k/translate.c

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

meson: Make DEBUG_REMAP a meson option
target/m68k: Support semihosting on non-ColdFire targets
linux-user: do_setsockopt cleanups
linux-user: Add FITRIM ioctl

# -----BEGIN PGP SIGNATURE-----
#
# iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmYpjHcdHHJpY2hhcmQu
# aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV+a/Af7BHmDB27U61b9i8et
# cObewYH9y9M+iaCrIflNZPAaoguHDRKOuvw+PFT/dIo5FL2D509vYOuxUow1qLsy
# q6b6kdvXROq9WU2NiuB86Abl/4mwwzxRhFah+Eh+OYSA2/pQnkcULkouLqxjFfF0
# xTBzZtHtYdTbCTVRbpd6XrwLo7Qrs85ovl4wVD1r+T2T8FkvrryoNOA/VjUWxyeh
# 3b1X1I0wtOTnEA7JSr17JCXWZGENCmTO35r6WSYzJy5U/C59PjjgaaeMi3R3lQTJ
# gg21EH0hlU1nTiPLg2ypj3l9NbIGAincAdDF/jufee+R75YSPdpKoDH8tUlUGsnM
# CRx5Xg==
# =J+5K
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 24 Apr 2024 03:49:27 PM PDT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" 
[ultimate]

* tag 'pull-tcg-20240424' of https://gitlab.com/rth7680/qemu:
  target/m68k: Support semihosting on non-ColdFire targets
  target/m68k: Perform the semihosting test during translate
  target/m68k: Pass semihosting arg to exit
  linux-user: Add FITRIM ioctl
  linux-user: do_setsockopt: eliminate goto in switch for SO_SNDTIMEO
  linux-user: do_setsockopt: make ip_mreq_source local to the place where it is 
used
  linux-user: do_setsockopt: make ip_mreq local to the place it is used and 
inline target_to_host_ip_mreq()
  linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY
  meson: Make DEBUG_REMAP a meson option

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


Compare: https://github.com/qemu/qemu/compare/85b597413d43...5da72194df36

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications
reply via email to
[Prev in Thread] Current Thread [Next in Thread]