[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 9/9] virtio-blk: Fix and clean up the in_sg a
From: |
Stefan Hajnoczi |
Subject: |
Re: [Qemu-devel] [PATCH v3 9/9] virtio-blk: Fix and clean up the in_sg and out_sg check |
Date: |
Fri, 6 Jun 2014 15:16:49 +0200 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Fri, Jun 06, 2014 at 09:53:30AM +0800, Fam Zheng wrote:
> @@ -353,19 +355,18 @@ static void virtio_blk_handle_request(VirtIOBlockReq
> *req,
> exit(1);
> }
>
> - if (req->elem->out_sg[0].iov_len < sizeof(req->out) ||
> - req->elem->in_sg[req->elem->in_num - 1].iov_len < sizeof(*req->in)) {
> - error_report("virtio-blk header not in correct element");
> - exit(1);
> - }
> -
> if (unlikely(iov_to_buf(iov, out_num, 0, &req->out,
> sizeof(req->out)) != sizeof(req->out))) {
> error_report("virtio-blk request outhdr too short");
> exit(1);
> }
> iov_discard_front(&iov, &out_num, sizeof(req->out));
> - req->in = (void *)req->elem->in_sg[req->elem->in_num - 1].iov_base;
> + assert(in_iov[in_num - 1].iov_len >=
> + sizeof(struct virtio_blk_inhdr));
Why use assert() when the rest of the function uses error_report() +
exit(1)? Please keep the code consistent.
- [Qemu-devel] [PATCH v3 2/9] virtio-blk: Convert VirtIOBlockReq.elem to pointer, (continued)
- [Qemu-devel] [PATCH v3 2/9] virtio-blk: Convert VirtIOBlockReq.elem to pointer, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 3/9] virtio-blk: Drop bounce buffer from dataplane code, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 4/9] virtio-blk: Drop VirtIOBlockRequest.read, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 5/9] virtio-blk: Replace VirtIOBlockRequest with VirtIOBlockReq, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 6/9] virtio-blk: Use VirtIOBlockReq.in to drop VirtIOBlockReq.inhdr, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 7/9] virtio-blk: Convert VirtIOBlockReq.out to structrue, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 8/9] virtio-blk: Fill in VirtIOBlockReq.out in dataplane code, Fam Zheng, 2014/06/05
- [Qemu-devel] [PATCH v3 9/9] virtio-blk: Fix and clean up the in_sg and out_sg check, Fam Zheng, 2014/06/05
- Re: [Qemu-devel] [PATCH v3 9/9] virtio-blk: Fix and clean up the in_sg and out_sg check,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PATCH v3 0/9] virtio-blk: Converge VirtIOBlockRequest into VirtIOBlockReq, Paolo Bonzini, 2014/06/06
- Re: [Qemu-devel] [PATCH v3 0/9] virtio-blk: Converge VirtIOBlockRequest into VirtIOBlockReq, Stefan Hajnoczi, 2014/06/06