On Fri, Feb 22, 2019 at 10:53:54AM -0500, Michael S. Tsirkin wrote: > On Fri, Feb 22, 2019 at 03:47:36PM +0000, Peter Maydell wrote: > > On Fri, 22 Feb 2019 at 02:40, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > > > The following changes since commit > > > fc3dbb90f2eb069801bfb4cfe9cbc83cf9c5f4a9: > > > > > > Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' > > > into staging (2019-02-21 13:09:33 +0000) > > > > > > 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 1f8c04f18d2ee2f6ec88217dfd547ab38d2be5c5: > > > > > > pci: Sanity test minimum downstream LNKSTA (2019-02-21 12:28:41 -0500) > > > > > > ---------------------------------------------------------------- > > > pci, pc, virtio: fixes, cleanups, tests > > > > > > Lots of work on tests: BiosTablesTest UEFI app, > > > vhost-user testing for non-Linux hosts. > > > Misc cleanups and fixes all over the place > > > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > > > > > ---------------------------------------------------------------- > > > > Compile failure on clang: > > > > /home/petmay01/linaro/qemu-for-merges/hw/virtio/virtio-balloon.c:40:3: > > error: redefinition of typedef 'PartiallyBalloonedPage' is a C11 > > feature [-Werror,-Wtypedef-redefinition] > > } PartiallyBalloonedPage; > > ^ > > /home/petmay01/linaro/qemu-for-merges/include/hw/virtio/virtio-balloon.h:33:39: > > note: previous definition is here > > typedef struct PartiallyBalloonedPage PartiallyBalloonedPage; > > ^ > > 1 error generated. > > /home/petmay01/linaro/qemu-for-merges/rules.mak:69: recipe for target > > 'hw/virtio/virtio-balloon.o' failed > > > > thanks > > -- PMM > > Fixed up and re-pushed. > David, pls note above and don't add duplicate typedefs in the future. > There's always include/qemu/typedefs.h if you don't know where > to put a typedef.
Yeah, sorry. I noticed the failure on Travis and was going to send a
fix, not realizing you'd already picked it up.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
