[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/10] vmdk: rename num_gtes_per_gte to num_gtes_
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v4 10/10] vmdk: rename num_gtes_per_gte to num_gtes_per_gt |
Date: |
Tue, 6 Aug 2013 15:44:55 +0800 |
num_gtes_per_gte is a historical typo, rename it to a more sensible
name. It means "number of GrainTableEntries per GrainTable".
Signed-off-by: Fam Zheng <address@hidden>
---
block/vmdk.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 39f5a8b..d05ff17 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -71,7 +71,8 @@ typedef struct {
uint64_t granularity;
uint64_t desc_offset;
uint64_t desc_size;
- uint32_t num_gtes_per_gte;
+ /* Number of GrainTableEntries per GrainTable */
+ uint32_t num_gtes_per_gt;
uint64_t rgd_offset;
uint64_t gd_offset;
uint64_t grain_offset;
@@ -585,12 +586,12 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
return -ENOTSUP;
}
- if (le32_to_cpu(header.num_gtes_per_gte) > 512) {
+ if (le32_to_cpu(header.num_gtes_per_gt) > 512) {
error_report("L2 table size too big");
return -EINVAL;
}
- l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gte)
+ l1_entry_sectors = le32_to_cpu(header.num_gtes_per_gt)
* le64_to_cpu(header.granularity);
if (l1_entry_sectors == 0) {
return -EINVAL;
@@ -613,7 +614,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
le64_to_cpu(header.gd_offset) << 9,
l1_backup_offset,
l1_size,
- le32_to_cpu(header.num_gtes_per_gte),
+ le32_to_cpu(header.num_gtes_per_gt),
le64_to_cpu(header.granularity),
&extent);
if (ret < 0) {
@@ -1407,12 +1408,12 @@ static int vmdk_create_extent(const char *filename,
int64_t filesize,
header.compressAlgorithm = compress ? VMDK4_COMPRESSION_DEFLATE : 0;
header.capacity = filesize / 512;
header.granularity = 128;
- header.num_gtes_per_gte = 512;
+ header.num_gtes_per_gt = 512;
grains = (filesize / 512 + header.granularity - 1) / header.granularity;
- gt_size = ((header.num_gtes_per_gte * sizeof(uint32_t)) + 511) >> 9;
+ gt_size = ((header.num_gtes_per_gt * sizeof(uint32_t)) + 511) >> 9;
gt_count =
- (grains + header.num_gtes_per_gte - 1) / header.num_gtes_per_gte;
+ (grains + header.num_gtes_per_gt - 1) / header.num_gtes_per_gt;
gd_size = (gt_count * sizeof(uint32_t) + 511) >> 9;
header.desc_offset = 1;
@@ -1428,7 +1429,7 @@ static int vmdk_create_extent(const char *filename,
int64_t filesize,
header.flags = cpu_to_le32(header.flags);
header.capacity = cpu_to_le64(header.capacity);
header.granularity = cpu_to_le64(header.granularity);
- header.num_gtes_per_gte = cpu_to_le32(header.num_gtes_per_gte);
+ header.num_gtes_per_gt = cpu_to_le32(header.num_gtes_per_gt);
header.desc_offset = cpu_to_le64(header.desc_offset);
header.desc_size = cpu_to_le64(header.desc_size);
header.rgd_offset = cpu_to_le64(header.rgd_offset);
--
1.8.3.4
- Re: [Qemu-devel] [PATCH v4 01/10] vmdk: remove ret from inner scope., (continued)
- [Qemu-devel] [PATCH v4 02/10] vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 03/10] vmdk: use unsigned values for on disk header fields, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 04/10] qemu-iotests: add poke_file utility function, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 05/10] qemu-iotests: add empty test case for vmdk, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 06/10] vmdk: check granularity field in opening, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 07/10] vmdk: check l2 table size when opening, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 08/10] vmdk: check l1 size before opening image, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 09/10] vmdk: use heap allocation for whole_grain, Fam Zheng, 2013/08/06
- [Qemu-devel] [PATCH v4 10/10] vmdk: rename num_gtes_per_gte to num_gtes_per_gt,
Fam Zheng <=