From patchwork Tue Mar 10 11:00:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 448479 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 07FD2140083 for ; Tue, 10 Mar 2015 22:01:01 +1100 (AEDT) Received: from localhost ([::1]:47996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVHuE-0006bX-SV for incoming@patchwork.ozlabs.org; Tue, 10 Mar 2015 07:00:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) id 1YVHtt-0003HI-PM for qemu-devel@nongnu.org; Tue, 10 Mar 2015 07:00:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVHtt-0003FT-AJ; Tue, 10 Mar 2015 07:00:37 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2AB0YvD019221 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 10 Mar 2015 07:00:35 -0400 Received: from localhost (dhcp-14-137.nay.redhat.com [10.66.14.137]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2AB0WEq023351; Tue, 10 Mar 2015 07:00:33 -0400 Date: Tue, 10 Mar 2015 19:00:30 +0800 From: Fam Zheng To: Kevin Wolf , Peter Maydell Message-ID: <20150310110030.GA5073@ad.nay.redhat.com> References: <1425915718-25138-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: QEMU Developers , qemu-block@nongnu.org Subject: Re: [Qemu-devel] [PULL 00/73] Block patches 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 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 /*