Commit 8b38694a authored by Michael S. Tsirkin's avatar Michael S. Tsirkin

vhost/net: virtio 1.0 byte swap

I had to add an explicit tag to suppress compiler warning:
gcc isn't smart enough to notice that
len is always initialized since function is called with size > 0.
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>


parent 3b1bbe89
...@@ -416,7 +416,7 @@ static void handle_tx(struct vhost_net *net) ...@@ -416,7 +416,7 @@ static void handle_tx(struct vhost_net *net)
struct ubuf_info *ubuf; struct ubuf_info *ubuf;
ubuf = nvq->ubuf_info + nvq->upend_idx; ubuf = nvq->ubuf_info + nvq->upend_idx;
vq->heads[nvq->upend_idx].id = head; vq->heads[nvq->upend_idx].id = cpu_to_vhost32(vq, head);
vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS; vq->heads[nvq->upend_idx].len = VHOST_DMA_IN_PROGRESS;
ubuf->callback = vhost_zerocopy_callback; ubuf->callback = vhost_zerocopy_callback;
ubuf->ctx = nvq->ubufs; ubuf->ctx = nvq->ubufs;
...@@ -500,6 +500,10 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, ...@@ -500,6 +500,10 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
int headcount = 0; int headcount = 0;
unsigned d; unsigned d;
int r, nlogs = 0; int r, nlogs = 0;
/* len is always initialized before use since we are always called with
* datalen > 0.
*/
u32 uninitialized_var(len);
while (datalen > 0 && headcount < quota) { while (datalen > 0 && headcount < quota) {
if (unlikely(seg >= UIO_MAXIOV)) { if (unlikely(seg >= UIO_MAXIOV)) {
...@@ -527,13 +531,14 @@ static int get_rx_bufs(struct vhost_virtqueue *vq, ...@@ -527,13 +531,14 @@ static int get_rx_bufs(struct vhost_virtqueue *vq,
nlogs += *log_num; nlogs += *log_num;
log += *log_num; log += *log_num;
} }
heads[headcount].id = d; heads[headcount].id = cpu_to_vhost32(vq, d);
heads[headcount].len = iov_length(vq->iov + seg, in); len = iov_length(vq->iov + seg, in);
datalen -= heads[headcount].len; heads[headcount].len = cpu_to_vhost32(vq, len);
datalen -= len;
++headcount; ++headcount;
seg += in; seg += in;
} }
heads[headcount - 1].len += datalen; heads[headcount - 1].len = cpu_to_vhost32(vq, len - datalen);
*iovcount = seg; *iovcount = seg;
if (unlikely(log)) if (unlikely(log))
*log_num = nlogs; *log_num = nlogs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment