[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/7] block: remove bdrv_dirty_bitmap_make_anon
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 1/7] block: remove bdrv_dirty_bitmap_make_anon |
Date: |
Mon, 11 Jun 2018 15:34:28 -0400 |
From: Paolo Bonzini <address@hidden>
All this function is doing will be repeated by
bdrv_do_release_matching_dirty_bitmap_locked, except
resetting bm->persistent. But even that does not matter
because the bitmap will be freed.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 9 ---------
blockdev.c | 1 -
include/block/dirty-bitmap.h | 1 -
3 files changed, 11 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 967159479d..ea82c06f07 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -97,15 +97,6 @@ BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState
*bs, const char *name)
return NULL;
}
-/* Called with BQL taken. */
-void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap)
-{
- assert(!bdrv_dirty_bitmap_frozen(bitmap));
- g_free(bitmap->name);
- bitmap->name = NULL;
- bitmap->persistent = false;
-}
-
/* Called with BQL taken. */
BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
uint32_t granularity,
diff --git a/blockdev.c b/blockdev.c
index 8de95be8f4..266ecc06cc 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2881,7 +2881,6 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
}
}
- bdrv_dirty_bitmap_make_anon(bitmap);
bdrv_release_dirty_bitmap(bs, bitmap);
}
diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h
index 1ff8949b1b..5a51a78b63 100644
--- a/include/block/dirty-bitmap.h
+++ b/include/block/dirty-bitmap.h
@@ -24,7 +24,6 @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap(BlockDriverState
*bs,
void bdrv_dirty_bitmap_enable_successor(BdrvDirtyBitmap *bitmap);
BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs,
const char *name);
-void bdrv_dirty_bitmap_make_anon(BdrvDirtyBitmap *bitmap);
void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap);
void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);
void bdrv_release_persistent_dirty_bitmaps(BlockDriverState *bs);
--
2.14.3
- [Qemu-devel] [PULL 0/7] Bitmaps patches, John Snow, 2018/06/11
- [Qemu-devel] [PULL 1/7] block: remove bdrv_dirty_bitmap_make_anon,
John Snow <=
- [Qemu-devel] [PULL 4/7] qapi: add x-block-dirty-bitmap-enable/disable, John Snow, 2018/06/11
- [Qemu-devel] [PULL 3/7] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap, John Snow, 2018/06/11
- [Qemu-devel] [PULL 5/7] qmp: transaction support for x-block-dirty-bitmap-enable/disable, John Snow, 2018/06/11
- [Qemu-devel] [PULL 2/7] block: simplify code around releasing bitmaps, John Snow, 2018/06/11
- [Qemu-devel] [PULL 6/7] qapi: add x-block-dirty-bitmap-merge, John Snow, 2018/06/11
- [Qemu-devel] [PULL 7/7] qapi: add disabled parameter to block-dirty-bitmap-add, John Snow, 2018/06/11
- Re: [Qemu-devel] [PULL 0/7] Bitmaps patches, Peter Maydell, 2018/06/12