From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf2TU-0008V8-Ry for qemu-devel@nongnu.org; Thu, 24 Sep 2015 05:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf2TU-0006gy-0e for qemu-devel@nongnu.org; Thu, 24 Sep 2015 05:05:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf2TT-0006fK-Rq for qemu-devel@nongnu.org; Thu, 24 Sep 2015 05:05:55 -0400 From: Gerd Hoffmann Date: Thu, 24 Sep 2015 11:04:55 +0200 Message-Id: <1443085502-596-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1443085502-596-1-git-send-email-kraxel@redhat.com> References: <1443085502-596-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 04/11] virtio-gpu: move iov free to virtio_gpu_cleanup_mapping_iov List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Airlie , "Michael S. Tsirkin" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Max Reitz Signed-off-by: Gerd Hoffmann --- hw/display/virtio-gpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index a67d927..73bd9b6 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -563,7 +563,6 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab, __func__, ab->resource_id, i); virtio_gpu_cleanup_mapping_iov(*iov, i); g_free(ents); - g_free(*iov); *iov = NULL; return -1; } @@ -580,12 +579,12 @@ void virtio_gpu_cleanup_mapping_iov(struct iovec *iov, uint32_t count) cpu_physical_memory_unmap(iov[i].iov_base, iov[i].iov_len, 1, iov[i].iov_len); } + g_free(iov); } static void virtio_gpu_cleanup_mapping(struct virtio_gpu_simple_resource *res) { virtio_gpu_cleanup_mapping_iov(res->iov, res->iov_cnt); - g_free(res->iov); res->iov = NULL; res->iov_cnt = 0; } -- 1.8.3.1