From patchwork Sun Nov 4 11:09:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 196990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D81472C00C4 for ; Sun, 4 Nov 2012 22:09:52 +1100 (EST) Received: from localhost ([::1]:59456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUy5O-0003az-OF for incoming@patchwork.ozlabs.org; Sun, 04 Nov 2012 06:09:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUy5E-0003au-Ew for qemu-devel@nongnu.org; Sun, 04 Nov 2012 06:09:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUy5D-0003jg-4W for qemu-devel@nongnu.org; Sun, 04 Nov 2012 06:09:40 -0500 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:59301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUy5C-0003j3-Uh; Sun, 04 Nov 2012 06:09:39 -0500 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 543C3728002F; Sun, 4 Nov 2012 12:09:36 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qC7xQNJ3Ysmw; Sun, 4 Nov 2012 12:09:35 +0100 (CET) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 66B2D728003A; Sun, 4 Nov 2012 12:09:35 +0100 (CET) From: Stefan Weil To: qemu-trivial@nongnu.org Date: Sun, 4 Nov 2012 12:09:34 +0100 Message-Id: <1352027374-30796-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 78.47.199.172 Cc: Kevin Wolf , Paolo Bonzini , qemu-devel@nongnu.org, Stefan Weil Subject: [Qemu-devel] [PATCH] block: Workaround for older versions of MinGW gcc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {