From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mbQ-0004y3-GQ for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:28:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7mbP-0006V6-Dy for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:28:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7mbP-0006Un-7P for qemu-devel@nongnu.org; Wed, 24 Jun 2015 11:28:39 -0400 From: Stefan Hajnoczi Date: Wed, 24 Jun 2015 16:28:06 +0100 Message-Id: <1435159686-14817-16-git-send-email-stefanha@redhat.com> In-Reply-To: <1435159686-14817-1-git-send-email-stefanha@redhat.com> References: <1435159686-14817-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 15/15] virito-blk: drop duplicate check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Gonglei , Stefan Hajnoczi From: Gonglei in_num = req->elem.in_num, and req->elem.in_num is checked in line 489, so the check about in_num variable is superflous, let's drop it. Signed-off-by: Gonglei Reviewed-by: Fam Zheng Message-id: 1435138164-11728-1-git-send-email-arei.gonglei@huawei.com Signed-off-by: Stefan Hajnoczi --- hw/block/virtio-blk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index bbb1fc1..6aefda4 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -499,8 +499,7 @@ void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) iov_discard_front(&iov, &out_num, sizeof(req->out)); - if (in_num < 1 || - in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) { + if (in_iov[in_num - 1].iov_len < sizeof(struct virtio_blk_inhdr)) { error_report("virtio-blk request inhdr too short"); exit(1); } -- 2.4.3