{"id":807898,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807898/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830210542.2153-5-eblake@redhat.com>","date":"2017-08-30T21:05:28","name":"[v6,04/18] dirty-bitmap: Drop unused functions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"be770c49fb25fb40d7a7c56f2b72f51fcfba0d76","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830210542.2153-5-eblake@redhat.com/mbox/","series":[{"id":700,"url":"http://patchwork.ozlabs.org/api/1.0/series/700/?format=json","date":"2017-08-30T21:05:25","name":"make dirty-bitmap byte-based","version":6,"mbox":"http://patchwork.ozlabs.org/series/700/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807898/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjJ9h46Lpz9sP5\n\tfor ;\n\tThu, 31 Aug 2017 07:12:22 +1000 (AEST)","from localhost ([::1]:52716 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAHW-0000Y0-Q8\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:12:14 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36871)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABW-0003hf-Iz\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:03 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABU-0007Pr-4e\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:02 -0400","from mx1.redhat.com ([209.132.183.28]:35572)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnABR-0007KC-3w; Wed, 30 Aug 2017 17:05:57 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 28E34285A8;\n\tWed, 30 Aug 2017 21:05:56 +0000 (UTC)","from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 1E08F77557;\n\tWed, 30 Aug 2017 21:05:55 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 28E34285A8","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:28 -0500","Message-Id":"<20170830210542.2153-5-eblake@redhat.com>","In-Reply-To":"<20170830210542.2153-1-eblake@redhat.com>","References":"<20170830210542.2153-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 30 Aug 2017 21:05:56 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v6 04/18] dirty-bitmap: Drop unused functions","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, vsementsov@virtuozzo.com, Fam Zheng , \n\tqemu-block@nongnu.org, Max Reitz , jsnow@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"We had several functions that no one is currently using, and which\nuse sector-based interfaces. I'm trying to convert towards byte-based\ninterfaces, so it's easier to just drop the unused functions:\n\nbdrv_dirty_bitmap_get_meta\nbdrv_dirty_bitmap_get_meta_locked\nbdrv_dirty_bitmap_reset_meta\nbdrv_dirty_bitmap_meta_granularity\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv5: no change\nv4: rebase to Vladimir's persistent bitmaps (bdrv_dirty_bitmap_size now\nin use), dropped R-b\nv3: rebase to upstream changes (bdrv_dirty_bitmap_get_meta_locked was\nadded in b64bd51e with no clients), kept R-b\nv2: tweak commit message based on review, no code change\n---\n include/block/dirty-bitmap.h | 10 ----------\n block/dirty-bitmap.c | 44 --------------------------------------------\n 2 files changed, 54 deletions(-)","diff":"diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h\nindex a79a58d2c3..8fd842eac9 100644\n--- a/include/block/dirty-bitmap.h\n+++ b/include/block/dirty-bitmap.h\n@@ -34,7 +34,6 @@ void bdrv_enable_dirty_bitmap(BdrvDirtyBitmap *bitmap);\n BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs);\n uint32_t bdrv_get_default_bitmap_granularity(BlockDriverState *bs);\n uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap);\n-uint32_t bdrv_dirty_bitmap_meta_granularity(BdrvDirtyBitmap *bitmap);\n bool bdrv_dirty_bitmap_enabled(BdrvDirtyBitmap *bitmap);\n bool bdrv_dirty_bitmap_frozen(BdrvDirtyBitmap *bitmap);\n const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap);\n@@ -44,15 +43,6 @@ void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors);\n void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,\n int64_t cur_sector, int64_t nr_sectors);\n-int bdrv_dirty_bitmap_get_meta(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors);\n-int bdrv_dirty_bitmap_get_meta_locked(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors);\n-void bdrv_dirty_bitmap_reset_meta(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors);\n BdrvDirtyBitmapIter *bdrv_dirty_meta_iter_new(BdrvDirtyBitmap *bitmap);\n BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap,\n uint64_t first_sector);\ndiff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 0490ca3aff..42a55e4a4b 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -173,45 +173,6 @@ void bdrv_release_meta_dirty_bitmap(BdrvDirtyBitmap *bitmap)\n qemu_mutex_unlock(bitmap->mutex);\n }\n\n-int bdrv_dirty_bitmap_get_meta_locked(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors)\n-{\n- uint64_t i;\n- int sectors_per_bit = 1 << hbitmap_granularity(bitmap->meta);\n-\n- /* To optimize: we can make hbitmap to internally check the range in a\n- * coarse level, or at least do it word by word. */\n- for (i = sector; i < sector + nb_sectors; i += sectors_per_bit) {\n- if (hbitmap_get(bitmap->meta, i)) {\n- return true;\n- }\n- }\n- return false;\n-}\n-\n-int bdrv_dirty_bitmap_get_meta(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors)\n-{\n- bool dirty;\n-\n- qemu_mutex_lock(bitmap->mutex);\n- dirty = bdrv_dirty_bitmap_get_meta_locked(bs, bitmap, sector, nb_sectors);\n- qemu_mutex_unlock(bitmap->mutex);\n-\n- return dirty;\n-}\n-\n-void bdrv_dirty_bitmap_reset_meta(BlockDriverState *bs,\n- BdrvDirtyBitmap *bitmap, int64_t sector,\n- int nb_sectors)\n-{\n- qemu_mutex_lock(bitmap->mutex);\n- hbitmap_reset(bitmap->meta, sector, nb_sectors);\n- qemu_mutex_unlock(bitmap->mutex);\n-}\n-\n int64_t bdrv_dirty_bitmap_size(const BdrvDirtyBitmap *bitmap)\n {\n return bitmap->size;\n@@ -511,11 +472,6 @@ uint32_t bdrv_dirty_bitmap_granularity(const BdrvDirtyBitmap *bitmap)\n return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->bitmap);\n }\n\n-uint32_t bdrv_dirty_bitmap_meta_granularity(BdrvDirtyBitmap *bitmap)\n-{\n- return BDRV_SECTOR_SIZE << hbitmap_granularity(bitmap->meta);\n-}\n-\n BdrvDirtyBitmapIter *bdrv_dirty_iter_new(BdrvDirtyBitmap *bitmap,\n uint64_t first_sector)\n {\n","prefixes":["v6","04/18"]}