From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5Krp-0007pf-Ah for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:33 -0400 Received: from [140.186.70.92] (port=50627 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5Kro-0007ob-2V for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5Krm-000622-9u for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40710) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5Krl-00061r-OZ for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:30 -0400 From: Kevin Wolf Date: Fri, 23 Apr 2010 17:30:58 +0200 Message-Id: <1272036658-26776-27-git-send-email-kwolf@redhat.com> In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com> References: <1272036658-26776-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 26/26] block: Free iovec arrays allocated by multiwrite_merge() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@linux.vnet.ibm.com Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi A new iovec array is allocated when creating a merged write request. This patch ensures that the iovec array is deleted in addition to its qiov owner. Reported-by: Leszek Urbanski Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 12cf434..7974215 100644 --- a/block.c +++ b/block.c @@ -1739,6 +1739,9 @@ static void multiwrite_user_cb(MultiwriteCB *mcb) for (i = 0; i < mcb->num_callbacks; i++) { mcb->callbacks[i].cb(mcb->callbacks[i].opaque, mcb->error); + if (mcb->callbacks[i].free_qiov) { + qemu_iovec_destroy(mcb->callbacks[i].free_qiov); + } qemu_free(mcb->callbacks[i].free_qiov); qemu_vfree(mcb->callbacks[i].free_buf); } -- 1.6.6.1