Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3fa010d5317e64276c67ed468b994a2aaa570475
      
https://github.com/qemu/qemu/commit/3fa010d5317e64276c67ed468b994a2aaa570475
  Author: Ilya Leoshkevich <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M tests/tcg/s390x/Makefile.softmmu-target

  Log Message:
  -----------
  tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests

Compiling the s390x tests on Fedora, which has the s390x cross-compiler
installed, fails with:

    In file included from qemu/tests/tcg/s390x/console.c:8:
    qemu/tests/tcg/s390x/../../../pc-bios/s390-ccw/sclp.c:11:10: fatal error: 
string.h: No such file or directory
       11 | #include <string.h>

This is because Fedora does not have a cross-libc. Since console.c
already uses the SLOF libc implementation, add the respective headers
to the include path.

Signed-off-by: Ilya Leoshkevich <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Tested-by: Thomas Huth <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 419613a103af4322682003e95346ed438fcdfb41
      
https://github.com/qemu/qemu/commit/419613a103af4322682003e95346ed438fcdfb41
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.4 and 2.5 machine types

They are older than 6 years, so according to our machine support
policy, they can be removed now.

This removes the requirements for the storage keys "migration-enabled"
property which will be removed in the next patch. It also removes
the code that sets "max_revision" to 0 for some CCW devices, but the
relating code in virtio-ccw.c indicates that 0 could have also been in
use for other machines types < 5.1, so further clean-up for code related
to "max_revision" won't be done yet (see also commit d55f518248f -
"virtio: skip legacy support check on machine types less than 5.1").

Tested-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 93edd339ff18a55d28f5070eaf9a59b3f8385249
      
https://github.com/qemu/qemu/commit/93edd339ff18a55d28f5070eaf9a59b3f8385249
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-skeys.c
    M include/hw/s390x/storage-keys.h

  Log Message:
  -----------
  hw/s390x/s390-skeys: Remove the "migration-enabled" property

This property was only set to "off" by the old s390-ccw-virtio-2.4
machine type which has now been removed. So we can now remove the
property and the related code, too.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 29ac4a4a4cae350c48a2c84386a5db594b79bc68
      
https://github.com/qemu/qemu/commit/29ac4a4a4cae350c48a2c84386a5db594b79bc68
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type

The s390-ccw-virtio-2.6 machine is older than 6 years, so according to
our machine support policy, it can be removed now.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: db65ac5e258e75e9aec45626bf1071626094e057
      
https://github.com/qemu/qemu/commit/db65ac5e258e75e9aec45626bf1071626094e057
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-virtio-ccw.h
    M target/s390x/kvm/kvm.c

  Log Message:
  -----------
  hw/s390x: Remove the "ri_allowed" switch

Only s390-ccw-virtio-2.6 and older used to set this switch to "off",
for newer machine types it is always enabled. Since we removed the
old machine types now, we can also remove the switch in the code and
assume that it is always enabled now.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 25a65a274d5c6030c1e1ce79b845c7143ec0dc7a
      
https://github.com/qemu/qemu/commit/25a65a274d5c6030c1e1ce79b845c7143ec0dc7a
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h

  Log Message:
  -----------
  hw/s390x/ipl: Remove the "iplbext_migration" property

Now that the old machine types that used this property have been
removed, we can remove the property and the corresponding code.

Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 1a276185401a95a1341e52837d07b3a8f76b3634
      
https://github.com/qemu/qemu/commit/1a276185401a95a1341e52837d07b3a8f76b3634
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/css-bridge.c
    M include/hw/s390x/css-bridge.h

  Log Message:
  -----------
  hw/s390x/css-bridge: Remove the "css_dev_path" property

Now that the s390-ccw-virtio-2.6 and older machine types have been
removed, the "css_dev_path" property of the css-bridge is also not
used anymore and thus can be removed.

This way we finally get rid of the problem that has been described
in: https://gitlab.com/qemu-project/qemu/-/issues/2213

Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 3199c7ee76089fb6844f6b2bed1f5d3d99a7527c
      
