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

[Peter Maydell]

On 9 October 2014 11:10, 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 e50fffc7209c9ce844dcb21a99f2d4b3f93900c0:
>
>   qemu-char: Fix reconnect socket error reporting (2014-10-09 12:08:42 +0200)
>
> ----------------------------------------------------------------
> Four changes here.  Polling for reconnection of character devices,
> the QOMification of accelerators, a fix for -kernel support on x86, and one
> for a recently-introduced virtio-scsi optimization.

Hi. I'm afraid this doesn't build for w32:

  CC    device-hotplug.o
In file included from /home/petmay01/linaro/qemu-for-merges/device-hotplug.c:26:
/home/petmay01/linaro/qemu-for-merges/include/hw/boards.h:12: error:
redefinition of typedef ‘MachineState’
/home/petmay01/linaro/qemu-for-merges/include/qemu/typedefs.h:37:
error: previous declaration of ‘MachineState’ was here

(No, I don't know why the gcc for w32 complains about
repeat identical typedefs and none of my other gcc do.)

thanks
-- PMM