Re: [Qemu-devel] [PULL 0/5] virtio,pci: fixes and updates

[Michael S. Tsirkin]

On Thu, Sep 15, 2016 at 02:55:29PM +0100, Peter Maydell wrote:
> On 14 September 2016 at 02:32, Michael S. Tsirkin <address@hidden> wrote:
> > On Tue, Sep 13, 2016 at 11:32:32PM +0300, Michael S. Tsirkin wrote:
> >> The following changes since commit 
> >> 507e4ddc3abf67391bcbc9624fd60b969c159b78:
> >>
> >>   Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' 
> >> into staging (2016-09-13 17:55:35 +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 97eb78baaa6167fca5fdc4be700fe4070c5c9659:
> >
> > I tweaked this a bit to fix build errors on some systems,
> > new commit: 87d386d
> 
> Hi. I'm afraid this doesn't build on ppc64be:
> 
> /home/pm215/qemu/hw/i386/amd_iommu.c:105:5: error: expected ‘,’, ‘;’
> or ‘}’ before ‘uint64_t’
>      uint64_t domid:16;             /* domain to inval for    */
>      ^
> /home/pm215/qemu/hw/i386/amd_iommu.c:245:5: error: expected ‘,’, ‘;’
> or ‘}’ before ‘uint32_t’
>      uint32_t reserved_3:29;
>      ^
> 
> (Missing semicolon on line 104.)
> 
> It also has format string errors on OSX:
> 
> In file included from /Users/pm215/src/qemu-for-merges/util/hbitmap.c:15:
> In file included from /Users/pm215/src/qemu-for-merges/include/trace.h:4:
> ./trace/generated-tracers.h:21398:29: warning: format specifies type
> 'unsigned char' but the argumen
> t has type 'unsigned int' [-Wformat]
>                           , level, addr);
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
> /Users/pm215/src/qemu-for-merges/include/qemu/log.h:78:30: note:
> expanded from macro 'qemu_log_mask'
>             qemu_log(FMT, ## __VA_ARGS__);              \
>                              ^
> In file included from /Users/pm215/src/qemu-for-merges/util/oslib-posix.c:36:
> In file included from /Users/pm215/src/qemu-for-merges/include/trace.h:4:
> ./trace/generated-tracers.h:21398:29: warning: format specifies type
> 'unsigned char' but the argumen
> t has type 'unsigned int' [-Wformat]
>                           , level, addr);
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
> /Users/pm215/src/qemu-for-merges/include/qemu/log.h:78:30: note:
> expanded from macro 'qemu_log_mask'
>             qemu_log(FMT, ## __VA_ARGS__);              \
>                              ^
> 1 warning generated.
> 
> That's for trace_amdvi_mode_invalid, whose tracepoint format
> string is indeed wrong.
> 
> thanks
> -- PMM


Thanks for catching this.
v2 should be ok wrt this.

-- 
MST