https://github.com/qemu/qemu/commit/3199c7ee76089fb6844f6b2bed1f5d3d99a7527c
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.7 machine type

The s390-ccw-virtio-2.7 machine is older than 6 years, so according to
our machine support policy, it can be removed now.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: fd58c03a0ecb67420ac81d6b3095605ad0c45edd
      
https://github.com/qemu/qemu/commit/fd58c03a0ecb67420ac81d6b3095605ad0c45edd
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-virtio-ccw.h
    M target/s390x/kvm/kvm.c

  Log Message:
  -----------
  hw/s390x: Remove the cpu_model_allowed flag and related code

Now that the last machine type that disabled cpu_model_allowed has
been removed, we can also remove the cpu_model_allowed flag itself
and all the related conditional code.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 66924fe36977d9d9e45ba3e0b6e851ee170507f6
      
https://github.com/qemu/qemu/commit/66924fe36977d9d9e45ba3e0b6e851ee170507f6
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c

  Log Message:
  -----------
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.8 machine type

The s390-ccw-virtio-2.8 machine is older than 6 years, so according to
our machine support policy, it can be removed now.

Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 921dee4645c4e8abffbbecaf595c82935170a072
      
https://github.com/qemu/qemu/commit/921dee4645c4e8abffbbecaf595c82935170a072
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/s390x/virtio-ccw.c
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  hw/s390x: Remove the "adapter_routes_max_batch" property from the flic

Now that the s390-ccw-virtio-2.8 machine has been removed, we don't
need the "adapter_routes_max_batch" property anymore and can remove it.

Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Cornelia Huck <[email protected]>
Acked-by: Christian Borntraeger <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 00cfbdcbe16dd1af2af8aba0584a2acf2b4d8ce6
      
https://github.com/qemu/qemu/commit/00cfbdcbe16dd1af2af8aba0584a2acf2b4d8ce6
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M qemu-options.hx
    M system/vl.c

  Log Message:
  -----------
  Remove the deprecated "-runas" command line option

It has been marked as deprecated two releases ago, so it should
be fine now to remove this command line option.

Reviewed-by: Daniel P. Berrangé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 5cd37fe6dd278302ed6ceb86727526a38f410314
      
https://github.com/qemu/qemu/commit/5cd37fe6dd278302ed6ceb86727526a38f410314
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M docs/about/deprecated.rst

  Log Message:
  -----------
  docs/about/deprecated: Remove paragraph about initial deprecation in 2.10

When we introduced the deprecation rule of keeping deprecated features
for two more releases, we had to state that we would not remove features
by surprise that had already been marked as deprecated before. Nowadays,
this paragraph is not needed anymore, so we can remove it now.

Reviewed-by: Daniel P. Berrangé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: f69705f300f487936919359354925395105ec018
      
https://github.com/qemu/qemu/commit/f69705f300f487936919359354925395105ec018
  Author: Thomas Huth <[email protected]>
  Date:   2025-01-07 (Tue, 07 Jan 2025)

  Changed paths:
    M tests/functional/test_x86_64_hotplug_cpu.py

  Log Message:
  -----------
  tests/functional/test_x86_64_hotplug_cpu: Fix race condition during unplug

When unplugging the CPU, the test tries to check for a successful
unplug by changing to the /sys/devices/system/cpu/cpu1 directory
to see whether that fails. However, the "cd" could be faster than
the unplug operation in the kernel, so there is a race condition
and the test sometimes fails here.
Fix it by trying to change the directory in a loop until the the
CPU has really been unplugged.
While we're at it, also add a "cd .." before unplugging to make
the console output a little bit less confusing (since the path
is echoed in the shell prompt).

Reported-by: Stefan Hajnoczi <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>


  Commit: 3f8bcbba3b320c610689576fc47595f1076198dd
      
