From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 5 Oct 2023 13:01:01 +0000 (-0400)
Subject: Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f3913f4b2ad74baeb5a6f1d36efbd9ecdf1057d;p=qemu.git

Merge tag 'for_upstream' of https://git./virt/kvm/mst/qemu into staging

virtio,pci: features, cleanups

vdpa:
      shadow vq vlan support
      net migration with cvq
cxl:
     support emulating 4 HDM decoders
     serial number extended capability
virtio:
      hared dma-buf

Fixes, cleanups all over the place.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (53 commits)
  libvhost-user: handle shared_object msg
  vhost-user: add shared_object msg
  hw/display: introduce virtio-dmabuf
  util/uuid: add a hash function
  virtio: remove unused next argument from virtqueue_split_read_next_desc()
  virtio: remove unnecessary thread fence while reading next descriptor
  virtio: use shadow_avail_idx while checking number of heads
  libvhost-user.c: add assertion to vu_message_read_default
  pcie_sriov: unregister_vfs(): fix error path
  hw/i386/pc: improve physical address space bound check for 32-bit x86 systems
  amd_iommu: Fix APIC address check
  vdpa net: follow VirtIO initialization properly at cvq isolation probing
  vdpa net: stop probing if cannot set features
  vdpa net: fix error message setting virtio status
  hw/pci-bridge/cxl-upstream: Add serial number extended capability support
  hw/cxl: Support 4 HDM decoders at all levels of topology
  hw/cxl: Fix and use same calculation for HDM decoder block size everywhere
  hw/cxl: Add utility functions decoder interleave ways and target count.
  hw/cxl: Push cxl_decoder_count_enc() and cxl_decode_ig() into .c
  vdpa net: zero vhost_vdpa iova_tree pointer at cleanup
  ...

Conflicts:
  hw/core/machine.c
  Context conflict with commit 314e0a84cd5d ("hw/core: remove needless
  includes") because it removed an adjacent #include.
---

2f3913f4b2ad74baeb5a6f1d36efbd9ecdf1057d
diff --cc hw/core/machine.c
index 281ef0dccd,9ae8f793ae..cfd1edfe20
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@@ -22,16 -27,23 +22,19 @@@
  #include "sysemu/sysemu.h"
  #include "sysemu/reset.h"
  #include "sysemu/runstate.h"
 -#include "sysemu/numa.h"
  #include "sysemu/xen.h"
 -#include "qemu/error-report.h"
  #include "sysemu/qtest.h"
 -#include "hw/pci/pci.h"
+ #include "hw/pci/pci_bridge.h"
  #include "hw/mem/nvdimm.h"
  #include "migration/global_state.h"
 -#include "migration/vmstate.h"
  #include "exec/confidential-guest-support.h"
 -#include "hw/virtio/virtio.h"
  #include "hw/virtio/virtio-pci.h"
  #include "hw/virtio/virtio-net.h"
 +#include "audio/audio.h"
  
- GlobalProperty hw_compat_8_1[] = {};
+ GlobalProperty hw_compat_8_1[] = {
+     { TYPE_PCI_BRIDGE, "x-pci-express-writeable-slt-bug", "true" },
+ };
  const size_t hw_compat_8_1_len = G_N_ELEMENTS(hw_compat_8_1);
  
  GlobalProperty hw_compat_8_0[] = {