From bbfbeacbeb992bd85c4aeab2566782f551097d18 Mon Sep 17 00:00:00 2001

From: Julia Suvorova <jusual@redhat.com>

Date: Tue, 4 Feb 2020 18:20:07 +0000

Subject: [PATCH 6/6] virtio-net: delete also control queue when TX/RX deleted

RH-Author: Julia Suvorova <jusual@redhat.com>

Message-id: <20200204182007.183537-5-jusual@redhat.com>

Patchwork-id: 93702

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 4/4] virtio-net: delete also control queue when TX/RX deleted

Bugzilla: 1708480

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>

From: Yuri Benditovich <yuri.benditovich@daynix.com>

https://bugzilla.redhat.com/show_bug.cgi?id=1708480

If the control queue is not deleted together with TX/RX, it

later will be ignored in freeing cache resources and hot

unplug will not be completed.

Cc: qemu-stable@nongnu.org

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>

Message-Id: <20191226043649.14481-3-yuri.benditovich@daynix.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit d945d9f1731244ef341f74ede93120fc9de35913)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/net/virtio-net.c | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c

index 90502fc..c489618 100644

--- a/hw/net/virtio-net.c

+++ b/hw/net/virtio-net.c

@@ -2100,8 +2100,12 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)

         virtio_net_del_queue(n, i);

     }

+    /* delete also control vq */

+    virtio_del_queue(vdev, max_queues * 2);

+

     timer_del(n->announce_timer);

     timer_free(n->announce_timer);

+

     g_free(n->vqs);

     qemu_del_nic(n->nic);

     virtio_cleanup(vdev);

-- 

1.8.3.1