Re: [PULL 00/23] pc,pci,virtio: lots of new features

[Michael S. Tsirkin]

On Thu, Jul 15, 2021 at 11:54:17AM +0300, Marcel Apfelbaum wrote:
> Hi, 
> 
> On Wed, Jul 14, 2021 at 11:33 PM Peter Maydell <peter.maydell@linaro.org>
> wrote:
> 
>     On Tue, 13 Jul 2021 at 23:10, Michael S. Tsirkin <mst@redhat.com> wrote:
>     >
>     > The following changes since commit
>     708f50199b59476ec4b45ebcdf171550086d6292:
>     >
>     >   Merge remote-tracking branch 'remotes/ericb/tags/
>     pull-nbd-2021-07-09-v2' into staging (2021-07-13 14:32:20 +0100)
>     >
>     > are available in the Git repository at:
>     >
>     >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>     >
>     > for you to fetch changes up to cf171f90d5e41730ad3e0ce23f1990f34b7e63ef:
>     >
>     >   vhost-vsock: SOCK_SEQPACKET feature bit support (2021-07-13 16:59:12
>     -0400)
>     >
>     > ----------------------------------------------------------------
>     > pc,pci,virtio: lots of new features
>     >
>     > Lots of last minute stuff.
>     >
>     > vhost-user-rng.
>     > vhost-user-i2c.
>     > vhost-vsock SOCK_SEQPACKET support.
>     > IOMMU bypass.
>     > ACPI based pci hotplug.
>     >
>     > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
>     This seems to produce a new meson warning:
> 
>     Configuring 50-qemu-gpu.json using configuration
>     Configuring 50-qemu-virtiofsd.json using configuration
>     Configuring 50-qemu-rng.json using configuration
>     ../../tools/vhost-user-rng/meson.build:7: WARNING: The variable(s)
>     'libexecdir' in the input file
>     'tools/vhost-user-rng/50-qemu-rng.json.in' are not present in the
>     given configuration data.
>     Configuring 50-edk2-i386-secure.json using configuration
>     Configuring 50-edk2-x86_64-secure.json using configuration
>     Configuring 60-edk2-aarch64.json using configuration
> 
>     (the build then seems to go on to complete OK).
> 
> 
> /cc Mathieu
> 
> The below patch solved the warning for me:
> 
> diff --git a/tools/vhost-user-rng/meson.build b/tools/vhost-user-rng/
> meson.build
> index 4dc386daf3..2192a65ca6 100644
> --- a/tools/vhost-user-rng/meson.build
> +++ b/tools/vhost-user-rng/meson.build
> @@ -6,5 +6,5 @@ executable('vhost-user-rng', files(
>  
>  configure_file(input: '50-qemu-rng.json.in',
>                 output: '50-qemu-rng.json',
> -               configuration: config_host,
> +               configuration: { 'libexecdir' : get_option('prefix') /
> get_option('libexecdir') },
>                 install_dir: qemu_datadir / 'vhost-user')
> 
> 
> Thanks,
> Marcel


Thanks Marcel!

Yes this matches what virtiofsd does. Just a cut and paste error then.
I applied this and repushed. Peter do you want to pick up the new tag?
Or we can get the fix in the next pull it's up to you.

for_upstream at commit ca381cf34b020be4cf8f7166f7e15392b849fc25

-- 
MST