From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYef5-0005kZ-Gm for qemu-devel@nongnu.org; Sun, 27 May 2012 10:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYef2-00089y-SE for qemu-devel@nongnu.org; Sun, 27 May 2012 10:41:39 -0400 Received: from mout.web.de ([212.227.15.3]:60141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYef2-00089X-Iy for qemu-devel@nongnu.org; Sun, 27 May 2012 10:41:36 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 27 May 2012 16:41:30 +0200 Message-Id: <1338129690-42835-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH for-1.1] virtio-blk: Fix unused variables in virtio_blk_handle_scsi() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Commit f34e73cd69bdbdb9b1d56b288c5e14d6fff58165 (virtio-blk: report non-zero status when failing SG_IO requests) exposed the function to non-Linux guests. Move all Linux-only variable declarations into an #ifdef in the variable declaration block. Signed-off-by: Andreas Färber Cc: Paolo Bonzini --- hw/virtio-blk.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f9e1896..a1b64cb 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -147,9 +147,12 @@ static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s) static void virtio_blk_handle_scsi(VirtIOBlockReq *req) { - int ret; int status = VIRTIO_BLK_S_OK; +#ifdef __linux__ + struct sg_io_hdr hdr; + int ret; int i; +#endif /* * We require at least one output segment each for the virtio_blk_outhdr @@ -184,7 +187,6 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) } #ifdef __linux__ - struct sg_io_hdr hdr; memset(&hdr, 0, sizeof(struct sg_io_hdr)); hdr.interface_id = 'S'; hdr.cmd_len = req->elem.out_sg[1].iov_len; -- 1.7.5.3