From 901e65fa6ccbadeacd6c585cf49a0a7cdafb4737 Mon Sep 17 00:00:00 2001 From: Julia Suvorova Date: Wed, 19 Feb 2020 21:34:29 +0000 Subject: [PATCH 5/7] virtio: make virtio_delete_queue idempotent RH-Author: Julia Suvorova Message-id: <20200219213431.11913-3-jusual@redhat.com> Patchwork-id: 93981 O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/4] virtio: make virtio_delete_queue idempotent Bugzilla: 1791590 RH-Acked-by: Danilo de Paula RH-Acked-by: Stefano Garzarella RH-Acked-by: Michael S. Tsirkin From: "Michael S. Tsirkin" Let's make sure calling this twice is harmless - no known instances, but seems safer. Suggested-by: Pan Nengyuan Signed-off-by: Michael S. Tsirkin (cherry picked from commit 8cd353ea0fbf0e334e015d833f612799be642296) Signed-off-by: Danilo C. L. de Paula --- hw/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index d63a369..e6a9ba4 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2342,6 +2342,7 @@ void virtio_delete_queue(VirtQueue *vq) vq->handle_output = NULL; vq->handle_aio_output = NULL; g_free(vq->used_elems); + vq->used_elems = NULL; } void virtio_del_queue(VirtIODevice *vdev, int n) -- 1.8.3.1