On Thu, Jan 25, 2018 at 9:51 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 25 January 2018 at 05:46, Fam Zheng <famz@redhat.com> wrote:
>> The following changes since commit 834a336eb911db8a8ca00e760ee6a85faca19414:
>>
>> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2018-01-24 19:24:26 +0000)
>>
>> are available in the Git repository at:
>>
>> git://github.com/famz/qemu.git tags/staging-pull-request
>>
>> for you to fetch changes up to 6b4c4a84a1c7386df30edb4cb3b846b7ded9c707:
>>
>> qapi: Add NVMe driver options to the schema (2018-01-25 13:26:54 +0800)
>>
>> ----------------------------------------------------------------
>>
>> Hi Peter, this includes:
>>
>> - Paolo's docker fix for fedora image.
>> - Paolo's coroutine lock API improvements.
>> - My userspace NVMe driver.
>>
>> ----------------------------------------------------------------
>
> Hi -- there are a couple of build failures here:
>
> NetBSD/OpenBSD/OSX don't like the change to the .texi file:
>
> /root/qemu//docs/qemu-block-drivers.texi:788: `disk_images_nvme' has
> no Up field (perhaps incorrect sectioning?).
> /root/qemu//docs/qemu-block-drivers.texi:788: warning: unreferenced
> node `disk_images_nvme'.
>
> and some of the other hosts produce this slightly different error
> for what is probably the same issue:
>
> /home/pm215/qemu/qemu-doc.texi:603: node `disk_images' lacks menu item
> for `disk_images_nvme' despite being its Up target
>
>
> There are some format string problems on 32-bit hosts:
>
> /home/peter.maydell/qemu/util/vfio-helpers.c: In function
> 'qemu_vfio_init_ramblock':
> /home/peter.maydell/qemu/util/vfio-helpers.c:406:25: error: format
> '%ld' expects argument of type 'long int', but argument 4 has type
> 'ram_addr_t {aka unsigned int}' [-Werror=format=]
> fprintf(stderr, "qemu_vfio_init_ramblock: failed %p %ld\n",
> ^
> /home/peter.maydell/qemu/util/vfio-helpers.c: In function
> 'qemu_vfio_dump_mapping':
> /home/peter.maydell/qemu/util/vfio-helpers.c:443:16: error: format
> '%lx' expects argument of type 'long unsigned int', but argument 3 has
> type 'size_t {aka unsigned int}' [-Werror=format=]
> printf(" vfio mapping %p %lx to %lx\n", m->host, m->size, m->iova);
> ^
> /home/peter.maydell/qemu/util/vfio-helpers.c:443:16: error: format
> '%lx' expects argument of type 'long unsigned int', but argument 4 has
> type 'uint64_t {aka long long unsigned int}' [-Werror=format=]
>
>
> Finally, the clang build spots what looks like a typo:
>
> /home/petmay01/linaro/qemu-for-merges/util/vfio-helpers.c:514:55:
> error: explicitly assigning value of variable of type 'uint64_t' (aka
> 'unsigned long') to itself [-Werror,-Wself-assign]
> IOVAMapping m = {.host = host, .size = size, iova = iova};
> ~~~~ ^ ~~~~
>
> ...should be ".iova", I imagine.
All good catches. Will fix them all. Thanks!
Fam