From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfBiu-0007A5-Cz for qemu-devel@nongnu.org; Thu, 24 Sep 2015 14:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZfBir-00031z-2d for qemu-devel@nongnu.org; Thu, 24 Sep 2015 14:58:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfBiq-00031v-Tl for qemu-devel@nongnu.org; Thu, 24 Sep 2015 14:58:25 -0400 Date: Thu, 24 Sep 2015 21:58:22 +0300 From: "Michael S. Tsirkin" Message-ID: <20150924215731-mutt-send-email-mst@redhat.com> References: <1443100738-14970-1-git-send-email-mst@redhat.com> <1443100738-14970-21-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1443100738-14970-21-git-send-email-mst@redhat.com> Subject: Re: [Qemu-devel] [PULL 20/22] virtio: introduce virtqueue_unmap_sg() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Jason Wang On Thu, Sep 24, 2015 at 04:21:02PM +0300, Michael S. Tsirkin wrote: > From: Jason Wang > > Factor out sg unmapping logic. This will be reused by the patch that > can discard descriptor. > > Cc: Michael S. Tsirkin > Signed-off-by: Jason Wang > Reviewed-by: Michael S. Tsirkin > Signed-off-by: Michael S. Tsirkin > --- > hw/virtio/virtio.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 7504f8b..d6a2bca 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -244,15 +244,12 @@ int virtio_queue_empty(VirtQueue *vq) > return vring_avail_idx(vq) == vq->last_avail_idx; > } > > -void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, > - unsigned int len, unsigned int idx) > +static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem, > + unsigned int len) > { > unsigned int offset; > int i; > > - trace_virtqueue_fill(vq, elem, len, idx); > - > - offset = 0; > for (i = 0; i < elem->in_num; i++) { > size_t size = MIN(len - offset, elem->in_sg[i].iov_len); > This part causes an unitialized variable warning to appear. I dropped this from the pull request. Jason, could you look into this please? > @@ -267,6 +264,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, > cpu_physical_memory_unmap(elem->out_sg[i].iov_base, > elem->out_sg[i].iov_len, > 0, elem->out_sg[i].iov_len); > +} > + > +void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, > + unsigned int len, unsigned int idx) > +{ > + trace_virtqueue_fill(vq, elem, len, idx); > + > + virtqueue_unmap_sg(vq, elem, len); > > idx = (idx + vring_used_idx(vq)) % vq->vring.num; > > -- > MST >