virtio-blk: remove dead variable in virtio_blk_handle_scsi
PATCH 1/1 virtio-blk: remove dead variable in virtio_blk_handle_scsi
As pointed out by clang size is only ever written to, but never actually used.
Signed-off-by Christoph Hellwig <[email protected]>
hw/virtio-blk.c +1 -4
@@ -165,7 +165,7 @@ static VirtIOBlockReq *virtio_blk_get_restatic 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) {
Anthony Liguori
AppliedQuoted 5 lines · Christoph Hellwig
As pointed out by clang size is only ever written to, but never actually used.
Signed-off-by Christoph Hellwig<[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 41 lines
Index:
qemu/hw/virtio-blk.c
===================================================================hw/virtio-blk.c +1
-4@@ -165,7 +165,7 @@ static VirtIOBlockReq *virtio_blk_get_restatic 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) {