summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorLadi Prosek <lprosek@redhat.com>2016-11-03 09:55:49 +0100
committerMichael S. Tsirkin <mst@redhat.com>2016-11-15 17:20:36 +0200
commit27e57efe32f53a8788cd6b6b9b9bbc08446cc8ae (patch)
tree045a5f9bba5e4f505e896034ffcc697f24991207 /hw/net/virtio-net.c
parentbacabb0afadb47294806481a7ebb6fa5d4f1c7bd (diff)
downloadfocaccia-qemu-27e57efe32f53a8788cd6b6b9b9bbc08446cc8ae.tar.gz
focaccia-qemu-27e57efe32f53a8788cd6b6b9b9bbc08446cc8ae.zip
virtio: rename virtqueue_discard to virtqueue_unpop
The function undoes the effect of virtqueue_pop and doesn't do anything
destructive or irreversible so virtqueue_unpop is a more fitting name.

Signed-off-by: Ladi Prosek <lprosek@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/net/virtio-net.c')
-rw-r--r--hw/net/virtio-net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 06bfe4bcc9..20aa63e16c 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1177,7 +1177,7 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
          * must have consumed the complete packet.
          * Otherwise, drop it. */
         if (!n->mergeable_rx_bufs && offset < size) {
-            virtqueue_discard(q->rx_vq, elem, total);
+            virtqueue_unpop(q->rx_vq, elem, total);
             g_free(elem);
             return size;
         }