Re: [PULL 00/15] Machine queue, 2021-07-07

[David Hildenbrand]

On 08.07.21 11:53, Peter Maydell wrote:
> On Wed, 7 Jul 2021 at 20:32, Eduardo Habkost <ehabkost@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'.

That should be easy to fix

diff --git a/include/exec/memory.h b/include/exec/memory.h
index 87357a724a..c3d417d317 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2280,7 +2280,7 @@ static inline bool 
memory_region_has_ram_discard_manager(MemoryRegion *mr)
  * #RamDiscardManager assigned.
  *
  * @mr: the #MemoryRegion
- * @urn: #RamDiscardManager to set
+ * @rdm: #RamDiscardManager to set
  */
 void memory_region_set_ram_discard_manager(MemoryRegion *mr,
                                            RamDiscardManager *rdm);


(don't ask me how I ended up with urn instead of rdm)

--
Thanks,

David / dhildenb