From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHU-0005iG-Jz for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyHT-0002us-1y for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHS-0002un-SP for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:10 -0400 Date: Fri, 29 Jul 2016 06:16:07 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-19-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 18/41] vhost: make vhost_dev_cleanup() idempotent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau From: Marc-Andr=E9 Lureau It is called on multiple code path, so make it safe to call several times (note: I don't remember a reproducer here, but a function called 'cleanup' should probably be idempotent in my book) Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 6b988e1..9400b47 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1123,6 +1123,7 @@ fail: void vhost_dev_cleanup(struct vhost_dev *hdev) { int i; + for (i =3D 0; i < hdev->nvqs; ++i) { vhost_virtqueue_cleanup(hdev->vqs + i); } @@ -1137,8 +1138,12 @@ void vhost_dev_cleanup(struct vhost_dev *hdev) } g_free(hdev->mem); g_free(hdev->mem_sections); - hdev->vhost_ops->vhost_backend_cleanup(hdev); + if (hdev->vhost_ops) { + hdev->vhost_ops->vhost_backend_cleanup(hdev); + } assert(!hdev->log); + + memset(hdev, 0, sizeof(struct vhost_dev)); } =20 /* Stop processing guest IO notifications in qemu. --=20 MST