Re: [Qemu-devel] [PULL v2 00/28] Changes for 2014-10-29

[Peter Maydell]

On 9 October 2014 12:40, Paolo Bonzini <address@hidden> wrote:
> The following changes since commit 1831e150606a221898bf46ffaf0453e9952cbbc4:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into 
> staging (2014-09-30 16:45:35 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to c8ee8cb6ed76d49412e5067aa1e3f7ce2d47ce46:
>
>   qemu-char: Fix reconnect socket error reporting (2014-10-09 12:57:31 +0200)

This one falls over a bit later on:

In file included from /home/petmay01/linaro/qemu-for-merges/vl.c:64:
/home/petmay01/linaro/qemu-for-merges/include/sysemu/accel.h:32:
error: redefinition of typedef ‘AccelState’
/home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:33:
error: previous declaration of ‘AccelState’ was here

'make -k' says that's the last one, though.

thanks
-- PMM