From: Ladi Prosek Date: Wed, 7 Sep 2016 15:20:47 +0000 (+0200) Subject: virtio-balloon: discard virtqueue element on reset X-Git-Tag: v2.8.0-rc0~151^2~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=104e70cae78bd4afd95d948c6aff188f10508a9c;p=qemu-xen-unstable.git virtio-balloon: discard virtqueue element on reset The one pending element is being freed but not discarded on device reset, which causes svq->inuse to creep up, eventually hitting the "Virtqueue size exceeded" error. Properly discarding the element on device reset makes sure that its buffers are unmapped and the inuse counter stays balanced. Cc: Michael S. Tsirkin Cc: Roman Kagan Cc: Stefan Hajnoczi Signed-off-by: Ladi Prosek Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 5af429a58a..ad4189a862 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -463,6 +463,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); g_free(s->stats_vq_elem); s->stats_vq_elem = NULL; }