From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUtK3-0007PQ-56 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 03:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUtJx-0002ef-0S for qemu-devel@nongnu.org; Tue, 01 Apr 2014 03:41:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUtJw-0002eL-M4 for qemu-devel@nongnu.org; Tue, 01 Apr 2014 03:41:20 -0400 Date: Tue, 1 Apr 2014 15:41:22 +0800 From: Fam Zheng Message-ID: <20140401074122.GB22447@T430.nay.redhat.com> References: <1395911388-31027-1-git-send-email-famz@redhat.com> <1395911388-31027-2-git-send-email-famz@redhat.com> <20140327153013.GA2441@stefanha-thinkpad.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140327153013.GA2441@stefanha-thinkpad.redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 1/9] qapi: Add optional field "name" to block dirty bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Paolo Bonzini , qemu-devel@nongnu.org, Stefan Hajnoczi , Benoit Canet On Thu, 03/27 16:30, Stefan Hajnoczi wrote: > On Thu, Mar 27, 2014 at 05:09:40PM +0800, Fam Zheng wrote: > > @@ -5079,18 +5080,45 @@ bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov) > > return true; > > } > > > > -BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity) > > +BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, const char *name) > > +{ > > + BdrvDirtyBitmap *bm; > > + QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) { > > + if (!strcmp(name, bm->name)) { > > + return bm; > > + } > > + } > > + return NULL; > > +} > > + > > +void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitmap *bitmap) > > +{ > > + g_free(bitmap->name); > > + bitmap->name = NULL; > > +} > > This looks dangerous since strcmp() does not check for NULL pointers. I > guess you need to add a check to bdrv_find_dirty_bitmap(). OK. > > > @@ -5120,6 +5149,8 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) > > info->count = bdrv_get_dirty_count(bs, bm); > > info->granularity = > > ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->bitmap)); > > + info->has_name = bm->name[0] != '\0'; > > + info->name = g_strdup(bm->name); > > This looks dangerous too. What if ->name is NULL? Will add a check here. Thanks, Fam