https://github.com/qemu/qemu/commit/3f8bcbba3b320c610689576fc47595f1076198dd
  Author: Stefan Hajnoczi <[email protected]>
  Date:   2025-01-08 (Wed, 08 Jan 2025)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/about/removed-features.rst
    M hw/intc/s390_flic.c
    M hw/s390x/css-bridge.c
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h
    M hw/s390x/s390-skeys.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/virtio-ccw.c
    M include/hw/s390x/css-bridge.h
    M include/hw/s390x/s390-virtio-ccw.h
    M include/hw/s390x/s390_flic.h
    M include/hw/s390x/storage-keys.h
    M qemu-options.hx
    M system/vl.c
    M target/s390x/kvm/kvm.c
    M tests/functional/test_x86_64_hotplug_cpu.py
    M tests/tcg/s390x/Makefile.softmmu-target

  Log Message:
  -----------
  Merge tag 'pull-request-2025-01-08' of https://gitlab.com/thuth/qemu into 
staging

* Fix compilation problem in s390x tcg tests
* Remove obsolete versioned s390x machine types 2.4 up to 2.8
* Remove deprecated -runas command line option
* Fix the x86_64_hotplug_cpu functional test

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmd+OikRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbXTig/+Kgt0H5KQzCvGuRDYYD20Iq9MLy8iTJdj
# bmPyjyMWI88Mm4qjZUO2Kcv/MSEP3MhnaTLEE/PJYgE2D8Cq2AFMLQf4ES01Uzwt
# kFBSHvAlTOgcMFcu6QiWtetlqbqixuPs146J9vvUde1xTWCpB2FuB+wNneSTl6J1
# Ilrb7SM2TzbZ1s3NPuvBSVltQlA8MYa5VdQMvljAZGe2GE5vlpNjXmJMiZ/QJ7lp
# +LVZppbB5lYxH0SYf56r2tR8fxqfQi6W4WoGeuBf9FnDf815cbcwagpOnaJiQFzx
# iG1WusLt1tlW2arBDP7dzrjNjByjMFhwJvKaoXuSnGS29ivPuVq33mBkcFh80cv3
# 8rElZR+M5tmGfbC/mMwH7FSesUrEH18ZwRyc9RGqZ/QtqoBaukBJpxk6KuyNUbWn
# 3x0ZUbGhAItGGNaZ54T70LdM3dTmEISMOnp5YTlv8oUFoROhfvWn20FMIge0Ib7t
# Epu/nSiHzzdtURHZ1Z8EKNmCOmiKRW4WpF34hzQ+4uid5BAsCNMVMe0JZy5plN9L
# V78CZ4qiqipmHIpKnI81x8L2admyJ3nklYKSRkaCmZFhpSyh8rdMUjCgt9A6xFfe
# 34Jha7+MrJq9nnoeYIH/dS1Jhv+9vygNahDy9XaWXIHFPd7Nrsr79BWSC3fe1w5O
# DlsdrHyGHvU=
# =II7e
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 08 Jan 2025 03:41:13 EST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Thomas Huth <[email protected]>" [full]
# gpg:                 aka "Thomas Huth <[email protected]>" [full]
# gpg:                 aka "Thomas Huth <[email protected]>" [full]
# gpg:                 aka "Thomas Huth <[email protected]>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2025-01-08' of https://gitlab.com/thuth/qemu:
  tests/functional/test_x86_64_hotplug_cpu: Fix race condition during unplug
  docs/about/deprecated: Remove paragraph about initial deprecation in 2.10
  Remove the deprecated "-runas" command line option
  hw/s390x: Remove the "adapter_routes_max_batch" property from the flic
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.8 machine type
  hw/s390x: Remove the cpu_model_allowed flag and related code
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.7 machine type
  hw/s390x/css-bridge: Remove the "css_dev_path" property
  hw/s390x/ipl: Remove the "iplbext_migration" property
  hw/s390x: Remove the "ri_allowed" switch
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type
  hw/s390x/s390-skeys: Remove the "migration-enabled" property
  hw/s390x/s390-virtio-ccw: Remove the deprecated 2.4 and 2.5 machine types
  tests/tcg/s390x: Use the SLOF libc headers for the multiarch tests

Signed-off-by: Stefan Hajnoczi <[email protected]>


Compare: https://github.com/qemu/qemu/compare/6528013b5f5b...3f8bcbba3b32

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

Reply via email to