From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NV2N2-0006Pe-Es
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 07:30:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NV2Mx-0006Mx-TQ
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 07:30:43 -0500
Received: from [199.232.76.173] (port=35200 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NV2Mx-0006Mt-Ks
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 07:30:39 -0500
Received: from verein.lst.de ([213.95.11.210]:60309)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <hch@lst.de>) id 1NV2Mx-0001Qk-6C
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 07:30:39 -0500
Received: from verein.lst.de (localhost [127.0.0.1])
	by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id
	o0DCUWWY005740
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO)
	for <qemu-devel@nongnu.org>; Wed, 13 Jan 2010 13:30:32 +0100
Received: (from hch@localhost)
	by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o0DCUWX0005739
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 13:30:32 +0100
Date: Wed, 13 Jan 2010 13:30:32 +0100
From: Christoph Hellwig <hch@lst.de>
Message-ID: <20100113123032.GA5728@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] virtio-blk: remove dead variable in
	virtio_blk_handle_scsi
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

As pointed out by clang size is only ever written to, but never actually
used. 

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: qemu/hw/virtio-blk.c
===================================================================
--- qemu.orig/hw/virtio-blk.c	2010-01-13 13:25:00.911004071 +0100
+++ qemu/hw/virtio-blk.c	2010-01-13 13:25:17.014006323 +0100
@@ -165,7 +165,7 @@ static VirtIOBlockReq *virtio_blk_get_re
 static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
 {
     struct sg_io_hdr hdr;
-    int ret, size = 0;
+    int ret;
     int status;
     int i;
 
@@ -194,7 +194,6 @@ static void virtio_blk_handle_scsi(VirtI
      * before the regular inhdr.
      */
     req->scsi = (void *)req->elem.in_sg[req->elem.in_num - 2].iov_base;
-    size = sizeof(*req->in) + sizeof(*req->scsi);
 
     memset(&hdr, 0, sizeof(struct sg_io_hdr));
     hdr.interface_id = 'S';
@@ -226,7 +225,6 @@ static void virtio_blk_handle_scsi(VirtI
             hdr.dxfer_len += req->elem.in_sg[i].iov_len;
 
         hdr.dxferp = req->elem.in_sg;
-        size += hdr.dxfer_len;
     } else {
         /*
          * Some SCSI commands don't actually transfer any data.
@@ -236,7 +234,6 @@ static void virtio_blk_handle_scsi(VirtI
 
     hdr.sbp = req->elem.in_sg[req->elem.in_num - 3].iov_base;
     hdr.mx_sb_len = req->elem.in_sg[req->elem.in_num - 3].iov_len;
-    size += hdr.mx_sb_len;
 
     ret = bdrv_ioctl(req->dev->bs, SG_IO, &hdr);
     if (ret) {