From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryan Harper Subject: Re: [PATCH] block: Free iovec arrays allocated by multiwrite_merge() Date: Wed, 21 Apr 2010 13:35:36 -0500 Message-ID: <20100421183536.GG24351@us.ibm.com> References: <20100421143209.GC24351@us.ibm.com> <1271874464-3021-1-git-send-email-stefanha@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm@vger.kernel.org, Leszek Urbanski , Michael Tokarev , Ryan Harper To: Stefan Hajnoczi Return-path: Received: from e32.co.us.ibm.com ([32.97.110.150]:54662 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756133Ab0DUSfn (ORCPT ); Wed, 21 Apr 2010 14:35:43 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e32.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o3LISnKQ022517 for ; Wed, 21 Apr 2010 12:28:49 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3LIZf1B064792 for ; Wed, 21 Apr 2010 12:35:42 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o3LIZeVY004520 for ; Wed, 21 Apr 2010 12:35:41 -0600 Content-Disposition: inline In-Reply-To: <1271874464-3021-1-git-send-email-stefanha@linux.vnet.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: * Stefan Hajnoczi [2010-04-21 13:27]: > 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. Nice catch. Send this to qemu-devel and Avi and merge into qemu-kvm once it's commited there. > > Signed-off-by: Stefan Hajnoczi > --- > block.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/block.c b/block.c > index e891544..2d31474 100644 > --- a/block.c > +++ b/block.c > @@ -1731,6 +1731,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.7.0 > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh@us.ibm.com