From patchwork Tue Dec 30 10:07:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 424608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B9D0214009B for ; Tue, 30 Dec 2014 21:07:35 +1100 (AEDT) Received: from localhost ([::1]:36330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5ti9-0006R8-J4 for incoming@patchwork.ozlabs.org; Tue, 30 Dec 2014 05:07:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5thS-0005Gt-NA for qemu-devel@nongnu.org; Tue, 30 Dec 2014 05:06:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y5thR-0003YR-CQ for qemu-devel@nongnu.org; Tue, 30 Dec 2014 05:06:50 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:17760 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5thR-0003Y6-05 for qemu-devel@nongnu.org; Tue, 30 Dec 2014 05:06:49 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id sBUA6epd008551; Tue, 30 Dec 2014 13:06:47 +0300 (MSK) From: "Denis V. Lunev" To: Date: Tue, 30 Dec 2014 13:07:08 +0300 Message-Id: <1419934032-24216-6-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1419934032-24216-1-git-send-email-den@openvz.org> References: <1419931701-19362-1-git-send-email-den@openvz.org> <1419934032-24216-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 15/19] block/parallels: rename catalog_ names to bat_ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org BAT means 'block allocation table'. Thus this name is clean and shorter on writing. Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Stefan Hajnoczi Acked-by: Roman Kagan --- block/parallels.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index d072276..ddc3aee 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -47,7 +47,7 @@ typedef struct ParallelsHeader { uint32_t heads; uint32_t cylinders; uint32_t tracks; - uint32_t catalog_entries; + uint32_t bat_entries; uint64_t nb_sectors; uint32_t inuse; uint32_t data_off; @@ -59,8 +59,8 @@ typedef struct BDRVParallelsState { ParallelsHeader ph; - uint32_t *catalog_bitmap; - unsigned int catalog_size; + uint32_t *bat; + unsigned int bat_size; unsigned int tracks; @@ -68,7 +68,7 @@ typedef struct BDRVParallelsState { } BDRVParallelsState; -static uint32_t catalog_offset(uint32_t index) +static uint32_t bat_offset(uint32_t index) { return sizeof(ParallelsHeader) + sizeof(uint32_t) * index; } @@ -126,26 +126,26 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - s->catalog_size = le32_to_cpu(s->ph.catalog_entries); - if (s->catalog_size > INT_MAX / sizeof(uint32_t)) { + s->bat_size = le32_to_cpu(s->ph.bat_entries); + if (s->bat_size > INT_MAX / sizeof(uint32_t)) { error_setg(errp, "Catalog too large"); ret = -EFBIG; goto fail; } - s->catalog_bitmap = g_try_new(uint32_t, s->catalog_size); - if (s->catalog_size && s->catalog_bitmap == NULL) { + s->bat = g_try_new(uint32_t, s->bat_size); + if (s->bat_size && s->bat == NULL) { ret = -ENOMEM; goto fail; } ret = bdrv_pread(bs->file, sizeof(ParallelsHeader), - s->catalog_bitmap, s->catalog_size * sizeof(uint32_t)); + s->bat, s->bat_size * sizeof(uint32_t)); if (ret < 0) { goto fail; } - for (i = 0; i < s->catalog_size; i++) - le32_to_cpus(&s->catalog_bitmap[i]); + for (i = 0; i < s->bat_size; i++) + le32_to_cpus(&s->bat[i]); qemu_co_mutex_init(&s->lock); return 0; @@ -154,7 +154,7 @@ fail_format: error_setg(errp, "Image not in Parallels format"); ret = -EINVAL; fail: - g_free(s->catalog_bitmap); + g_free(s->bat); return ret; } @@ -166,9 +166,9 @@ static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num) offset = sector_num % s->tracks; /* not allocated */ - if ((index >= s->catalog_size) || (s->catalog_bitmap[index] == 0)) + if ((index >= s->bat_size) || (s->bat[index] == 0)) return -1; - return (uint64_t)s->catalog_bitmap[index] * s->off_multiplier + offset; + return (uint64_t)s->bat[index] * s->off_multiplier + offset; } static int64_t allocate_sector(BlockDriverState *bs, int64_t sector_num) @@ -181,24 +181,24 @@ static int64_t allocate_sector(BlockDriverState *bs, int64_t sector_num) idx = sector_num / s->tracks; offset = sector_num % s->tracks; - if (idx >= s->catalog_size) { + if (idx >= s->bat_size) { return -EINVAL; } - if (s->catalog_bitmap[idx] != 0) { - return (uint64_t)s->catalog_bitmap[idx] * s->off_multiplier + offset; + if (s->bat[idx] != 0) { + return (uint64_t)s->bat[idx] * s->off_multiplier + offset; } pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS; bdrv_truncate(bs->file, (pos + s->tracks) << BDRV_SECTOR_BITS); - s->catalog_bitmap[idx] = pos / s->off_multiplier; + s->bat[idx] = pos / s->off_multiplier; - tmp = cpu_to_le32(s->catalog_bitmap[idx]); + tmp = cpu_to_le32(s->bat[idx]); - ret = bdrv_pwrite_sync(bs->file, catalog_offset(idx), &tmp, sizeof(tmp)); + ret = bdrv_pwrite_sync(bs->file, bat_offset(idx), &tmp, sizeof(tmp)); if (ret < 0) { return ret; } - return (uint64_t)s->catalog_bitmap[idx] * s->off_multiplier + offset; + return (uint64_t)s->bat[idx] * s->off_multiplier + offset; } static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, @@ -347,7 +347,7 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) } cat_entries = DIV_ROUND_UP(total_size, cl_size); - cat_sectors = DIV_ROUND_UP(catalog_offset(cat_entries), cl_size); + cat_sectors = DIV_ROUND_UP(bat_offset(cat_entries), cl_size); cat_sectors = (cat_sectors * cl_size) >> BDRV_SECTOR_BITS; memset(&header, 0, sizeof(header)); @@ -357,7 +357,7 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) header.heads = cpu_to_le32(16); header.cylinders = cpu_to_le32(total_size / BDRV_SECTOR_SIZE / 16 / 32); header.tracks = cpu_to_le32(cl_size >> BDRV_SECTOR_BITS); - header.catalog_entries = cpu_to_le32(cat_entries); + header.bat_entries = cpu_to_le32(cat_entries); header.nb_sectors = cpu_to_le64(DIV_ROUND_UP(total_size, BDRV_SECTOR_SIZE)); header.data_off = cpu_to_le32(cat_sectors); @@ -387,7 +387,7 @@ exit: static void parallels_close(BlockDriverState *bs) { BDRVParallelsState *s = bs->opaque; - g_free(s->catalog_bitmap); + g_free(s->bat); } static QemuOptsList parallels_create_opts = {