[Qemu-commits] [qemu/qemu] 16b627: meson, xen: fix condition for enabling the Xen acc...

[Alex Bennée]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 16b6273b4bbdaf44ff1849cb468335ff55db903c
      
https://github.com/qemu/qemu/commit/16b6273b4bbdaf44ff1849cb468335ff55db903c
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson, xen: fix condition for enabling the Xen accelerator

A misspelled condition in xen_native.h is hiding a bug in the enablement of
Xen for qemu-system-aarch64.  The bug becomes apparent when building for
Xen 4.18.

While the i386 emulator provides the xenpv machine type for multiple 
architectures,
and therefore can be compiled with Xen enabled even when the host is Arm, the
opposite is not true: qemu-system-aarch64 can only be compiled with Xen support
enabled when the host is Arm.

Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what is
already there for KVM.

Cc: Stefano Stabellini <stefano.stabellini@amd.com>
Cc: Richard W.M. Jones <rjones@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Reported-by: Michael Young <m.a.young@durham.ac.uk>
Fixes: 0c8ab1cddd6 ("xen_arm: Create virtio-mmio devices during 
initialization", 2023-08-30)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4efb13f845d03092337e308c85f16eb384fc62df
      
https://github.com/qemu/qemu/commit/4efb13f845d03092337e308c85f16eb384fc62df
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M include/hw/xen/xen_native.h

  Log Message:
  -----------
  xen: fix condition for skipping virtio-mmio defines

GUEST_VIRTIO_MMIO_* was added in Xen 4.17, so only define them
for CONFIG_XEN_CTRL_INTERFACE_VERSIONs up to 4.16.

Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: eaae59af4035770975b0ce9364b587223a909501
      
https://github.com/qemu/qemu/commit/eaae59af4035770975b0ce9364b587223a909501
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M include/hw/xen/xen_native.h
    M meson.build

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

Fix for building with Xen 4.18

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmV4M4AUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroOPgwgAhRYBI8Q7FO4LWZTi+ubYXfS1ZEVC
# uy5eiyQNlymmAFFqutXLokvN1qsGhRlSeX5/uo5Tn6vWjkXPLlGikrecWHFSPmLS
# 0s+4NOOfrM6gMm5CCqMzjQuogr4+xxiw/g+rxhWGhNqlL1jVG1+I6AU5EobMNlDA
# gqd33OL509xkLVN6pCcmFwBInDHQl63YwOwVIR3cd2cfUW28M8DzGd9KULWJkZva
# I51COEwo0EpLNC2ile7pnA8+8F79WBMgUdrhBzl/a8RHv7AvxAPQB/0TsZQknFo0
# PS3Y+yXdn2CT3KInu+QeW3kHkVoAdK06/cSOqIbEKuKgnZjEz0qFHq4K3A==
# =SKW6
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 12 Dec 2023 05:18:40 EST
# 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:
  xen: fix condition for skipping virtio-mmio defines
  meson, xen: fix condition for enabling the Xen accelerator

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


  Commit: 755ae3811fec77d94e92398632cbfe23c4ecffd5
      
https://github.com/qemu/qemu/commit/755ae3811fec77d94e92398632cbfe23c4ecffd5
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: Fix AioContext locking in qmp_block_resize()

The AioContext must be unlocked before calling blk_co_unref(), because
it takes the AioContext lock internally in blk_unref_bh(), which is
scheduled in the main thread. If we don't unlock, the AioContext is
locked twice and nested event loops such as in bdrv_graph_wrlock() will
deadlock.

Cc:  <qemu-stable@nongnu.org>
Fixes: https://issues.redhat.com/browse/RHEL-15965
Fixes: 0c7d204f50c382c6baac8c94bd57af4a022b3888
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20231208124352.30295-1-kwolf@redhat.com>


  Commit: 06ecb6ac197d8e87f91579d803194647dc24cd65
      
https://github.com/qemu/qemu/commit/06ecb6ac197d8e87f91579d803194647dc24cd65
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M docs/specs/tpm.rst
    M docs/system/arm/xenpvh.rst

  Log Message:
  -----------
  docs: clean-up the xenpvh documentation

I noticed the code blocks where not rendering properly so thought I'd
better fix things up. So:

  - Use better title for the machine type
  - Explain why Xen is a little different
  - Add a proper anchor to the tpm-device link
  - add newline so code block properly renders
  - add some indentation to make continuation clearer

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20231207130623.360473-1-alex.bennee@linaro.org>


  Commit: cc984a5d6ce80ab4bb1b3bff42c40886b3ed69f1
      
https://github.com/qemu/qemu/commit/cc984a5d6ce80ab4bb1b3bff42c40886b3ed69f1
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-12-12 (Tue, 12 Dec 2023)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v8.2.0-rc4 release

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


Compare: https://github.com/qemu/qemu/compare/9c74490bff6c...cc984a5d6ce8