Skip to content
  • Stefan Hajnoczi's avatar
    2f3913f4
    Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging · 2f3913f4
    Stefan Hajnoczi authored
    
    
    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: default avatarMichael 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 314e0a84 ("hw/core: remove needless
      includes") because it removed an adjacent #include.
    2f3913f4
    Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging
    Stefan Hajnoczi authored
    
    
    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: default avatarMichael 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 314e0a84 ("hw/core: remove needless
      includes") because it removed an adjacent #include.
Loading