On Fri, 16 Jul 2021 at 09:41, Michael S. Tsirkin <m...@redhat.com> wrote: > > On Fri, Jul 16, 2021 at 07:41:16AM +0100, Peter Maydell wrote: > > On Thu, 15 Jul 2021 at 22:21, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > > > On Wed, Jul 14, 2021 at 09:31:21PM +0100, Peter Maydell wrote: > > > > On Tue, 13 Jul 2021 at 23:10, Michael S. Tsirkin <m...@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 <m...@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). > > > > > > > > -- PMM > > > > > > > > > I sent an email about a fix. Do you prefer PULLv2 then? > > > > Same tag, right? I've put this back on my list, but I'm still > > working through a backlog of other pullreqs before I get back > > to this one. > > > > -- PMM > > Yes. If you merge it there's a trivial conflict. > > If you'd rather see it rebased here it is: for_upstream2
I tried the for_upstream2 tag, but it fails to compile on some of the gitlab jobs: https://gitlab.com/qemu-project/qemu/-/jobs/1430322920 https://gitlab.com/qemu-project/qemu/-/jobs/1430323102 /usr/bin/ld: tools/vhost-user-rng/vhost-user-rng.p/main.c.o: in function `vu_rng_queue_set_started': /builds/qemu-project/qemu/build/../tools/vhost-user-rng/main.c:198: undefined reference to `vu_get_queue' and various other missing symbols at link time. thanks -- PMM
