From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42494)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1YVHty-0006Jt-6y
	for qemu-devel@nongnu.org; Tue, 10 Mar 2015 07:00:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1YVHtt-0003HI-PM
	for qemu-devel@nongnu.org; Tue, 10 Mar 2015 07:00:41 -0400
Date: Tue, 10 Mar 2015 19:00:30 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20150310110030.GA5073@ad.nay.redhat.com>
References: <1425915718-25138-1-git-send-email-kwolf@redhat.com>
	<CAFEAcA-=fU=9DmLtsf9t4R=NU-aMP_0pNusN6v219w7sFO9xDw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAFEAcA-=fU=9DmLtsf9t4R=NU-aMP_0pNusN6v219w7sFO9xDw@mail.gmail.com>
Subject: Re: [Qemu-devel] [PULL 00/73] Block patches
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, qemu-block@nongnu.org

On Tue, 03/10 10:49, Peter Maydell wrote:
> Build failure, Win32:
> 
> /home/petmay01/linaro/qemu-for-merges/hw/block/virtio-blk.c: In
> function 'virtio_blk_handle_scsi_req':
> /home/petmay01/linaro/qemu-for-merges/hw/block/virtio-blk.c:200:
> warning: unused variable 'acb'

The variable definition should be moved into #ifdef. Kevin, could you squash
this to "[PULL 09/69] virtio-blk: Check return value of blk_aio_ioctl"?:

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index a2e7684..c12d2eb 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -197,11 +197,11 @@ static int virtio_blk_handle_scsi_req(VirtIOBlockReq *req)
     VirtIODevice *vdev = VIRTIO_DEVICE(req->dev);
     VirtQueueElement *elem = &req->elem;
     VirtIOBlock *blk = req->dev;
-    BlockAIOCB *acb;

 #ifdef __linux__
     int i;
     VirtIOBlockIoctlReq *ioctl_req;
+    BlockAIOCB *acb;
 #endif

     /*