From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 27 Mar 2025 13:06:37 +0000 (-0400)
Subject: Merge tag 'pull-request-2025-03-27' of https://gitlab.com/thuth/qemu into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3a0ff62431d297eadc7213cc5b2abda9d1bfce7a;p=people%2Faperard%2Fqemu-dm.git

Merge tag 'pull-request-2025-03-27' of https://gitlab.com/thuth/qemu into staging

* Make some functional tests more robust
* Fix a typo in the s390x code

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmflBdQRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbVE8Q//RRi0ufAhOd9YfPYqteLvJDDl27rDMmsr
# Q0laGYe3ylyUQi9ALglUvfaKNRzJahURwNUqMTyGbTDh/JciQ2mgfYOu7+RsUrBp
# fw5HlGIYJt4p/m5MqiqqiJbQ1LMuEehs93WsywhXdrZ5dLrdeWytkddVd/wj9VG4
# EDYizESc1/8Gl6qOM5ZHa7nMs8KD9SnCrzhXFO2m6sPc9hsAJYfU0NJTPBQ/VDd7
# AyFq43fGNdmHbnERueSJa2CeVfIvoHwSMbVvTkBVdKm2N+09q8ZxqUcj7d5Ziz7f
# Dehn1DvbY3TTR7fR2PPx9EWdDkJ+s8LmJiO1/KsyQC502wCVgzucQxiuTBVs2wG3
# hnkTQ90DcuCAS7ci/1PisdvJSiEiwAV2YlkEWyTmrCCZzjafzARkc8g8QZhuYCSQ
# giz0yMpCla9zI9T/O5NMSsOWDBhy0iNeGwMH8+rDvFraX5a1w2tRTyCa00VWItxb
# rRGcEa8fizEB0eX4lpSjOgY9lkzXhUseS/sQoRlI+hNc0ZqSI6CjeiDemFIIEBTd
# OllPnvhRG7JMdqmDcQXys7uxc/1D9ZNM92P9BhR3VZswNW7O0hy/qfrgDxHkhPIN
# /CrqYgvmeqc1BIcPLIEQzd9nTgpOkggptR+WFGl4VQsDSPOtji9iBzOdsIhSVZlb
# eK0gOrb4Vks=
# =2v5a
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 27 Mar 2025 04:01:24 EDT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2025-03-27' of https://gitlab.com/thuth/qemu:
  tests/functional/test_vnc: Skip test if VNC support is not available
  tests/functional/test_aarch64_virt_gpu: Skip if "dbus" display isn't available
  target/s390x: Fix a typo in s390_cpu_class_init()
  tests/functional: Add missing require_netdev('user') statements
  tests/functional/meson.build: Bump arm_aspeed_bletchley timeout
  tests/functional/test_ppc64_replay: Mark the e500 test as flaky

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

3a0ff62431d297eadc7213cc5b2abda9d1bfce7a