From bf7aa4bb11e9991a3d5a1007dbe52dd0ac6dae99 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Wed, 5 Oct 2016 17:22:25 +0200 Subject: [PATCH 3/8] virtio: decrement vq->inuse in virtqueue_discard() RH-Author: Ladi Prosek Message-id: <1475666548-9186-4-git-send-email-lprosek@redhat.com> Patchwork-id: 72482 O-Subject: [RHEL-7.4 qemu-kvm v2 PATCH 3/6] virtio: decrement vq->inuse in virtqueue_discard() Bugzilla: 1377968 RH-Acked-by: Paolo Bonzini RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Stefan Hajnoczi From: Stefan Hajnoczi virtqueue_discard() moves vq->last_avail_idx back so the element can be popped again. It's necessary to decrement vq->inuse to avoid "leaking" the element count. Cc: qemu-stable@nongnu.org Signed-off-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Reviewed-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 58a83c61496eeb0d31571a07a51bc1947e3379ac) Signed-off-by: Ladi Prosek Signed-off-by: Miroslav Rezanina --- hw/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 91c9642..87a7639 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -255,6 +255,7 @@ void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem, unsigned int len) { vq->last_avail_idx--; + vq->inuse--; virtqueue_unmap_sg(vq, elem, len); } -- 1.8.3.1