Changes v2:
* Fix doc build warning

The following changes since commit 9aef0954195cc592e86846dbbe7f3c2c5603690a:

  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-07-06 11:24:58 +0100)

are available in the Git repository at:

  https://gitlab.com/ehabkost/qemu.git tags/machine-next-pull-request

for you to fetch changes up to 53d1b5fcfb40c47da4c060dc913df0e9f62894bd:

  vfio: Disable only uncoordinated discards for VFIO_TYPE1 iommus (2021-07-08 15:54:45 -0400)

----------------------------------------------------------------
Machine queue, 2021-07-07

Deprecation:
* Deprecate pmem=on with non-DAX capable backend file
  (Igor Mammedov)

Feature:
* virtio-mem: vfio support (David Hildenbrand)

Cleanup:
* vmbus: Don't make QOM property registration conditional
  (Eduardo Habkost)

----------------------------------------------------------------

David Hildenbrand (13):
  memory: Introduce RamDiscardManager for RAM memory regions
  memory: Helpers to copy/free a MemoryRegionSection
  virtio-mem: Factor out traversing unplugged ranges
  virtio-mem: Don't report errors when ram_block_discard_range() fails
  virtio-mem: Implement RamDiscardManager interface
  vfio: Support for RamDiscardManager in the !vIOMMU case
  vfio: Query and store the maximum number of possible DMA mappings
  vfio: Sanity check maximum number of DMA mappings with
    RamDiscardManager
  vfio: Support for RamDiscardManager in the vIOMMU case
  softmmu/physmem: Don't use atomic operations in
    ram_block_discard_(disable|require)
  softmmu/physmem: Extend ram_block_discard_(require|disable) by two
    discard types
  virtio-mem: Require only coordinated discards
  vfio: Disable only uncoordinated discards for VFIO_TYPE1 iommus

Eduardo Habkost (1):
  vmbus: Don't make QOM property registration conditional

Igor Mammedov (1):
  Deprecate pmem=on with non-DAX capable backend file

 include/exec/memory.h          | 324 +++++++++++++++++++++++++--
 include/hw/vfio/vfio-common.h  |  12 +
 include/hw/virtio/virtio-mem.h |   3 +
 include/migration/vmstate.h    |   1 +
 docs/system/deprecated.rst     |  18 ++
 hw/hyperv/vmbus.c              |  20 +-
 hw/vfio/common.c               | 315 +++++++++++++++++++++++++-
 hw/virtio/virtio-mem.c         | 391 ++++++++++++++++++++++++++++-----
 softmmu/memory.c               |  98 +++++++++
 softmmu/physmem.c              | 108 ++++++---
 util/mmap-alloc.c              |   2 +
 11 files changed, 1168 insertions(+), 124 deletions(-)

-- 
2.31.1

On Thu, 8 Jul 2021 at 20:55, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> Changes v2:
> * Fix doc build warning
>
> The following changes since commit 9aef0954195cc592e86846dbbe7f3c2c5603690a:
>
>   Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-07-06 11:24:58 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/ehabkost/qemu.git tags/machine-next-pull-request
>
> for you to fetch changes up to 53d1b5fcfb40c47da4c060dc913df0e9f62894bd:
>
>   vfio: Disable only uncoordinated discards for VFIO_TYPE1 iommus (2021-07-08 15:54:45 -0400)
>
> ----------------------------------------------------------------
> Machine queue, 2021-07-07
>
> Deprecation:
> * Deprecate pmem=on with non-DAX capable backend file
>   (Igor Mammedov)
>
> Feature:
> * virtio-mem: vfio support (David Hildenbrand)
>
> Cleanup:
> * vmbus: Don't make QOM property registration conditional
>   (Eduardo Habkost)
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1
for any user-visible changes.

-- PMM