Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 65677b7aad05edd20a8d2fe1c27b944f1ff9a002
      
https://github.com/qemu/qemu/commit/65677b7aad05edd20a8d2fe1c27b944f1ff9a002
  Author: Kevin Wolf <kw...@redhat.com>
  Date:   2025-08-12 (Tue, 12 Aug 2025)

  Changed paths:
    M configure
    M pythondeps.toml

  Log Message:
  -----------
  configure: Don't disable Rust for too old meson version

If the user explicitly specified --enable-rust, don't just fail if meson
is too old for Rust support, but do the same thing as if meson was too
old for the C code: Just download a newer one.

In order to avoid the additional download for people who aren't
intentionally opting in to Rust, keep the automatic disabling based on
the meson version as the default if neither --enable-rust nor
--disable-rust were given.

Signed-off-by: Kevin Wolf <kw...@redhat.com>
Message-ID: <20250811142923.89983-1-kw...@redhat.com>
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: 4af976ef398e4e823addc00bf1c58787ba4952fe
      
https://github.com/qemu/qemu/commit/4af976ef398e4e823addc00bf1c58787ba4952fe
  Author: Kevin Wolf <kw...@redhat.com>
  Date:   2025-08-12 (Tue, 12 Aug 2025)

  Changed paths:
    M block/rbd.c
    M qapi/block-core.json

  Log Message:
  -----------
  rbd: Fix .bdrv_get_specific_info implementation

qemu_rbd_get_specific_info() has at least two problems:

The first is that it issues a blocking rbd_read() call in order to probe
the encryption format for the image while querying the node. This means
that if the connection to the server goes down, not only I/O is stuck
(which is unavoidable), but query-names-block-nodes will actually make
the whole QEMU instance unresponsive. .bdrv_get_specific_info
implementations shouldn't perform blocking operations, but only return
what is already known.

The second is that the information returned isn't even correct. If the
image is already opened with encryption enabled at the RBD level, we'll
probe for "double encryption", i.e. if the encrypted data contains
another encryption header. If it doesn't (which is the normal case), we
won't return the encryption format. If it does, we return misleading
information because it looks like we're talking about the outer level
(the encryption format of the image itself) while the information is
about an encryption header in the guest data.

Fix this by storing the encryption format in BDRVRBDState when the image
is opened (and we do blocking operations anyway) and returning only the
stored information in qemu_rbd_get_specific_info().

The information we'll store is either the actual encryption format that
we enabled on the RBD level, or if the image is unencrypted, the result
of the same probing as we previously did when querying the node. Probing
image formats based on content that can be modified by the guest has
long been known as problematic, but as long as we only output it to the
user instead of making decisions based on it, it should be okay. It is
undoubtedly useful in the context of 'qemu-img info' when you're trying
to figure out which encryption options you have to use to open the
image successfully.

Fixes: 42e4ac9ef5a6 ("block/rbd: Add support for rbd image encryption")
Buglink: https://issues.redhat.com/browse/RHEL-105440
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Message-ID: <20250811134010.81787-1-kw...@redhat.com>
Reviewed-by: Hanna Czenczek <hre...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: c0df98ab1f3d348bc05f09d1c093abc529f2b530
      
https://github.com/qemu/qemu/commit/c0df98ab1f3d348bc05f09d1c093abc529f2b530
  Author: Werner Fink <wer...@suse.de>
  Date:   2025-08-12 (Tue, 12 Aug 2025)

  Changed paths:
    M tests/qemu-iotests/039.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/137.out
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  qemu-iotests: Ignore indentation in Killed messages

New bash 5.3 uses a different padding for reporting job status.

Resolves: boo#1246830
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3050
Signed-off-by: Werner Fink <wer...@suse.de>
Message-ID: <ajl8rh8eppnet...@boole.nue2.suse.org>
Reviewed-by: Kevin Wolf <kw...@redhat.com>
Tested-by: Martin Kletzander <mklet...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>


  Commit: 607132e6b6c2fef07f9dd025a7178b7fca9a3f9d
      
https://github.com/qemu/qemu/commit/607132e6b6c2fef07f9dd025a7178b7fca9a3f9d
  Author: Stefan Hajnoczi <stefa...@redhat.com>
  Date:   2025-08-12 (Tue, 12 Aug 2025)

  Changed paths:
    M block/rbd.c
    M configure
    M pythondeps.toml
    M qapi/block-core.json
    M tests/qemu-iotests/039.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/137.out
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  Merge tag 'for-upstream' of git://repo.or.cz/qemu/kevin into staging

Patches for QEMU 10.1.0-rc3

- configure: Don't disable Rust for too old meson version
- rbd: Fix hang in query-named-block-nodes if the server is down
- iotests: Fix reference output for newer bash versions

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCgAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmiblrYRHGt3b2xmQHJl
# ZGhhdC5jb20ACgkQfwmycsiPL9Z3UQ//Xl3LZP4ZHScc16X4vDhH/4eru9Yu5zz/
# k2kWqmns6aClUZXplfWPKnM5a47b/23ZiM7MaxhgTolShtFPAODP0dDxAaPJSCJD
# EjhMbTB8u4GeMCe7T4HqGY/UHcGDWGzD9Ne5ssxt8yRT3fkuM/XxTptlIT93Rz9w
# bjTuCnctP6pGWW3za67bUdr9ZzwpmMXvXwpcXrlhKCqq+qbpHK8/rTp2yaNF5Pi9
# 3K+uITLOVk04UL1JbSgXgvId5JSBDE0JnPDFPhhkAcliQJKR3W3iWhIKwA4rvnZ5
# dzAMNk3TafzUsZp+k9gPXdQ/+km3Hj17vyHLEoEk0cPVoNi+ZbpKCij15O6OPKAn
# OP6aznanat8W8hQh+2lv29fLyYICZpXbsEGB7X7Kfz4uf4BhhopHHvq6SOnZwO14
# MaUjVEO7kBWHgXH3o8PzyHsZq7oWQdEZuKhcnemMb5+6ngLoGX1N1zZUGAcuaar+
# 31rePhgWprdOfZEW9X46i6AKff3xWHl5yQ9jQMPZWNwiYXNemh4oZXSYsgVbvNHd
# g73d/4G5iUt61fg6CtyqFDDa4/1WP0jU4164p6kcvYJVj1HaKy3FrAVrOfINbFFy
# dX3jCECkd52ilBwWisDWSWUqh2S09LJrn7O7FZUwYySivINuajZWwJYuDdxRvyc6
# q7Qg7ocWaQ8=
# =goPX
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 12 Aug 2025 15:32:06 EDT
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kw...@redhat.com"
# gpg: Good signature from "Kevin Wolf <kw...@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* tag 'for-upstream' of git://repo.or.cz/qemu/kevin:
  qemu-iotests: Ignore indentation in Killed messages
  rbd: Fix .bdrv_get_specific_info implementation
  configure: Don't disable Rust for too old meson version

Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>


  Commit: de784dc0a0128146a88437d57ea27a58af507de0
      
https://github.com/qemu/qemu/commit/de784dc0a0128146a88437d57ea27a58af507de0
  Author: Stefan Hajnoczi <stefa...@redhat.com>
  Date:   2025-08-12 (Tue, 12 Aug 2025)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for the v10.1.0-rc3 release

Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>


Compare: https://github.com/qemu/qemu/compare/0c0729b46a36...de784dc0a012

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications

Reply via email to