s390x obsolete machine removal & misc fixes

[PULL 00/13] s390x obsolete machine removal & misc fixes

Thomas Huth posted 13 patches 6 months ago

Download series mbox

Failed in applying to current master (apply log)

Maintainers: Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Eric Farman <farman@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, "Alex Bennée" <alex.bennee@linaro.org>

include/hw/dma/xlnx_dpdma.h               |   1 -
include/hw/s390x/s390-virtio-ccw.h        |   4 -
hw/s390x/event-facility.c                 |  37 +--------
hw/s390x/s390-virtio-ccw.c                | 132 +-----------------------------
target/s390x/gen-features.c               |  13 +--
target/s390x/kvm/kvm.c                    |   6 --
tests/functional/test_arm_integratorcp.py |   6 +-
tests/functional/test_m68k_nextcube.py    |   6 +-
tests/functional/test_mips64el_malta.py   |   6 +-
tests/functional/test_s390x_tuxrun.py     |   1 +
10 files changed, 18 insertions(+), 194 deletions(-)

Expand all Fold all

[PULL 00/13] s390x obsolete machine removal & misc fixes

Posted by Thomas Huth 6 months ago

 Hi!

The following changes since commit 69ee0189d7977cfbb1b2c7a27393d8b9fb661b20:

  Merge tag 'qtest-20250509-pull-request' of https://gitlab.com/farosas/qemu into staging (2025-05-12 11:11:37 -0400)

are available in the Git repository at:

  https://gitlab.com/thuth/qemu.git tags/pull-request-2025-05-14

for you to fetch changes up to c23d3339ce8fc936d8c60a023ea2b052d847dc78:

  tests/functional: Skip the screendump tests if the command is not available (2025-05-14 11:50:42 +0200)

----------------------------------------------------------------
* Removal of obsolete s390x machines
* Fix a memleak in s390x code
* Skip some functional tests if the corresponding feature is not available

----------------------------------------------------------------
Fabiano Rosas (1):
      s390x: Fix leak in machine_set_loadparm

Thomas Huth (12):
      hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 machine type
      hw/s390x/s390-virtio-ccw: Remove the deprecated 2.11 machine type
      hw/s390x/event-facility: Remove the obsolete "allow_all_mask_sizes" code
      target/s390x: Rename the qemu_V2_11 feature set to qemu_MIN
      hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type
      hw/s390x/s390-virtio-ccw: Remove the deprecated 3.0 machine type
      hw/s390x: Remove the obsolete hpage_1m_allowed switch
      hw/s390x/s390-virtio-ccw: Remove the deprecated 3.1 machine type
      hw/s390x/s390-virtio-ccw: Remove the deprecated 4.0 machine type
      include/hw/dma/xlnx_dpdma: Remove dependency on console.h
      tests/functional/test_s390x_tuxrun: Check whether the machine is available
      tests/functional: Skip the screendump tests if the command is not available

 include/hw/dma/xlnx_dpdma.h               |   1 -
 include/hw/s390x/s390-virtio-ccw.h        |   4 -
 hw/s390x/event-facility.c                 |  37 +--------
 hw/s390x/s390-virtio-ccw.c                | 132 +-----------------------------
 target/s390x/gen-features.c               |  13 +--
 target/s390x/kvm/kvm.c                    |   6 --
 tests/functional/test_arm_integratorcp.py |   6 +-
 tests/functional/test_m68k_nextcube.py    |   6 +-
 tests/functional/test_mips64el_malta.py   |   6 +-
 tests/functional/test_s390x_tuxrun.py     |   1 +
 10 files changed, 18 insertions(+), 194 deletions(-)

Re: [PULL 00/13] s390x obsolete machine removal & misc fixes

Posted by Stefan Hajnoczi 6 months ago

Applied, thanks.

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