From patchwork Sun Nov 4 11:09:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: block: Workaround for older versions of MinGW gcc Date: Sun, 04 Nov 2012 01:09:34 -0000 From: Stefan Weil X-Patchwork-Id: 196990 Message-Id: <1352027374-30796-1-git-send-email-sw@weilnetz.de> To: qemu-trivial@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , qemu-devel@nongnu.org, Stefan Weil 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 Reviewed-by: Stefan Hajnoczi --- 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(-) 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) {