david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: rename virtqueue_discard to virtqueue_unpop

Browse Source 
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>
This commit is contained in:
Ladi Prosek 2016-11-03 09:55:49 +01:00 committed by Michael S. Tsirkin
parent bacabb0afa
commit 27e57efe32
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/net/virtio-net.c
View File

@ -1177,7 +1177,7 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
* must have consumed the complete packet. * must have consumed the complete packet.
* Otherwise, drop it. */ * Otherwise, drop it. */
if (!n->mergeable_rx_bufs && offset < size) { if (!n->mergeable_rx_bufs && offset < size) {
virtqueue_discard(q->rx_vq, elem, total); virtqueue_unpop(q->rx_vq, elem, total);
g_free(elem); g_free(elem);
return size; return size;
} }

2
hw/virtio/virtio-balloon.c
View File

@ -456,7 +456,7 @@ static void virtio_balloon_device_reset(VirtIODevice *vdev)
VirtIOBalloon *s = VIRTIO_BALLOON(vdev); VirtIOBalloon *s = VIRTIO_BALLOON(vdev);
if (s->stats_vq_elem != NULL) { if (s->stats_vq_elem != NULL) {
virtqueue_discard(s->svq, s->stats_vq_elem, 0); virtqueue_unpop(s->svq, s->stats_vq_elem, 0);
g_free(s->stats_vq_elem); g_free(s->stats_vq_elem);
s->stats_vq_elem = NULL; s->stats_vq_elem = NULL;
} }

6
hw/virtio/virtio.c
View File

@ -279,7 +279,7 @@ void virtqueue_detach_element(VirtQueue *vq, const VirtQueueElement *elem,
virtqueue_unmap_sg(vq, elem, len); virtqueue_unmap_sg(vq, elem, len);
} }
/* virtqueue_discard: /* virtqueue_unpop:
* @vq: The #VirtQueue * @vq: The #VirtQueue
* @elem: The #VirtQueueElement * @elem: The #VirtQueueElement
* @len: number of bytes written * @len: number of bytes written
@ -287,7 +287,7 @@ void virtqueue_detach_element(VirtQueue *vq, const VirtQueueElement *elem,
* Pretend the most recent element wasn't popped from the virtqueue. The next * Pretend the most recent element wasn't popped from the virtqueue. The next
* call to virtqueue_pop() will refetch the element. * call to virtqueue_pop() will refetch the element.
*/ */
void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_unpop(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len) unsigned int len)
{ {
vq->last_avail_idx--; vq->last_avail_idx--;
@ -301,7 +301,7 @@ void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
* Pretend that elements weren't popped from the virtqueue. The next * Pretend that elements weren't popped from the virtqueue. The next
* virtqueue_pop() will refetch the oldest element. * virtqueue_pop() will refetch the oldest element.
* *
* Use virtqueue_discard() instead if you have a VirtQueueElement. * Use virtqueue_unpop() instead if you have a VirtQueueElement.
* *
* Returns: true on success, false if @num is greater than the number of in use * Returns: true on success, false if @num is greater than the number of in use
* elements. * elements.

2
include/hw/virtio/virtio.h
View File

@ -160,7 +160,7 @@ void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
void virtqueue_flush(VirtQueue *vq, unsigned int count); void virtqueue_flush(VirtQueue *vq, unsigned int count);
void virtqueue_detach_element(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_detach_element(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len); unsigned int len);
void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_unpop(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len); unsigned int len);
bool virtqueue_rewind(VirtQueue *vq, unsigned int num); bool virtqueue_rewind(VirtQueue *vq, unsigned int num);
void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,