[PULL,v2,0/9] s390x and test patches 2025-01-21

Pull-request

https://gitlab.com/thuth/qemu.git tags/pull-request-2025-01-21v2

Message

Thomas Huth Jan. 22, 2025, 8:01 a.m. UTC

Hi Stefan!

The following changes since commit d6430c17d7113d3c38480dc34e59d00b0504e2f7:

  Merge tag 'pull-riscv-to-apply-20250119-1' of https://github.com/alistair23/qemu into staging (2025-01-19 08:55:46 -0500)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2025-01-21v2

for you to fetch changes up to 9744ceb94bf963ed42685c7d28024a77de2fbe78:

  pc-bios: Update the s390 bios images with the recent changes (2025-01-22 08:28:49 +0100)

----------------------------------------------------------------
* Fix bugs related to the new "boot order" feature in the s390-ccw bios
* Fix crash that occurs when introspecting older s390-virtio-ccw machines
* Fix error in pbkdf code on fast machines (e.g. s390x with crypto adapter)
* Convert kvm_xen_guest avocado test to the functional framework

v2: Replace cancel() with skipTest() in the first patch
----------------------------------------------------------------
Daniel P. Berrangé (1):
      crypto: fix bogus error benchmarking pbkdf on fast machines

Jared Rossi (1):
      pc-bios/s390-ccw: Abort IPL on invalid loadparm

Philippe Mathieu-Daudé (1):
      MAINTAINERS: Remove myself as Avocado Framework reviewer

Thomas Huth (6):
      tests/functional: Convert the kvm_xen_guest avocado test
      hw/s390x: Fix crash that occurs when inspecting older versioned machines types
      pc-bios/s390-ccw/virtio: Add a function to reset a virtio device
      pc-bios/s390-ccw: Fix boot problem with virtio-net devices
      pc-bios/s390-ccw/netmain: Fix error messages with regards to the TFTP server
      pc-bios: Update the s390 bios images with the recent changes

 MAINTAINERS                                        |   3 +-
 pc-bios/s390-ccw/virtio.h                          |   2 +
 crypto/pbkdf.c                                     |  15 +++-
 hw/s390x/s390-virtio-ccw.c                         |  15 ++--
 pc-bios/s390-ccw/bootmap.c                         |  15 ++--
 pc-bios/s390-ccw/netmain.c                         |  52 +++++++-----
 pc-bios/s390-ccw/virtio-net.c                      |   5 ++
 pc-bios/s390-ccw/virtio.c                          |   7 +-
 pc-bios/s390-ccw.img                               | Bin 79608 -> 96000 bytes
 tests/functional/meson.build                       |   2 +
 .../test_x86_64_kvm_xen.py}                        |  89 ++++++++++++---------
 11 files changed, 128 insertions(+), 77 deletions(-)
 rename tests/{avocado/kvm_xen_guest.py => functional/test_x86_64_kvm_xen.py} (61%)
 mode change 100644 => 100755

Comments

Stefan Hajnoczi Jan. 22, 2025, 4:30 p.m. UTC | #1

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.