]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Mar 2026 09:32:17 +0000 (09:32 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Mar 2026 09:32:17 +0000 (09:32 +0000)
* hvf/x86: compilation fixes
* whpx: fixes
* xen-block: fix possible NULL pointer dereference
* coroutine-lock: fix thinko

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCgAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmmugQwUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroOOpQf/euE88TGF71S3kW4ckqCN4hLlvpl8
# 7wHjj83ggzufJikx5UI1lw31UuqyZYDX5ICQnvNeVEvBqCpi8oo9SJMBIwXJxn45
# 3oolIy+TJ7/k+QjZ1kMLPubnbH7p5h/iix+IkU01gFS0F0S12LgiJcLpBsSkKZHK
# 5AK53dKBAEikPP+IIT8Y4RrzNOZrydZzaXAtU4eCi3YVxf7/Ld1w9nRGvfG07Zd6
# Y0TptxjfMzbhxLuKetaHrAEI8EYYsmLAE3uJaDMSZ6heCXtfwQjkOaFjaqE/OYOK
# NhtIFArkq+tneI3sqDEoIdMngkL6SEowi1uDAOc5vKmtb2JcWzNo9PsXJw==
# =3X24
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Mar  9 08:13:00 2026 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  whpx: i386: remove SIPI trapping
  whpx: arm64: enable enlightenments if asked for
  whpx: make Hyper-V enlightenments configurable
  whpx: i386: enable some more enlightenments
  target/i386: emulate: LA57 fix
  whpx: i386: do not enable nested virt when kernel-irqchip=off
  hvf: arm: unbreak the x86 build
  target/i386/hvf/hvf.c: fix compilation
  qemu-coroutine-lock: fix has_waiters()
  xen-block: remove NULL pointer dereference

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge