| Message ID | 1541479952-32355-1-git-send-email-dongli.zhang@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] virtio-blk: fix comment for virtio_blk_rw_complete as nalloc is initially -1 | expand |
On 06/11/2018 05:52, Dongli Zhang wrote: > The initial value of nalloc is -1, but not 1. > > Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com> > --- > This is based on git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > hw/block/virtio-blk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c > index 83cf5c0..30999c3 100644 > --- a/hw/block/virtio-blk.c > +++ b/hw/block/virtio-blk.c > @@ -96,7 +96,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret) > trace_virtio_blk_rw_complete(vdev, req, ret); > > if (req->qiov.nalloc != -1) { > - /* If nalloc is != 1 req->qiov is a local copy of the original > + /* If nalloc is != -1 req->qiov is a local copy of the original > * external iovec. It was allocated in submit_requests to be > * able to merge requests. */ > qemu_iovec_destroy(&req->qiov); > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
On Tue, Nov 06, 2018 at 12:52:32PM +0800, Dongli Zhang wrote: > The initial value of nalloc is -1, but not 1. > > Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com> > --- > This is based on git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > hw/block/virtio-blk.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, applied to my block-next tree for QEMU 3.2: https://github.com/stefanha/qemu/commits/block-next Stefan
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 83cf5c0..30999c3 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -96,7 +96,7 @@ static void virtio_blk_rw_complete(void *opaque, int ret) trace_virtio_blk_rw_complete(vdev, req, ret); if (req->qiov.nalloc != -1) { - /* If nalloc is != 1 req->qiov is a local copy of the original + /* If nalloc is != -1 req->qiov is a local copy of the original * external iovec. It was allocated in submit_requests to be * able to merge requests. */ qemu_iovec_destroy(&req->qiov);
The initial value of nalloc is -1, but not 1. Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com> --- This is based on git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream hw/block/virtio-blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)