Re: [Qemu-devel] [PULL v3 00/21] virtio, vhost, pci: fixes, features

[Peter Maydell]

On 31 January 2017 at 13:14, Michael S. Tsirkin <address@hidden> wrote:
> The following changes since commit ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into 
> staging (2017-01-25 13:30:23 +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 b16127353f6b5ccdbe1e61e48848a83a6d30e640:
>
>   arm: add trailing ; after MISMATCH_CHECK (2017-01-31 15:11:35 +0200)
>
> ----------------------------------------------------------------
> virtio, vhost, pci: fixes, features
>
> generic pci root port support
> disable shpc by default
> safer version of ARRAY_SIZE and QEMU_BUILD_BUG_ON
> fixes and cleanups all over the place
>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
>
> ----------------------------------------------------------------

Fails to build:

/home/petmay01/linaro/qemu-for-merges/net/vhost-user.c: In function
‘vhost_user_cleanup’:
/home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:9: error:
unknown type name ‘CharDriverSt
ate’
         CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr);
         ^
/home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:32: error:
initialization from incompatible pointer type
[-Werror=incompatible-pointer-types]
         CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr);
                                ^
/home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:157:25: error:
passing argument 1 of ‘qemu_chr_delete’ from incompatible pointer type
[-Werror=incompatible-pointer-types]
         qemu_chr_delete(chr);
                         ^
In file included from
/home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:15:0:
/home/petmay01/linaro/qemu-for-merges/include/sysemu/char.h:185:6:
note: expected ‘Chardev * {aka struct Chardev *}’ but argument is of
type ‘int *’
 void qemu_chr_delete(Chardev *chr);
      ^

Looks like something in your tree is semantically conflicting
with the char device QOMification that landed via Paolo's
tree yesterday. Can you rebase/fix/drop patches as appropriate,
please?

thanks
-- PMM