On Fri, Nov 4, 2016 at 3:42 AM, Alexey Kardashevskiy <a...@ozlabs.ru> wrote:
> On 03/11/16 19:55, Ladi Prosek wrote:
>> The function undoes the effect of virtqueue_pop and doesn't do anything
>> destructive or irreversible so virtqueue_unpop is a more fitting name.
>
> virtqueue_undo_pop() is even better, it was suggested by native english
> speaker (i.e. not myself) :)
virtqueue_undo_pop sounds good too, I have no preference between the
two really :) Thanks!
>>
>> Signed-off-by: Ladi Prosek <lpro...@redhat.com>
>> ---
>> hw/net/virtio-net.c | 2 +-
>> hw/virtio/virtio-balloon.c | 2 +-
>> hw/virtio/virtio.c | 8 ++++----
>> include/hw/virtio/virtio.h | 4 ++--
>> 4 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
>> index 06bfe4b..20aa63e 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;
>> }
>> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
>> index 1d77028..8e3b91c 100644
>> --- a/hw/virtio/virtio-balloon.c
>> +++ b/hw/virtio/virtio-balloon.c
>> @@ -456,7 +456,7 @@ static void virtio_balloon_device_reset(VirtIODevice
>> *vdev)
>> VirtIOBalloon *s = VIRTIO_BALLOON(vdev);
>>
>> 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);
>> s->stats_vq_elem = NULL;
>> }
>> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
>> index d48d1a9..68971fd 100644
>> --- a/hw/virtio/virtio.c
>> +++ b/hw/virtio/virtio.c
>> @@ -280,7 +280,7 @@ void virtqueue_detach_element(VirtQueue *vq, const
>> VirtQueueElement *elem,
>> virtqueue_unmap_sg(vq, elem, len);
>> }
>>
>> -/* virtqueue_discard:
>> +/* virtqueue_unpop:
>> * @vq: The #VirtQueue
>> * @elem: The #VirtQueueElement
>> * @len: number of bytes written
>> @@ -288,8 +288,8 @@ void virtqueue_detach_element(VirtQueue *vq, const
>> VirtQueueElement *elem,
>> * Pretend the most recent element wasn't popped from the virtqueue. The
>> next
>> * call to virtqueue_pop() will refetch the element.
>> */
>> -void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
>> - unsigned int len)
>> +void virtqueue_unpop(VirtQueue *vq, const VirtQueueElement *elem,
>> + unsigned int len)
>> {
>> vq->last_avail_idx--;
>> virtqueue_detach_element(vq, elem, len);
>> @@ -302,7 +302,7 @@ void virtqueue_discard(VirtQueue *vq, const
>> VirtQueueElement *elem,
>> * Pretend that elements weren't popped from the virtqueue. The next
>> * 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
>> * elements.
>> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
>> index b913aac..95adaca 100644
>> --- a/include/hw/virtio/virtio.h
>> +++ b/include/hw/virtio/virtio.h
>> @@ -157,8 +157,8 @@ void virtqueue_push(VirtQueue *vq, const
>> VirtQueueElement *elem,
>> void virtqueue_flush(VirtQueue *vq, unsigned int count);
>> void virtqueue_detach_element(VirtQueue *vq, const VirtQueueElement *elem,
>> unsigned int len);
>> -void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
>> - unsigned int len);
>> +void virtqueue_unpop(VirtQueue *vq, const VirtQueueElement *elem,
>> + unsigned int len);
>> bool virtqueue_rewind(VirtQueue *vq, unsigned int num);
>> void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
>> unsigned int len, unsigned int idx);
>>
>
>
> --
> Alexey
