Even though I did include some patches for other subsystems, I would rather
avoid doing that unless they only touch meson.build files. So I went with
the minimal regression fix.
Paolo
Il gio 27 ago 2020, 22:00 Eric Blake <ebl...@redhat.com> ha scritto:
> On 8/27/20 1:06 PM, Thomas Huth wrote:
> > On 27/08/2020 18.59, Paolo Bonzini wrote:
> >> From: Thomas Huth <th...@redhat.com>
> >>
> >> Before switching to the meson build system, we used to compile qemu-nbd
> >> for macOS, too, which is especially important for running the iotests
> >> there. Commit b7c70bf2c5 disabled it by accident, since it did not take
> >> into consideration that the $bsd variable in the configure script was
> >> also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems
> >> but Windows now instead (which was likely the original intention of the
> >> old code in the configure script).
> >>
> >> Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}")
> >> Signed-off-by: Thomas Huth <th...@redhat.com>
> >> Acked-by: Eric Blake <ebl...@redhat.com>
> >> Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> >> ---
> >> meson.build | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
>
> >> - if targetos == 'linux' or targetos == 'sunos' or
> targetos.endswith('bsd')
> >> + if targetos != 'windows'
> >> qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
> >> dependencies: [block, qemuutil], install: true)
> >> qemu_block_tools += [qemu_nbd]
> >>
> >
> > Hi Paolo!
> >
> > Daniel posted some better patches that even enable qemu-nbd on Windows
> > (see the "nbd: build qemu-nbd on Windows" v2 patch series)... in case
> > you have to respin this pull request, please use his patches instead!
>
> And if not, I'll get them in through my NBD queue; it's not too hard to
> rebase them.
>
> --
> Eric Blake, Principal Software Engineer
> Red Hat, Inc. +1-919-301-3226
> Virtualization: qemu.org | libvirt.org
>
>
