|
 |
22c213 |
From 2f494c41715193522c52eafc6af2a5e33f88ceb9 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: Julia Suvorova <jusual@redhat.com>
|
|
|
22c213 |
Date: Wed, 19 Feb 2020 21:34:31 +0000
|
|
|
22c213 |
Subject: [PATCH 7/7] virtio-net: delete also control queue when TX/RX deleted
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Julia Suvorova <jusual@redhat.com>
|
|
|
22c213 |
Message-id: <20200219213431.11913-5-jusual@redhat.com>
|
|
|
22c213 |
Patchwork-id: 93983
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 4/4] virtio-net: delete also control queue when TX/RX deleted
|
|
|
22c213 |
Bugzilla: 1791590
|
|
|
22c213 |
RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: Yuri Benditovich <yuri.benditovich@daynix.com>
|
|
|
22c213 |
|
|
|
22c213 |
https://bugzilla.redhat.com/show_bug.cgi?id=1708480
|
|
|
22c213 |
If the control queue is not deleted together with TX/RX, it
|
|
|
22c213 |
later will be ignored in freeing cache resources and hot
|
|
|
22c213 |
unplug will not be completed.
|
|
|
22c213 |
|
|
|
22c213 |
Cc: qemu-stable@nongnu.org
|
|
|
22c213 |
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
|
|
|
22c213 |
Message-Id: <20191226043649.14481-3-yuri.benditovich@daynix.com>
|
|
|
22c213 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
22c213 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
22c213 |
(cherry picked from commit d945d9f1731244ef341f74ede93120fc9de35913)
|
|
|
22c213 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
hw/net/virtio-net.c | 3 ++-
|
|
|
22c213 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
|
22c213 |
index db3d7c3..f325440 100644
|
|
|
22c213 |
--- a/hw/net/virtio-net.c
|
|
|
22c213 |
+++ b/hw/net/virtio-net.c
|
|
|
22c213 |
@@ -3101,7 +3101,8 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
|
|
|
22c213 |
for (i = 0; i < max_queues; i++) {
|
|
|
22c213 |
virtio_net_del_queue(n, i);
|
|
|
22c213 |
}
|
|
|
22c213 |
-
|
|
|
22c213 |
+ /* delete also control vq */
|
|
|
22c213 |
+ virtio_del_queue(vdev, max_queues * 2);
|
|
|
22c213 |
qemu_announce_timer_del(&n->announce_timer, false);
|
|
|
22c213 |
g_free(n->vqs);
|
|
|
22c213 |
qemu_del_nic(n->nic);
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|