From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOMMA-0007eh-16 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 03:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOMM4-00042h-0M for qemu-devel@nongnu.org; Fri, 14 Mar 2014 03:16:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOMM3-00042a-Nh for qemu-devel@nongnu.org; Fri, 14 Mar 2014 03:16:31 -0400 Date: Fri, 14 Mar 2014 15:16:36 +0800 From: Fam Zheng Message-ID: <20140314071636.GA11745@T430.nay.redhat.com> References: <1394605864-32237-1-git-send-email-famz@redhat.com> <1394605864-32237-2-git-send-email-famz@redhat.com> <20140313131531.GA4534@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20140313131531.GA4534@irqsave.net> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/9] qapi: Add optional field "name" to block dirty bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Thu, 03/13 14:15, Beno=EEt Canet wrote: > The Wednesday 12 Mar 2014 =E0 14:30:56 (+0800), Fam Zheng wrote : > > This field will be set for user created dirty bitmap. Also pass in an > > error pointer to bdrv_create_dirty_bitmap, so when a name is already > > taken on this BDS, it can report an error message. This is not global > > check, two BDSes can have dirty bitmap with a common name. > >=20 > > Implemented bdrv_find_dirty_bitmap to find a dirty bitmap by name, wi= ll > > be used later when other QMP commands want to reference dirty bitmap = by > > name. > >=20 > > Add bdrv_dirty_bitmap_make_anon. This unsets the name of dirty bitmap. > >=20 > > Signed-off-by: Fam Zheng > > --- > > block-migration.c | 3 ++- > > block.c | 34 +++++++++++++++++++++++++++++++++- > > block/mirror.c | 2 +- > > include/block/block.h | 8 +++++++- > > qapi-schema.json | 4 +++- > > 5 files changed, 46 insertions(+), 5 deletions(-) > >=20 > > diff --git a/block-migration.c b/block-migration.c > > index 897fdba..e6e016a 100644 > > --- a/block-migration.c > > +++ b/block-migration.c > > @@ -315,7 +315,8 @@ static void set_dirty_tracking(void) > > BlkMigDevState *bmds; > > =20 > > QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) { > > - bmds->dirty_bitmap =3D bdrv_create_dirty_bitmap(bmds->bs, BL= OCK_SIZE); > > + bmds->dirty_bitmap =3D bdrv_create_dirty_bitmap(bmds->bs, BL= OCK_SIZE, > > + NULL, NULL); > > } > > } > > =20 > > diff --git a/block.c b/block.c > > index f1ef4b0..ce48fff 100644 > > --- a/block.c > > +++ b/block.c > > @@ -52,6 +52,7 @@ > > =20 > > struct BdrvDirtyBitmap { > > HBitmap *bitmap; > > + char *name; >=20 > Why not making name a regular char array like bs->device_name or bs->no= de_name. > Its emptyness could still be tested and it also would remove some memor= y management > duties. Version 1 did use an array. This is Stefan's request. >=20 > > QLIST_ENTRY(BdrvDirtyBitmap) list; > > }; > > =20 > > @@ -5048,18 +5049,46 @@ bool bdrv_qiov_is_aligned(BlockDriverState *b= s, QEMUIOVector *qiov) > > return true; > > } > > =20 > > -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, BdrvDirtyBitm= ap *bitmap) > > +{ > > + g_free(bitmap->name); > > + bitmap->name =3D NULL; > > +} > > + > > +BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, > > + int granularity, > > + const char *name, > > + Error **errp) > > { > > int64_t bitmap_size; > > BdrvDirtyBitmap *bitmap; > > =20 > > assert((granularity & (granularity - 1)) =3D=3D 0); > > =20 > > + if (name && bdrv_find_dirty_bitmap(bs, name)) { > > + error_setg(errp, "Bitmap already exists: %s", name); > > + return NULL; > > + } > > granularity >>=3D BDRV_SECTOR_BITS; > > assert(granularity); > > bitmap_size =3D (bdrv_getlength(bs) >> BDRV_SECTOR_BITS); > > bitmap =3D g_malloc0(sizeof(BdrvDirtyBitmap)); > > bitmap->bitmap =3D hbitmap_alloc(bitmap_size, ffs(granularity) -= 1); > > + if (name) { > > + bitmap->name =3D g_strdup(name); > > + } > > QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list); > > return bitmap; > > } > > @@ -5071,6 +5100,7 @@ void bdrv_release_dirty_bitmap(BlockDriverState= *bs, BdrvDirtyBitmap *bitmap) > > if (bm =3D=3D bitmap) { > > QLIST_REMOVE(bitmap, list); > > hbitmap_free(bitmap->bitmap); > > + g_free(bitmap->name); > > g_free(bitmap); > > return; > > } > > @@ -5089,6 +5119,8 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(Bl= ockDriverState *bs) > > info->count =3D bdrv_get_dirty_count(bs, bm); > > info->granularity =3D > > ((int64_t) BDRV_SECTOR_SIZE << hbitmap_granularity(bm->b= itmap)); >=20 > > + info->has_name =3D bm->name[0] !=3D '\0'; > > + info->name =3D g_strdup(bm->name); > Could bm->name be =3D=3D NULl here ? It doesn't matter. g_strdup returns NULL for NULL. >=20 > > entry->value =3D info; > > *plist =3D entry; > > plist =3D &entry->next; > > diff --git a/block/mirror.c b/block/mirror.c > > index dd5ee05..be8b2a1 100644 > > --- a/block/mirror.c > > +++ b/block/mirror.c > > @@ -596,7 +596,7 @@ static void mirror_start_job(BlockDriverState *bs= , BlockDriverState *target, > > s->granularity =3D granularity; > > s->buf_size =3D MAX(buf_size, granularity); > > =20 > > - s->dirty_bitmap =3D bdrv_create_dirty_bitmap(bs, granularity); > > + s->dirty_bitmap =3D bdrv_create_dirty_bitmap(bs, granularity, NU= LL, errp); > > bdrv_set_enable_write_cache(s->target, true); > > bdrv_set_on_error(s->target, on_target_error, on_target_error); > > bdrv_iostatus_enable(s->target); > > diff --git a/include/block/block.h b/include/block/block.h > > index 780f48b..aa0c5e4 100644 > > --- a/include/block/block.h > > +++ b/include/block/block.h > > @@ -437,7 +437,13 @@ bool bdrv_qiov_is_aligned(BlockDriverState *bs, = QEMUIOVector *qiov); > > =20 > > struct HBitmapIter; > > typedef struct BdrvDirtyBitmap BdrvDirtyBitmap; > > -BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, int = granularity); > > +BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs, > > + int granularity, > > + const char *name, > > + Error **errp); >=20 > > +BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, > > + const char *name); > This exactly fit in 80 char so no line split is required. OK. >=20 > > +void bdrv_dirty_bitmap_make_anon(BlockDriverState *bs, BdrvDirtyBitm= ap *bitmap); > > void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap= *bitmap); > > BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs); > > int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, in= t64_t sector); > > diff --git a/qapi-schema.json b/qapi-schema.json > > index 6c381b7..4d5bc13 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -1000,6 +1000,8 @@ > > # > > # Block dirty bitmap information. > > # > > +# @name: the name of dirty bitmap (Since 2.1) > # @name: #optional the name of dirty bitmap (Since 2.1) OK. Thanks, Fam