qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 64678f: target/arm: Fix BTI versus CF_PCREL


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 64678f: target/arm: Fix BTI versus CF_PCREL
Date: Mon, 12 Aug 2024 22:00:09 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 64678fc45d8f6c0c8d3adff41e0080aa7af15549
      
https://github.com/qemu/qemu/commit/64678fc45d8f6c0c8d3adff41e0080aa7af15549
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M target/arm/tcg/helper-a64.c
    M target/arm/tcg/helper-a64.h
    M target/arm/tcg/translate-a64.c
    M target/arm/tcg/translate.h

  Log Message:
  -----------
  target/arm: Fix BTI versus CF_PCREL

With pcrel, we cannot check the guarded page bit at translation
time, as different mappings of the same physical page may or may
not have the GP bit set.

Instead, add a couple of helpers to check the page at runtime,
after all other filters that might obviate the need for the check.

The set_btype_for_br call must be moved after the gen_a64_set_pc
call to ensure the current pc can still be computed.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240802003028.795476-1-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 05548400327db52d8f98eb033002fd2baadc3706
      
https://github.com/qemu/qemu/commit/05548400327db52d8f98eb033002fd2baadc3706
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M include/qapi/qmp/qobject.h
    M include/qemu/atomic.h
    M include/qemu/compiler.h
    M include/qemu/osdep.h

  Log Message:
  -----------
  include: Fix typo in name of MAKE_IDENTFIER macro

In commit bb71846325e23 we added some macro magic to avoid
variable-shadowing when using some of our more complicated
macros. One of the internal components of this is a macro
named MAKE_IDENTFIER. Fix the typo in its name: it should
be MAKE_IDENTIFIER.

