diff mbox

[PULL,00/73] Block patches

Message ID 20150310110030.GA5073@ad.nay.redhat.com
State New
Headers show

Commit Message

Fam Zheng March 10, 2015, 11 a.m. UTC
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 mbox

Patch

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

     /*