Re: [Qemu-devel] [PULL for 2.0 0/5] MinGW related patches

[Stefan Weil]

Am 20.03.2014 13:45, schrieb Peter Maydell:
> On 20 March 2014 06:29, Stefan Weil <address@hidden> wrote:
>> Am 20.03.2014 07:25, schrieb Stefan Weil:
>>> This includes a patch for GTK (needed for MinGW, but not restricted to it)
>>> and most of the patches which restructure the includes for the Win API.
>>> I ommitted the last optional block patch.
>>>
>>> Stefan
>>>
>>> [PULL for 2.0 1/5] gtk: Support GTK without VTE
>>> [PULL for 2.0 2/5] w32: Add and use intermediate include file for
>>> [PULL for 2.0 3/5] w32: Move inline function from header file to C
>>> [PULL for 2.0 4/5] w32: Reduce dependencies in sysemu/os-win32.h
>>> [PULL for 2.0 5/5] w32: Replace Windows specific data types in
>>>
>>
>> The most important part was missing, sorry:
>>
>> The following changes since commit 06c1bee85a7def8d0139ee6829728a891efe623f:
>>
>>   Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-2.0' into
>> staging (2014-03-19 23:34:43 +0000)
>>
>> are available in the git repository at:
>>
>>
>>   git://qemu.weilnetz.de/qemu.git qemu-2.0
> 
> I'm afraid this doesn't build on my mingw32 setup:
> 
>   CC    util/rfifolock.o
> In file included from
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread.h:14,
>                  from
> /home/petmay01/linaro/qemu-for-merges/include/qemu/rfifolock.h:17,
>                  from 
> /home/petmay01/linaro/qemu-for-merges/util/rfifolock.c:15:
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:8:
> error: expected specifier-qualifier-list before ‘WinHandle’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:18:
> error: expected specifier-qualifier-list before ‘WinLong’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:22:
> error: expected specifier-qualifier-list before ‘WinLong’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:28:
> error: expected specifier-qualifier-list before ‘WinHandle’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:32:
> error: expected specifier-qualifier-list before ‘WinHandle’
> /home/petmay01/linaro/qemu-for-merges/include/qemu/thread-win32.h:42:
> error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before
> ‘qemu_thread_get_handle’
> make: *** [util/rfifolock.o] Error 1
> 
> thanks
> -- PMM
> 

Unfortunately a recent commit added new code in util/, and that code
needs a modification of patch 5/5. I really should have re-run the
compile test :-(

Peter, is it possible to pull only patches 1-4? They compile and are
fine, and we'd save mail bandwidth if I don't have to send them again.
You could also apply only patch 1. It is the only really important one
because it adds GTK for Windows users. The other ones can also be
applied after QEMU 2.0, if you prefer that.

I'll send an updated patch 5, and because it is modified, it will need a
new review.

Cheers,
Stefan