On Thu, Jul 8, 2021 at 5:53 AM Peter Maydell <peter.mayd...@linaro.org> wrote: > > On Wed, 7 Jul 2021 at 20:32, Eduardo Habkost <ehabk...@redhat.com> wrote: > > > > 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 4dc87143b9dbc0ae5719b67b4e533c824b239f00: > > > > vfio: Disable only uncoordinated discards for VFIO_TYPE1 iommus > > (2021-07-06 18:05:26 -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) > > > > Hi; this generates warnings in the docs build: > > /home/pm/qemu/docs/../include/exec/memory.h:2286: warning: Function > parameter or member 'rdm' not described in > 'memory_region_set_ram_discard_manager' > /home/pm/qemu/docs/../include/exec/memory.h:2286: warning: Excess > function parameter 'urn' description in > 'memory_region_set_ram_discard_manager' > > This seems to be because the function prototype for this > function says it takes parameters 'mr' and 'rdm', but the > doc comment documents 'mr' and 'urn'.
Sorry, I will apply David's fixup and resubmit. It worries me that this is not being detected by our GitLab CI jobs. Is anybody working to fix that? -- Eduardo
