Skip to content
  • Peter Maydell's avatar
    c8eaf81f
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · c8eaf81f
    Peter Maydell authored
    
    
    virtio,acpi: features, fixes, cleanups.
    
    vdpa support
    virtio-mem support
    a handy script for disassembling acpi tables
    misc fixes and cleanups
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Tue 07 Jul 2020 13:00:35 BST
    # 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
    
    * remotes/mst/tags/for_upstream: (41 commits)
      vhost-vdpa: introduce vhost-vdpa net client
      vhost-vdpa: introduce vhost-vdpa backend
      vhost_net: introduce set_config & get_config
      vhost: implement vhost_force_iommu method
      vhost: introduce new VhostOps vhost_force_iommu
      vhost: implement vhost_vq_get_addr method
      vhost: introduce new VhostOps vhost_vq_get_addr
      vhost: implement vhost_dev_start method
      vhost: introduce new VhostOps vhost_dev_start
      vhost: check the existence of vhost_set_iotlb_callback
      virtio-pci: implement queue_enabled method
      virtio-bus: introduce queue_enabled method
      vhost_net: use the function qemu_get_peer
      net: introduce qemu_get_peer
      MAINTAINERS: add VT-d entry
      docs: vhost-user: add Virtio status protocol feature
      tests/acpi: remove stale allowed tables
      numa: Auto-enable NUMA when any memory devices are possible
      virtio-mem: Exclude unplugged memory during migration
      virtio-mem: Add trace events
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	hw/arm/virt.c
    #	hw/virtio/trace-events
    c8eaf81f
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    Peter Maydell authored
    
    
    virtio,acpi: features, fixes, cleanups.
    
    vdpa support
    virtio-mem support
    a handy script for disassembling acpi tables
    misc fixes and cleanups
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Tue 07 Jul 2020 13:00:35 BST
    # 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
    
    * remotes/mst/tags/for_upstream: (41 commits)
      vhost-vdpa: introduce vhost-vdpa net client
      vhost-vdpa: introduce vhost-vdpa backend
      vhost_net: introduce set_config & get_config
      vhost: implement vhost_force_iommu method
      vhost: introduce new VhostOps vhost_force_iommu
      vhost: implement vhost_vq_get_addr method
      vhost: introduce new VhostOps vhost_vq_get_addr
      vhost: implement vhost_dev_start method
      vhost: introduce new VhostOps vhost_dev_start
      vhost: check the existence of vhost_set_iotlb_callback
      virtio-pci: implement queue_enabled method
      virtio-bus: introduce queue_enabled method
      vhost_net: use the function qemu_get_peer
      net: introduce qemu_get_peer
      MAINTAINERS: add VT-d entry
      docs: vhost-user: add Virtio status protocol feature
      tests/acpi: remove stale allowed tables
      numa: Auto-enable NUMA when any memory devices are possible
      virtio-mem: Exclude unplugged memory during migration
      virtio-mem: Add trace events
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	hw/arm/virt.c
    #	hw/virtio/trace-events
Loading