qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Gonglei <arei.gonglei@huawei.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 15/15] virito-blk: drop duplicate check
Date: Wed, 24 Jun 2015 16:28:06 +0100	[thread overview]
Message-ID: <1435159686-14817-16-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1435159686-14817-1-git-send-email-stefanha@redhat.com>

From: Gonglei <arei.gonglei@huawei.com>

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 <arei.gonglei@huawei.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 1435138164-11728-1-git-send-email-arei.gonglei@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 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

  parent reply	other threads:[~2015-06-24 15:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-24 15:27 [Qemu-devel] [PULL 00/15] Block patches Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 01/15] block: Let bdrv_drain_all() to call aio_poll() for each AioContext Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 02/15] throttle: Check current timers before updating any_timer_armed[] Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 03/15] block-backend: Introduce blk_drain() Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 04/15] virtio-blk: Use blk_drain() to drain IO requests Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 05/15] util/hbitmap: Add an API to reset all set bits in hbitmap Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 06/15] vvfat: add a label option Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 07/15] nvme: Fix memleak in nvme_dma_read_prp Stefan Hajnoczi
2015-06-24 15:27 ` [Qemu-devel] [PULL 08/15] block: Use bdrv_is_sg() everywhere Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 09/15] Fix migration in case of scsi-generic Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 10/15] raw-posix: DPRINTF instead of DEBUG_BLOCK_PRINT Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 11/15] raw-posix: Use DPRINTF for DEBUG_FLOPPY Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 12/15] raw-posix: Introduce hdev_is_sg() Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 13/15] iov: don't touch iov in iov_send_recv() Stefan Hajnoczi
2015-06-24 15:28 ` [Qemu-devel] [PULL 14/15] qemu-iotests: fix 051.out after qdev error message change Stefan Hajnoczi
2015-06-24 15:28 ` Stefan Hajnoczi [this message]
2015-06-25 13:03 ` [Qemu-devel] [PULL 00/15] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435159686-14817-16-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).