]> git.proxmox.com Git - qemu.git/commitdiff
block: Workaround for older versions of MinGW gcc
authorStefan Weil <sw@weilnetz.de>
Sun, 4 Nov 2012 11:09:34 +0000 (12:09 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 14 Nov 2012 17:19:21 +0000 (18:19 +0100)
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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/win32-aio.c

index c34dc73b6c68114e9ebd8badef8c08d40cb80dfa..92f25a97e5dde5072e636c49e0c560aac1f8fae9 100644 (file)
@@ -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) {