Hi Paolo,

thanks for the review!

On Thu, Apr 01, 2021 at 10:28:19AM +0200, Paolo Bonzini wrote:
> On 31/03/21 22:07, Reinoud Zandijk wrote:
> > Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>
> > Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
> 
> Incorrect order for the S-o-b headers, you should be last.

Oops? there is a prescribed order in those? Will change the order!

> > ---
> > @@ -886,7 +887,7 @@ for opt do
> >     ;;
> >     --python=*) python="$optarg" ; explicit_python=yes
> >     ;;
> > -  --sphinx-build=*) sphinx_build="$optarg"
> > +  --sphinx-build-3.8-3.8=*) sphinx_build="$optarg"
> 
> Oops. :)  Another occurrence later.

Ai ai ai, a different patch krept in! In pkgsrc all patches on a single file
are normally combined and thus they krept in!

> > diff --git a/meson.build b/meson.build
> > index c6f4b0cf5e..e33face775 100644
> > --- a/meson.build
> > +++ b/meson.build
> 
> The meson.build parts can be simplified by applying this patch:
> 
> diff --git a/meson.build b/meson.build

Thanks! Will try it out and add to the patch.

> > @@ -625,7 +641,7 @@ if have_system and not get_option('curses').disabled()
> >       endif
> >     endif
> >     if not get_option('iconv').disabled()
> > -    foreach link_args : [ ['-liconv'], [] ]
> > +    foreach link_args : [ [], ['-liconv'] ]
> >         # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
> >         # We need to use libiconv if available because mixing libiconv's headers with
> >         # the system libc does not work.
> 
> Independent changes, should be posted separately.

Yep, those shouldn't be in this patchset indeed, see above.

Will try to fix it and go for version 7 soon.

Is there a way for `qemu format-patch' to preserve the comments made in the
previous run? It would be handy if it would paste in the old patchset's
comments in the new patchset :)

Reinoud