On 10/30/2014 04:22 AM, 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. > > Implemented bdrv_find_dirty_bitmap to find a dirty bitmap by name, will > be used later when other QMP commands want to reference dirty bitmap by > name. > > Add bdrv_dirty_bitmap_make_anon. This unsets the name of dirty bitmap. > > Signed-off-by: Fam Zheng <f...@redhat.com> > ---
> @@ -5278,6 +5304,9 @@ BdrvDirtyBitmap
> *bdrv_create_dirty_bitmap(BlockDriverState *bs, int granularity,
> }
> bitmap = g_new0(BdrvDirtyBitmap, 1);
> bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
> + if (name) {
> + bitmap->name = g_strdup(name);
> + }
No need for the 'if (name)' (g_strdup(NULL) does the right thing).
> @@ -5307,6 +5337,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;
> + info->name = info->has_name ? g_strdup(bm->name) : NULL;
And again.
With those two changes,
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
