Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into...

virtio,pc,pci: features, fixes, cleanups

Features:

SR-IOV emulation for pci
virtio-mem-pci support for s390
interleave support for cxl
big endian support for vdpa svq
new QAPI events for vhost-user

Also vIOMMU reset order fixups are in.
Fixes, cleanups all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
 # -----BEGIN PGP SIGNATURE-----
 #
 # iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAme4b8sPHG1zdEByZWRo
 # YXQuY29tAAoJECgfDbjSjVRpHKcIAKPJsVqPdda2dJ7b7FdyRT0Q+uwezXqaGHd4
 # 7Lzih1wsxYNkwIAyPtEb76/21qiS7BluqlUCfCB66R9xWjP5/KfvAFj4/r4AEduE
 # fxAgYzotNpv55zcRbcflMyvQ42WGiZZHC+o5Lp7vDXUP3pIyHrl0Ydh5WmcD+hwS
 # BjXvda58TirQpPJ7rUL+sSfLih17zQkkDcfv5/AgorDy1wK09RBKwMx/gq7wG8yJ
 # twy8eBY2CmfmFD7eTM+EKqBD2T0kwLEeLfS/F/tl5Fyg6lAiYgYtCbGLpAmWErsg
 # XZvfZmwqL7CNzWexGvPFnnLyqwC33WUP0k0kT88Y5wh3/h98blw=
 # =tej8
 # -----END PGP SIGNATURE-----
 # gpg: Signature made Fri 21 Feb 2025 20:21:31 HKT
 # gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
 # gpg:                issuer "mst@redhat.com"
 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
 # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
 # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
 #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (41 commits)
  docs/devel/reset: Document reset expectations for DMA and IOMMU
  hw/vfio/common: Add a trace point in vfio_reset_handler
  hw/arm/smmuv3: Move reset to exit phase
  hw/i386/intel-iommu: Migrate to 3-phase reset
  hw/virtio/virtio-iommu: Migrate to 3-phase reset
  vhost-user-snd: correct the calculation of config_size
  net: vhost-user: add QAPI events to report connection state
  hw/virtio/virtio-nsm: Respond with correct length
  vdpa: Fix endian bugs in shadow virtqueue
  MAINTAINERS: add more files to `vhost`
  cryptodev/vhost: allocate CryptoDevBackendVhost using g_mem0()
  vhost-iova-tree: Update documentation
  vhost-iova-tree, svq: Implement GPA->IOVA & partial IOVA->HVA trees
  vhost-iova-tree: Implement an IOVA-only tree
  amd_iommu: Use correct bitmask to set capability BAR
  amd_iommu: Use correct DTE field for interrupt passthrough
  hw/virtio: reset virtio balloon stats on machine reset
  mem/cxl_type3: support 3, 6, 12 and 16 interleave ways
  hw/mem/cxl_type3: Ensure errp is set on realization failure
  hw/mem/cxl_type3: Fix special_ops memory leak on msix_init_exclusive_bar() failure
  ...

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

diff --cc MAINTAINERS
index e145017d5331552c27d58a43e082c2d83c4816ee,2d07d729332ec2e7e83c4da3a8524bf3f3128169..1911949526ce0c4e922fa5e741a5a903a4573fb1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2255,10 -2250,11 +2259,11 @@@ F: include/hw/virtio/virtio-balloon.
  F: system/balloon.c
  F: include/system/balloon.h
  F: tests/qtest/virtio-balloon-test.c
+ F: tests/functional/test_virtio_balloon.py
  
  virtio-9p
 -M: Greg Kurz <groug@kaod.org>
  M: Christian Schoenebeck <qemu_oss@crudebyte.com>
 +R: Greg Kurz <groug@kaod.org>
  S: Maintained
  W: https://wiki.qemu.org/Documentation/9p
  F: hw/9pfs/

diff --cc docs/about/deprecated.rst
Simple merge

diff --cc hw/i386/amd_iommu.c
Simple merge

diff --cc hw/i386/intel_iommu.c
Simple merge

diff --cc hw/i386/pc.c
Simple merge

diff --cc hw/net/virtio-net.c
Simple merge

diff --cc hw/vfio/common.c
Simple merge

diff --cc tests/functional/meson.build
index b516d21cba167d95a9043215dd6f8b214578b593,2d399cc46447e6ced954142777cedacaca37fb22..111d8bab262b4d713843b1f01623a2927a0085eb
--- 1/tests/functional/meson.build
--- 2/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@@ -46,7 -44,7 +46,8 @@@ test_timeouts = 
    'riscv64_tuxrun' : 120,
    's390x_ccw_virtio' : 420,
    'sh4_tuxrun' : 240,
+   'virtio_balloon': 120,
 +  'x86_64_kvm_xen' : 180,
  }
  
  tests_generic_system = [
@@@ -285,10 -243,9 +286,11 @@@ tests_x86_64_system_thorough = 
    'linux_initrd',
    'multiprocess',
    'netdev_ethtool',
+   'virtio_balloon',
    'virtio_gpu',
 +  'x86_64_hotplug_blk',
    'x86_64_hotplug_cpu',
 +  'x86_64_kvm_xen',
    'x86_64_tuxrun',
  ]