Commit created with
 sed -i -e 's/MAKE_IDENTFIER/MAKE_IDENTIFIER/g' include/qemu/*.h 
include/qapi/qmp/qobject.h

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240801102516.3843780-1-peter.maydell@linaro.org


  Commit: 9ca6876dc0befcc07b1c609dd96fa719feb7a318
      
https://github.com/qemu/qemu/commit/9ca6876dc0befcc07b1c609dd96fa719feb7a318
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M MAINTAINERS
    M docs/specs/index.rst
    A docs/specs/rocker.rst
    R docs/specs/rocker.txt

  Log Message:
  -----------
  docs/specs/rocker.txt: Convert to rST

Convert the rocker.txt specification document to rST format.  We make
extensive use of the :: marker to introduce a literal block for all
the tables and ASCII art, rather than trying to convert the tables to
rST table syntax.  This produces a valid rST document without needing
a huge diff.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240801170131.3977807-2-peter.maydell@linaro.org


  Commit: 8dac93a8ee78631ee69ff8f6e6203fa2d741e378
      
https://github.com/qemu/qemu/commit/8dac93a8ee78631ee69ff8f6e6203fa2d741e378
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M MAINTAINERS
    M docs/interop/index.rst
    A docs/interop/nbd.rst
    R docs/interop/nbd.txt

  Log Message:
  -----------
  docs/interop/nbd.txt: Convert to rST

Convert nbd.txt to rST format.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20240801170131.3977807-3-peter.maydell@linaro.org


  Commit: 1bc0fc0a0b2a25b10008b0dc870ca87e2a090006
      
https://github.com/qemu/qemu/commit/1bc0fc0a0b2a25b10008b0dc870ca87e2a090006
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M MAINTAINERS
    M docs/interop/index.rst
    A docs/interop/parallels.rst
    R docs/interop/parallels.txt

  Log Message:
  -----------
  docs/interop/parallels.txt: Convert to rST

Convert parallels.txt to rST format.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20240801170131.3977807-4-peter.maydell@linaro.org


  Commit: 7d9fc7e74d8062e99c51b6b1a71393dcb5266cef
      
https://github.com/qemu/qemu/commit/7d9fc7e74d8062e99c51b6b1a71393dcb5266cef
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M MAINTAINERS
    M docs/interop/index.rst
    A docs/interop/prl-xml.rst
    R docs/interop/prl-xml.txt

  Log Message:
  -----------
  docs/interop/prl-xml.txt: Convert to rST

Convert prl-xml.txt to rST format.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20240801170131.3977807-5-peter.maydell@linaro.org


  Commit: 09334420d281777d6b7af8509942f0f604525fc2
      
https://github.com/qemu/qemu/commit/09334420d281777d6b7af8509942f0f604525fc2
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M docs/interop/prl-xml.rst

  Log Message:
  -----------
  docs/interop/prl-xml.rst: Fix minor grammar nits

Fix some minor grammar nits in the prl-xml documentation.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20240801170131.3977807-6-peter.maydell@linaro.org


  Commit: a8e1ea4c97a010349acbe22f099f0c6d6f2db470
      
https://github.com/qemu/qemu/commit/a8e1ea4c97a010349acbe22f099f0c6d6f2db470
  Author: Eric Blake <eblake@redhat.com>
  Date:   2024-08-09 (Fri, 09 Aug 2024)

  Changed paths:
    M docs/interop/live-block-operations.rst

  Log Message:
  -----------
  docs: Typo fix in live disk backup

Add in the missing space in the section header.

Fixes: 1084159b31 ("qapi: deprecate drive-backup", v6.2.0)
Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 446e5e8b4515e9a7be69ef6a29852975289bb6f0
      
https://github.com/qemu/qemu/commit/446e5e8b4515e9a7be69ef6a29852975289bb6f0
  Author: Jianzhou Yue <JianZhou.Yue@verisilicon.com>
  Date:   2024-08-12 (Mon, 12 Aug 2024)

  Changed paths:
    M hw/core/ptimer.c
    M tests/unit/ptimer-test.c

  Log Message:
  -----------
  hw/core/ptimer: fix timer zero period condition for freq > 1GHz

The real period is zero when both period and period_frac are zero.
Check the method ptimer_set_freq, if freq is larger than 1000 MHz,
the period is zero, but the period_frac is not, in this case, the
ptimer will work but the current code incorrectly recognizes that
the ptimer is disabled.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2306
Signed-off-by: JianZhou Yue <JianZhou.Yue@verisilicon.com>
Message-id: 3DA024AEA8B57545AF1B3CAA37077D0FB75E82C8@SHASXM03.verisilicon.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: ed5031ad5d4c4c3b6eee6ab21aa95ccfc9dffdd4
      
https://github.com/qemu/qemu/commit/ed5031ad5d4c4c3b6eee6ab21aa95ccfc9dffdd4
  Author: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  Date:   2024-08-12 (Mon, 12 Aug 2024)

  Changed paths:
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M include/hw/arm/virt.h

  Log Message:
  -----------
  arm/virt: place power button pin number on a define

Having magic numbers inside the code is not a good idea, as it
is error-prone. So, instead, create a macro with the number
definition.

Link: 
https://lore.kernel.org/qemu-devel/CAFEAcA-PYnZ-32MRX+PgvzhnoAV80zBKMYg61j2f=oHaGfwSsg@mail.gmail.com/

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 
ef0e7f5fca6cd94eda415ecee670c3028c671b74.1723121692.git.mchehab+huawei@kernel.org
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 547c4e50929ec6c091d9c16a7b280e829b12b463
      
https://github.com/qemu/qemu/commit/547c4e50929ec6c091d9c16a7b280e829b12b463
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2024-08-12 (Mon, 12 Aug 2024)

  Changed paths:
    M block/blkio.c
    M meson.build

  Log Message:
  -----------
  block/blkio: use FUA flag on write zeroes only if supported

libblkio supports BLKIO_REQ_FUA with write zeros requests only since
version 1.4.0, so let's inform the block layer that the blkio driver
supports it only in this case. Otherwise we can have runtime errors
as reported in https://issues.redhat.com/browse/RHEL-32878

Fixes: fd66dbd424 ("blkio: add libblkio block driver")
Cc: qemu-stable@nongnu.org
Buglink: https://issues.redhat.com/browse/RHEL-32878
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240808080545.40744-1-sgarzare@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 6029bc0cf73506b1a753d6b837ccc825f92bdd0b
      
https://github.com/qemu/qemu/commit/6029bc0cf73506b1a753d6b837ccc825f92bdd0b
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2024-08-13 (Tue, 13 Aug 2024)

  Changed paths:
    M MAINTAINERS
    M docs/interop/index.rst
    M docs/interop/live-block-operations.rst
    A docs/interop/nbd.rst
    R docs/interop/nbd.txt
    A docs/interop/parallels.rst
    R docs/interop/parallels.txt
    A docs/interop/prl-xml.rst
    R docs/interop/prl-xml.txt
    M docs/specs/index.rst
    A docs/specs/rocker.rst
    R docs/specs/rocker.txt
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M hw/core/ptimer.c
    M include/hw/arm/virt.h
    M include/qapi/qmp/qobject.h
    M include/qemu/atomic.h
    M include/qemu/compiler.h
    M include/qemu/osdep.h
    M target/arm/tcg/helper-a64.c
    M target/arm/tcg/helper-a64.h
    M target/arm/tcg/translate-a64.c
    M target/arm/tcg/translate.h
    M tests/unit/ptimer-test.c

  Log Message:
  -----------
  Merge tag 'pull-target-arm-20240812' of 
https://git.linaro.org/people/pmaydell/qemu-arm into staging

 * Fix BTI versus CF_PCREL
 * include: Fix typo in name of MAKE_IDENTFIER macro
 * docs: Various txt-to-rST conversions
 * hw/core/ptimer: fix timer zero period condition for freq > 1GHz
 * arm/virt: place power button pin number on a define

# -----BEGIN PGP SIGNATURE-----
#
# iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAma5+4wZHHBldGVyLm1h
# eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3pX3D/9UVutdg5TsB9N8y5mPaVSn
# Yx0awBgxK5SHWeVgQJBkSdqh6LiGhhukR3VHfNanDELq24s0uLqLW86thgj+iB0H
# 51rnVHJtWtT9mIt0Qq9BlXX8+j0th6hELy/z+/aYdrWI1pmKsGYgF1gRh1vXrg+I
# 0s/S7kZY5CNDBbTXoBNtJfbZRe8fzyy5gUqc/tnw6Qonp8XM1OeG6sg/qF0KwzbB
# 8R7IvnY7gaBWm3daXqrFoxYuR+9i6F8uaFflOm+CarKQc9foH6KEzmfLAYLfGkFZ
# 2ZVHg3uC4k4OicyrpYcWsgumNTzOj8RTI4kV7M8NAj5TXCr+0pO6lnhlAKVGTWiL
# nJrW62dN56w8NVOzcy0tB0xqTHnKIxioGZyU4RDVKHjD/Fy0x7LX7KVmaBEZgyxJ
# oA4zY4KOrCNFsXQlqZgx38v/1hshnIYFN7V5AmfGEfbbKpBznKBQKmuyJ9VwSfGT
# jLwlwU4VMJPsj2Rs70seEl6obgyZicAXIAbqPgtMsvt3H2kKI2jtsNPFka3WaY62
# 0jOEbbFrsKV1//ZExBZdFhqBH/CoiZMvM4jsq1Y/oxAxIWtGv5dmJJsAA3w33YE4
# kNWXfHKAAhydZKeQloMgeOdLliP5UiCfF1FltwAWkLo59GV3TkjwagDU8+pWs9OF
# plOKWaKDUzkHq6G197uaBA==
# =ftoZ
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 12 Aug 2024 10:09:48 PM AEST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" 
[full]
# gpg:                 aka "Peter Maydell <peter@archaic.org.uk>" [unknown]

* tag 'pull-target-arm-20240812' of 
https://git.linaro.org/people/pmaydell/qemu-arm:
  arm/virt: place power button pin number on a define
  hw/core/ptimer: fix timer zero period condition for freq > 1GHz
  docs: Typo fix in live disk backup
  docs/interop/prl-xml.rst: Fix minor grammar nits
  docs/interop/prl-xml.txt: Convert to rST
  docs/interop/parallels.txt: Convert to rST
  docs/interop/nbd.txt: Convert to rST
  docs/specs/rocker.txt: Convert to rST
  include: Fix typo in name of MAKE_IDENTFIER macro
  target/arm: Fix BTI versus CF_PCREL

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


  Commit: 9eb51530c12ae645b91e308d16196c68563ea883
      
https://github.com/qemu/qemu/commit/9eb51530c12ae645b91e308d16196c68563ea883
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2024-08-13 (Tue, 13 Aug 2024)

  Changed paths:
    M block/blkio.c
    M meson.build

  Log Message:
  -----------
  Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into 
staging

Pull request

Fix for hosts with an older libblkio.

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAma6MIoACgkQnKSrs4Gr
# c8i+7gf/Q1vTYE9U1ksbmASQGVJSyCfZlKB0fNxgsGgdnhcIF2uipSxNiDTVVAgn
# rKfMXCvFrPQ7cjbKiiHe4Aj9GqjI6nY6vimnuxqxq9FCd1+RiGGZWDRBfS+6ZQjg
# 815BFB7tkc7ejoL5plMk95XHM+2uHHV0xvK/zelrZ5VOeWdot0yUgL1QLMpAvzMQ
# dY3pwarG8txlnTrMuE+Ig03hjkPf0Z6aK6kdaI5xn9G6O1+799NYXpjqKNtDbisc
# Sf9iq5hmbfASECBBUJH9iWrLdgnieADPebRbOAmDpUsM1bGV6UW9KHUE7zC0h394
# jz8fSjMOjY03rDQjOpzV1wtR8zwpDw==
# =Asvz
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 13 Aug 2024 01:55:54 AM AEST
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]

* tag 'block-pull-request' of https://gitlab.com/stefanha/qemu:
  block/blkio: use FUA flag on write zeroes only if supported

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


Compare: https://github.com/qemu/qemu/compare/87b9ae38d045...9eb51530c12a

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]