Patchwork block: Workaround for older versions of MinGW gcc

login
register
mail settings
Submitter Stefan Weil
Date Nov. 4, 2012, 11:09 a.m.
Message ID <1352027374-30796-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/196990/
State Accepted
Headers show

Comments

Stefan Weil - Nov. 4, 2012, 11:09 a.m.
Versions before gcc-4.6 don't support unnamed fields in initializers
(see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676).

Offset and OffsetHigh belong to an unnamed struct which is part of an
unnamed union. Therefore the original code does not work with older
versions of gcc.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

This patch is needed for Debian's amd64-mingw32msvc-gcc-4.4.4
which I use for MinGW-w64 cross compilation.

Regards
Stefan W.

 block/win32-aio.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Stefan Hajnoczi - Nov. 5, 2012, 5:57 a.m.
On Sun, Nov 04, 2012 at 12:09:34PM +0100, Stefan Weil wrote:
> Versions before gcc-4.6 don't support unnamed fields in initializers
> (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676).
> 
> Offset and OffsetHigh belong to an unnamed struct which is part of an
> unnamed union. Therefore the original code does not work with older
> versions of gcc.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> This patch is needed for Debian's amd64-mingw32msvc-gcc-4.4.4
> which I use for MinGW-w64 cross compilation.
> 
> Regards
> Stefan W.
> 
>  block/win32-aio.c |   10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Kevin Wolf - Nov. 12, 2012, 10:06 a.m.
Am 05.11.2012 06:57, schrieb Stefan Hajnoczi:
> On Sun, Nov 04, 2012 at 12:09:34PM +0100, Stefan Weil wrote:
>> Versions before gcc-4.6 don't support unnamed fields in initializers
>> (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676).
>>
>> Offset and OffsetHigh belong to an unnamed struct which is part of an
>> unnamed union. Therefore the original code does not work with older
>> versions of gcc.
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>
>> This patch is needed for Debian's amd64-mingw32msvc-gcc-4.4.4
>> which I use for MinGW-w64 cross compilation.
>>
>> Regards
>> Stefan W.
>>
>>  block/win32-aio.c |   10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/block/win32-aio.c b/block/win32-aio.c
index c34dc73..92f25a9 100644
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -167,11 +167,11 @@  BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs,
         waiocb->is_linear = true;
     }
 
-    waiocb->ov = (OVERLAPPED) {
-        .Offset = (DWORD) offset,
-        .OffsetHigh = (DWORD) (offset >> 32),
-        .hEvent = event_notifier_get_handle(&aio->e)
-    };
+    memset(&waiocb->ov, 0, sizeof(waiocb->ov));
+    waiocb->ov.Offset = (DWORD)offset;
+    waiocb->ov.OffsetHigh = (DWORD)(offset >> 32);
+    waiocb->ov.hEvent = event_notifier_get_handle(&aio->e);
+
     aio->count++;
 
     if (type & QEMU_AIO_READ) {